update: composer update

composer.json

@@ -6,7 +6,7 @@
 	"require": {
 		"php": "7.2.*",
 		"ext-json": "*",
-		"api/php_utils":"1.0.9",
+		"api/php_utils":"1.0.10",
 		"api/php_services":"1.0.1",
       	"ext-openssl": "*"
 	},

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d2165c30c914433949003e43fb6dc9b2",
+    "content-hash": "d50c89a59fac1ed443c2ff43906a2d3a",
     "packages": [
         {
             "name": "api/php_services",
@@ -30,11 +30,11 @@
         },
         {
             "name": "api/php_utils",
-            "version": "v1.0.9",
+            "version": "v1.0.10",
             "source": {
                 "type": "git",
                 "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "866e88e927a0af5ac7545405d9783764ea76bbc2"
+                "reference": "4fb2b99ebe6cc3ad1a99bece88f217874de5db85"
             },
             "require": {
                 "elasticsearch/elasticsearch": "~7.0",
@@ -53,7 +53,7 @@
                 }
             },
             "description": "bp api php_utils",
-            "time": "2021-08-11T11:54:12+00:00"
+            "time": "2021-08-12T11:16:58+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",

vendor/api/php_utils/src/Mysql/MysqlBase.php

@@ -24,6 +24,7 @@ use Api\PhpUtils\Log\FileLog;
  * $options参数可选项：
  *    - $options['max_execution_time'] = 10; // 单位毫秒
  *    - $options['rowCount'] = true; // 返回insert后的影响行数
+ *    - $options['alertMail'] = true; // SQL执行出错是否发送报警邮件标识，默认发送
 
  * @see https://medoo.in  (英文网站)
  * @see https://medoo.lvtao.net (中文网站)
@@ -37,7 +38,7 @@ use Api\PhpUtils\Log\FileLog;
  * @method static MysqlBase select($columns, $where, $options)
  * @method static MysqlBase selectMaster($columns, $where, $options)
  * @method static MysqlBase selectForUpdate($columns, $where, $options)
- *  * @method static MysqlBase selectForUpdateSkipLocked($columns, $where, $options)
+ * @method static MysqlBase selectForUpdateSkipLocked($columns, $where, $options)
  * @method static MysqlBase getMaster($columns, $where, $options)
  * @method static MysqlBase get($columns, $where, $options)
  * @method static MysqlBase count($columns, $where)
@@ -329,7 +330,15 @@ abstract class MysqlBase
             return true;
         }
 
-        FileLog::error("mysql error catch:" . $method . "-" . json_encode($arguments) . '-' . print_r([$sqlState, $errorCode, $errorMessage], 1));
+        if (in_array(strtolower($method), ['insert']) && isset($arguments[2]['alertMail']) && $arguments[2]['alertMail'] === false) {
+            FileLog::info("mysql info catch:" . $method . "-" . json_encode($arguments) . '-' . print_r([$sqlState, $errorCode, $errorMessage], 1));
+        }
+        elseif (in_array(strtolower($method), ['select', 'selectmaster', 'selectforupdate', 'get', 'getmaster']) && isset($arguments[3]['alertMail']) && $arguments[3]['alertMail'] === false) {
+            FileLog::info("mysql info catch:" . $method . "-" . json_encode($arguments) . '-' . print_r([$sqlState, $errorCode, $errorMessage], 1));
+        }
+        else {
+            FileLog::error("mysql error catch:" . $method . "-" . json_encode($arguments) . '-' . print_r([$sqlState, $errorCode, $errorMessage], 1));
+        }
 
         //throw Exception
         // $msg = "mysql error catch:" . $method . "-" . json_encode($arguments) . '-' . json_encode([$sqlState, $errorCode, $errorMessage]);

vendor/composer/InstalledVersions.php

@@ -27,12 +27,12 @@ class InstalledVersions
 private static $installed = array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => 'dev-develop',
+    'version' => 'dev-develop',
     'aliases' => 
     array (
     ),
-    'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
+    'reference' => 'aa0ce40f0ea3b01d62acfef75790d113f0caee3d',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -48,12 +48,12 @@ private static $installed = array (
     ),
     'api/php_utils' => 
     array (
-      'pretty_version' => 'v1.0.9',
-      'version' => '1.0.9.0',
+      'pretty_version' => 'v1.0.10',
+      'version' => '1.0.10.0',
       'aliases' => 
       array (
       ),
-      'reference' => '866e88e927a0af5ac7545405d9783764ea76bbc2',
+      'reference' => '4fb2b99ebe6cc3ad1a99bece88f217874de5db85',
     ),
     'bacon/bacon-qr-code' => 
     array (
@@ -327,12 +327,12 @@ private static $installed = array (
     ),
     'yidian/yaf_demo' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => 'dev-develop',
+      'version' => 'dev-develop',
       'aliases' => 
       array (
       ),
-      'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
+      'reference' => 'aa0ce40f0ea3b01d62acfef75790d113f0caee3d',
     ),
   ),
 );

vendor/composer/installed.json

@@ -27,12 +27,12 @@
         },
         {
             "name": "api/php_utils",
-            "version": "v1.0.9",
-            "version_normalized": "1.0.9.0",
+            "version": "v1.0.10",
+            "version_normalized": "1.0.10.0",
             "source": {
                 "type": "git",
                 "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "866e88e927a0af5ac7545405d9783764ea76bbc2"
+                "reference": "4fb2b99ebe6cc3ad1a99bece88f217874de5db85"
             },
             "require": {
                 "elasticsearch/elasticsearch": "~7.0",
@@ -44,7 +44,7 @@
                 "mongodb/mongodb": "1.4.3",
                 "php": "7.2.*"
             },
-            "time": "2021-08-11T11:54:12+00:00",
+            "time": "2021-08-12T11:16:58+00:00",
             "type": "library",
             "installation-source": "source",
             "autoload": {

vendor/composer/installed.php

 <?php return array (
   'root' => 
   array (
-    'pretty_version' => 'dev-master',
-    'version' => 'dev-master',
+    'pretty_version' => 'dev-develop',
+    'version' => 'dev-develop',
     'aliases' => 
     array (
     ),
-    'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
+    'reference' => 'aa0ce40f0ea3b01d62acfef75790d113f0caee3d',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -22,12 +22,12 @@
     ),
     'api/php_utils' => 
     array (
-      'pretty_version' => 'v1.0.9',
-      'version' => '1.0.9.0',
+      'pretty_version' => 'v1.0.10',
+      'version' => '1.0.10.0',
       'aliases' => 
       array (
       ),
-      'reference' => '866e88e927a0af5ac7545405d9783764ea76bbc2',
+      'reference' => '4fb2b99ebe6cc3ad1a99bece88f217874de5db85',
     ),
     'bacon/bacon-qr-code' => 
     array (
@@ -301,12 +301,12 @@
     ),
     'yidian/yaf_demo' => 
     array (
-      'pretty_version' => 'dev-master',
-      'version' => 'dev-master',
+      'pretty_version' => 'dev-develop',
+      'version' => 'dev-develop',
       'aliases' => 
       array (
       ),
-      'reference' => '94450e16db513b1dd4d9cbb15869e03e3a0da5b8',
+      'reference' => 'aa0ce40f0ea3b01d62acfef75790d113f0caee3d',
     ),
   ),
 );