update:composer update

efc0464c · luhongguang · d92a0e16 · efc0464c · efc0464c · efc0464c
Commit efc0464c authored Aug 02, 2021 by luhongguang
14 changed files
--- a/composer.json
+++ b/composer.json
@@ -6,8 +6,8 @@
 	"require": {
 		"php": "7.2.*",
 		"ext-json": "*",
-		"api/php_utils":"dev-master",
+		"api/php_utils":"1.0.1",
-		"api/php_services":"dev-master",
+		"api/php_services":"1.0.1",
      	"ext-openssl": "*"
    },
 	"minimum-stability": "dev",

--- a/composer.lock
+++ b/composer.lock
@@ -4,23 +4,21 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "bd5b2ba0c3a413e2c7214b6bcca29de3",
+    "content-hash": "daa627acc982a77331e871727e642792",
    "packages": [
        {
            "name": "api/php_services",
-            "version": "dev-master",
+            "version": "v1.0.1",
            "source": {
                "type": "git",
                "url": "https://git.yidian-inc.com:8021/bp/php_services.git",
-                "reference": "e7505fbd9f5dda96dd12fffee729a4851b4ab127"
+                "reference": "ab75ba5d34e8ee22e8628234a45de8a0dee0a51c"
            },
            "require": {
-                "api/php_utils": "dev-master",
                "endroid/qr-code": "^3.9",
                "perftools/php-profiler": "^0.18.0",
                "php": "7.2.*"
            },
-            "default-branch": true,
            "type": "library",
            "autoload": {
                "psr-4": {
@@ -28,15 +26,15 @@
                }
            },
            "description": "bp api php_services",
-            "time": "2021-07-28T13:33:13+00:00"
+            "time": "2021-08-02T14:35:19+00:00"
        },
        {
            "name": "api/php_utils",
-            "version": "dev-master",
+            "version": "v1.0.1",
            "source": {
                "type": "git",
                "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "c9c90ab981f939bbf89d321d3101d58da1e797c6"
+                "reference": "26abffd9afc5b90b7f42f10cf21813bbc3dd4f2d"
            },
            "require": {
                "elasticsearch/elasticsearch": "~7.0",
@@ -48,7 +46,6 @@
                "mongodb/mongodb": "1.4.3",
                "php": "7.2.*"
            },
-            "default-branch": true,
            "type": "library",
            "autoload": {
                "psr-4": {
@@ -56,7 +53,7 @@
                }
            },
            "description": "bp api php_utils",
-            "time": "2021-07-28T11:11:38+00:00"
+            "time": "2021-08-02T13:20:23+00:00"
        },
        {
            "name": "bacon/bacon-qr-code",
@@ -1341,7 +1338,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/main"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.1"
            },
            "funding": [
                {
@@ -1507,7 +1504,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/main"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.1"
            },
            "funding": [
                {
@@ -1611,12 +1608,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "19d03c391c6abb6791f5f757fb36e551bffeaa68"
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/19d03c391c6abb6791f5f757fb36e551bffeaa68",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
-                "reference": "19d03c391c6abb6791f5f757fb36e551bffeaa68",
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
                "shasum": ""
            },
            "require": {
@@ -1671,7 +1668,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/main"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
            },
            "funding": [
                {
@@ -1687,7 +1684,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-07-13T14:34:27+00:00"
+            "time": "2021-07-28T13:41:28+00:00"
        },
        {
            "name": "symfony/property-access",
@@ -1947,10 +1944,7 @@
    "packages-dev": [],
    "aliases": [],
    "minimum-stability": "dev",
-    "stability-flags": {
+    "stability-flags": [],
-        "api/php_utils": 20,
-        "api/php_services": 20
-    },
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {

--- a/vendor/api/php_services/composer.json
+++ b/vendor/api/php_services/composer.json
@@ -4,7 +4,6 @@
    "type": "library",
    "require": {
        "php": "7.2.*",
-        "api/php_utils":"dev-master",
        "perftools/php-profiler": "^0.18.0",
        "endroid/qr-code": "^3.9"
    },
@@ -12,11 +11,5 @@
        "psr-4": {
            "Api\\PhpServices\\": "src/"
        }
-    },
-    "repositories": {
-        "api/php_utils":{
-            "type":"vcs",
-            "url":"https://gitlab.yidian-inc.com/bp/php_utils.git"
-        }
    }
 }
--- a/vendor/api/php_utils/src/Common/Rsa.php
+++ b/vendor/api/php_utils/src/Common/Rsa.php
@@ -179,6 +179,56 @@ MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUbC5cW6K/XPjfdljTRSP5YtZG
 gHM3r3EWS2bUGHTZZLAd6KGrIP2985c9ODd3s3/JvYmrh/N3djFy3MYhZm5P6iGt
 kRlCF7Jac58/9V4lDhQiMzjclfpWR6s3aMBEwx5g2gFhjnnlSZRnYofRPqsB1JhB
 1ZirI2if7kWNBz+BTwIDAQAB
+-----END PUBLIC KEY-----';
+/**
+     * 商户系统拼单小程序 SERVER端私钥与客户端公钥
+     */
+    const MERCHANT_PUB_PIN_PRIVATE_KEY_STR = '-----BEGIN PRIVATE KEY-----
+MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMq5OJZpmPbfrGAt
+JIvPQEEYr0edc4U7LmUArp17tUeknqNfFc0pXuWABIkMTeZuKspDf1ehfYPCVnGs
+gWIYvECAdAvMH8TpgNMl6Bc7hjRY89gZUuIx5SK0kw8xJ1z2SlQ4at2PiUnNjYYC
+ydyipoHOAXYgpEbcX4OGEF6P6E/nAgMBAAECgYBQsOULScDvExzjs1RGqhnjT1YF
+ZXCj6WiQH3Nhj+oaODZExQZCgWMaaphjjJg9TkCN/cvkL41sMqCB4q4lQ786H/8P
+flBDGyngi9vjmZBdsmllDNi7kwcAtl8xk7YaHzQuIZ49dOzL/qQggCHokgvbBRXh
+NI1AYBm/G8C8H0DE8QJBAOlKL4LQuoOtg49+qpw73snNOkEnFzn6nClud7w/wHR1
+I82nmesyadcjVoJA9Lb1/AA9/MXV5RQeZ8Ckn//42SUCQQDedUsl4jtpuLz+QYv4
+994ASsGBSGLE3BAPI1YClA8oVDRYMQydbZMgeZ8AspZtnmBifbcoOM/q+VbBomNk
+pfUbAkEAkUCMhnG5v6T4hg7C4ZXxaEqs28YgEwxz0OQkDwTOqnQI/9I75pI0DizF
+f0I8W/Kanff6e59rC3TG+s5FhNYHNQJBAJtOlCpcqVID8Z4osMoeclUN286gdKQv
+Zt7Ksq+WIobrUqgHhmEaMM9JWaKpC7B4E55vWkGweCf574G8F1wbKOUCQHtD5JLr
+B/84pKhIkdbhfdTReLbxz3/mRZM+RGFvbXvr5yr5ihcFHtIgHsmrIYbBccJdd42s
+kZ5U8STIJSCkBZo=
+-----END PRIVATE KEY-----';
+    const MERCHANT_PUB_PIN_PUBLIC_KEY_STR = '-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGmANRSw3T4ztQ8ZWMw+cW70Zg
+9yOwQV0oWp9Zce8eCLoRgFVFeajeQ1BT59tQ3bR4Qwg/gL8ZKf9JanxNyINQY8th
+CKIYerOCxgr0QPKiQCVL7BTZNj7m91OdVmsYfJty1YihM43a5op62T0OJk/4mF2H
+Txl13uSJhZgM9szI7wIDAQAB
+-----END PUBLIC KEY-----';
+    /**
+     * 商户系统拼单小程序-测试 SERVER端私钥与客户端公钥
+     */
+    const TEST_MERCHANT_PUB_PIN_PRIVATE_KEY_STR = '-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOOfrgheB6r+85+1
+97tfjq6+R/FhWg4T+GXOZ5pimMNwf/yOLYbC+HITvHKoEExymf2Um6i6dnJjU7zl
+AjmbzK0TSab0exz1tNxnBSE/nt5G06n5f2FOYMAu67iseQ97aGYDGbRWakSjdYTx
+jPoKT7dG8cC6RdIW7aJDCceNIeGBAgMBAAECgYByZakIaYF/Dd0Q0lor4E2MQvNT
+O7MPyjeXqtFkxNKzvpGEM0xsIwbMBmE6Wn6+fQYpbIuClBu9R3ApSgsBOuz0yBGM
+e/DNmAifZn1EFVQRm+Li//poLfl3HE2oj0dJhPRiCyoxeWhP76zxP+v0IXwopZbF
+W0jP+ojto8q2zx/75QJBAPxFSQisRdMV1KxbyZzT2clYwRB5Dfqdh2SmaJ6Mms+o
+Ua9e6lgD7/K1C+3GCtIkDHSlhnNNMRwIItpCe8r7RZcCQQDm/R5it0UvpWZzYCEn
+iXMvavwp3+PCTftpxS9/CWrWQCk5C4wW7l5j+Be6f0e4cboOr6kaiPXkF8qn/SF6
+S+SnAkBNs6GNNFLFc6Hv/M2aqn4YUGgXBNJTcRX04HS08SX19ChE1f1kYsIThcRI
+1okatNPJUfqZpRsNQUxK4dNzb/W9AkBJ+S3N91tU0udoc5SqkL4upVh0IJtUEp09
+VkTLrjxkuM960VPf1B6ubTlMJI7XZrRrF55UPSBiF6xy+AHMpJlpAkEAhNVjlx+x
+9qDJ23tHTDFxN0dl2IK+Xz3j9HDNvb5SdO+pcIvQvVg9UUc5xnkXmVm35RwqeA6O
+2P6ROLCijjotzw==
+-----END PRIVATE KEY-----';
+    const TEST_MERCHANT_PUB_PIN_PUBLIC_KEY_STR = '-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCFOU3D4aULZuJ3IyRGmPhwn5g
+zIcDvT2EEZMJ+ePgi0Oax/P3z25m5758okGs1lrS93vDWO7lbsgQn5mnuKuqmuj6
+M3BP/vOildi+3oTZcjQTV2deebIrhW4p96DvTqQ7ixVAEi4of3XoITA00J8hfNy9
+jDprGYGJ5yeTuRRHlQIDAQAB
 -----END PUBLIC KEY-----';
    /**
     * TEST SERVER端私钥与客户端公钥
@@ -235,6 +285,14 @@ mnRjVUtXBgEF0A9xt2QVNMQovtjJ2rkg43gVByDKbOsUqbJYjA12IpALMdECHCMl
            'pub_key' => self::TEST_MERCHANT_H5_PUBLIC_KEY_STR,
            'pri_key' => self::TEST_MERCHANT_H5_PRIVATE_KEY_STR,
        ],
+        'merchant-pub-pin' => [
+            'pub_key' => self::MERCHANT_PUB_PIN_PUBLIC_KEY_STR,
+            'pri_key' => self::MERCHANT_PUB_PIN_PRIVATE_KEY_STR,
+        ],
+        'test-merchant-pub-pin' => [
+            'pub_key' => self::TEST_MERCHANT_PUB_PIN_PUBLIC_KEY_STR,
+            'pri_key' => self::TEST_MERCHANT_PUB_PIN_PRIVATE_KEY_STR,
+        ],
        'test' => [
            'pub_key' => self::TEST_PUBLIC_KEY_STR,
            'pri_key' => self::TEST_PRIVATE_KEY_STR,

--- a/vendor/api/php_utils/src/Http/HttpUtil.php
+++ b/vendor/api/php_utils/src/Http/HttpUtil.php
@@ -196,6 +196,11 @@ class HttpUtil
    {
        $ch = curl_init($url);
+        // CURLOPT_POSTFIELDS 不支持多维数组
+        if (is_array($post) && count($post) != count($post, COUNT_RECURSIVE)) {
+            $post =  http_build_query($post);
+        }
        if (is_resource($ch) === true)
        {
            curl_setopt($ch, CURLOPT_FAILONERROR,           true);
@@ -365,7 +370,7 @@ class HttpUtil
    {
        //过滤无意义的日志
        $log = true;
-        $excludes = config('http_util', 'log.exclude');
+        $excludes = config('request', 'log.exclude');
        if (!empty($excludes)) {
            foreach ($excludes as $exclude) {
                if (is_array($urls)) {

--- a/vendor/api/php_utils/src/Log/FileLog.php
+++ b/vendor/api/php_utils/src/Log/FileLog.php
@@ -2,10 +2,12 @@
 namespace Api\PhpUtils\Log;
+use Api\PhpUtils\Cache\ApcuUtil;
 use Api\PhpUtils\Message\Email;
 class FileLog
 {
+    const PREFIX_FILELOG_ERROR = 'flerr:';
    /**
     * 用于记录info级别的错误
     * 会记录请求上下文，不会发生报警邮件
@@ -57,21 +59,33 @@ class FileLog
        }
        $log .= ' [exception info: ]' . $exception_info;
        error_log($log);
-        if (!empty($mail_to)) {
+        if (empty($mail_to)) {
-            $subject = 'App api #' . $signature . '# ' . $_SERVER['SERVER_NAME'] . ' (' . $_SERVER['SERVER_ADDR'] . ') Alert Message';
+            $mail_to = [
-            $body = 'Error: ' . $signature . "\n\n";
+                'wangdanfeng@yidian-inc.com',
-            $body .= 'Detail info: ' . $detail_info . "\n\n";
+                'cuiweifeng@yidian-inc.com',
-            $body .= 'Exception info: ' . $exception_info . "\n\n";
+                'luhongguang@yidian-inc.com',
-            $body .= 'Request info: ' . self::accessLog() . "\n\n";
+                'wangdong1@yidian-inc.com',
-            $body .= 'Machine: ' . gethostname();
+                'wanjilong@yidian-inc.com',
-            if (!is_array($mail_to)) {
+                'jianghaiming@yidian-inc.com',
-                $mail_to = [$mail_to];
+                'songxiaohang@yidian-inc.com',
-            }
+                'genghongfei@yidian-inc.com',
+                'mengweifu@yidian-inc.com',
+                'guozhiyuan@yidian-inc.com',
+                'suntengda@yidian-inc.com'
+            ];
+        }
+        $subject = 'App api #' . $signature . '# ' . $_SERVER['SERVER_NAME'] . ' (' . $_SERVER['SERVER_ADDR'] . ') Alert Message';
+        $body = 'Error: ' . $signature . "\n\n";
+        $body .= 'Detail info: ' . $detail_info . "\n\n";
+        $body .= 'Exception info: ' . $exception_info . "\n\n";
+        $body .= 'Request info: ' . self::accessLog() . "\n\n";
+        $body .= 'Machine: ' . gethostname();
+        if (!is_array($mail_to)) {
+            $mail_to = [$mail_to];
+        }
+        if (self::shouldSendEmail(md5($signature)) === true) {
            foreach ($mail_to as $mail) {
-                $key = md5(sprintf("%s,%s", $mail, md5($signature)));
+                Email::sendMail('bp-noreply@yidian-inc.com', $mail, $subject, $body);
-                if (self::shouldSendEmail($key) === true) {
-                    Email::sendMail('bp-noreply@yidian-inc.com', $mail, $subject, $body);
-                }
            }
        }
    }
@@ -122,10 +136,11 @@ class FileLog
    private static function shouldSendEmail($key)
    {
        $result = true;
-//        $cache = new CommonCacheUtil(RedisUtil::CODIS_CLUSTER_ACTION);
+        // 每分钟发一条
-//        if ($cache->add($key, true, 60, CacheUtil::PREFIX_SEND_MAIL) === false) {
+        if (! ApcuUtil::apcu_add_one(self::PREFIX_FILELOG_ERROR, $key, 1, 60)) {
-//            $result = false;
+            $result = false;
-//        }
+        }
        return $result;
    }
 }
--- a/vendor/api/php_utils/src/Mon/MonUtil.php
+++ b/vendor/api/php_utils/src/Mon/MonUtil.php
@@ -70,7 +70,7 @@ class MonUtil{
            }
            //接口返回状态码打点
-            if(!empty($code) && is_numeric($code)){
+            if(isset($code) && is_numeric($code)){
                $result = self::counting($module . "." . (string)$request_uri, (string)$code,1) . "\n";
            }else{
                $result = self::counting($module . "." . (string)$request_uri, (string)-999,1) . "\n";

--- a/vendor/api/php_utils/src/Mysql/Medoo.php
+++ b/vendor/api/php_utils/src/Mysql/Medoo.php
@@ -1077,7 +1077,7 @@ class Medoo
 		$optimizer = '';
 		if(is_null($options)) {
 			// 默认1秒钟超时时间
-			$optimizer = ' /*+ max_execution_time(1000)*/ ';
+			$optimizer = ' /*+ max_execution_time(3000)*/ ';
 		}elseif(isset($options['max_execution_time'])) {
 			$ts = intval($options['max_execution_time']);
 			$optimizer = ' /*+ max_execution_time('. $ts .')*/ ';

--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -32,30 +32,28 @@ private static $installed = array (
    'aliases' => 
    array (
    ),
-    'reference' => '3fb1e7bfb44c282528c719c13beabd3eac4d9cff',
+    'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
    'name' => 'yidian/yaf_demo',
  ),
  'versions' => 
  array (
    'api/php_services' => 
    array (
-      'pretty_version' => 'dev-master',
+      'pretty_version' => 'v1.0.1',
-      'version' => 'dev-master',
+      'version' => '1.0.1.0',
      'aliases' => 
      array (
-        0 => '9999999-dev',
      ),
-      'reference' => 'e7505fbd9f5dda96dd12fffee729a4851b4ab127',
+      'reference' => 'ab75ba5d34e8ee22e8628234a45de8a0dee0a51c',
    ),
    'api/php_utils' => 
    array (
-      'pretty_version' => 'dev-master',
+      'pretty_version' => 'v1.0.1',
-      'version' => 'dev-master',
+      'version' => '1.0.1.0',
      'aliases' => 
      array (
-        0 => '9999999-dev',
      ),
-      'reference' => 'c9c90ab981f939bbf89d321d3101d58da1e797c6',
+      'reference' => '26abffd9afc5b90b7f42f10cf21813bbc3dd4f2d',
    ),
    'bacon/bacon-qr-code' => 
    array (
@@ -298,7 +296,7 @@ private static $installed = array (
      array (
        0 => '1.23.x-dev',
      ),
-      'reference' => '19d03c391c6abb6791f5f757fb36e551bffeaa68',
+      'reference' => '1100343ed1a92e3a38f9ae122fc0eb21602547be',
    ),
    'symfony/property-access' => 
    array (
@@ -334,7 +332,7 @@ private static $installed = array (
      'aliases' => 
      array (
      ),
-      'reference' => '3fb1e7bfb44c282528c719c13beabd3eac4d9cff',
+      'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
    ),
  ),
 );

--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -12,14 +12,14 @@ return array(
    '8825ede83f2f289127722d4e842cf7e8' => $vendorDir . '/symfony/polyfill-intl-grapheme/bootstrap.php',
    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
+    'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
    '7b11c4dc42b3b3023073cb14e519683c' => $vendorDir . '/ralouphie/getallheaders/src/getallheaders.php',
    'ad155f8f1cf0d418fe49e248db8c661b' => $vendorDir . '/react/promise/src/functions_include.php',
-    'b6b991a57620e2fb6b2f66f03fe9ddc2' => $vendorDir . '/symfony/string/Resources/functions.php',
+    '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
-    '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
+    'a9ed0d27b5a698798a89181429f162c5' => $vendorDir . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
    '8592c7b0947d8a0965a9e8c3d16f9c24' => $vendorDir . '/elasticsearch/elasticsearch/src/autoload.php',
    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    'a9ed0d27b5a698798a89181429f162c5' => $vendorDir . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
    '3a37ebac017bc098e9a86b35401e7a68' => $vendorDir . '/mongodb/mongodb/src/functions.php',
 );
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -13,15 +13,15 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
        '8825ede83f2f289127722d4e842cf7e8' => __DIR__ . '/..' . '/symfony/polyfill-intl-grapheme/bootstrap.php',
        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
+        'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
        '7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
        'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
-        'b6b991a57620e2fb6b2f66f03fe9ddc2' => __DIR__ . '/..' . '/symfony/string/Resources/functions.php',
+        '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
        'c964ee0ededf28c96ebd9db5099ef910' => __DIR__ . '/..' . '/guzzlehttp/promises/src/functions_include.php',
        'a0edc8309cc5e1d60e3047b5df6b7052' => __DIR__ . '/..' . '/guzzlehttp/psr7/src/functions_include.php',
-        '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
+        'a9ed0d27b5a698798a89181429f162c5' => __DIR__ . '/..' . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
        '8592c7b0947d8a0965a9e8c3d16f9c24' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/autoload.php',
        '37a3dc5111fe8f707ab4c132ef1dbc62' => __DIR__ . '/..' . '/guzzlehttp/guzzle/src/functions_include.php',
-        'a9ed0d27b5a698798a89181429f162c5' => __DIR__ . '/..' . '/khanamiryan/qrcode-detector-decoder/lib/Common/customFunctions.php',
        '3a37ebac017bc098e9a86b35401e7a68' => __DIR__ . '/..' . '/mongodb/mongodb/src/functions.php',
    );

--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2,21 +2,19 @@
    "packages": [
        {
            "name": "api/php_services",
-            "version": "dev-master",
+            "version": "v1.0.1",
-            "version_normalized": "dev-master",
+            "version_normalized": "1.0.1.0",
            "source": {
                "type": "git",
                "url": "https://git.yidian-inc.com:8021/bp/php_services.git",
-                "reference": "e7505fbd9f5dda96dd12fffee729a4851b4ab127"
+                "reference": "ab75ba5d34e8ee22e8628234a45de8a0dee0a51c"
            },
            "require": {
-                "api/php_utils": "dev-master",
                "endroid/qr-code": "^3.9",
                "perftools/php-profiler": "^0.18.0",
                "php": "7.2.*"
            },
-            "time": "2021-07-28T13:33:13+00:00",
+            "time": "2021-08-02T14:35:19+00:00",
-            "default-branch": true,
            "type": "library",
            "installation-source": "source",
            "autoload": {
@@ -29,12 +27,12 @@
        },
        {
            "name": "api/php_utils",
-            "version": "dev-master",
+            "version": "v1.0.1",
-            "version_normalized": "dev-master",
+            "version_normalized": "1.0.1.0",
            "source": {
                "type": "git",
                "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "c9c90ab981f939bbf89d321d3101d58da1e797c6"
+                "reference": "26abffd9afc5b90b7f42f10cf21813bbc3dd4f2d"
            },
            "require": {
                "elasticsearch/elasticsearch": "~7.0",
@@ -46,8 +44,7 @@
                "mongodb/mongodb": "1.4.3",
                "php": "7.2.*"
            },
-            "time": "2021-07-28T11:11:38+00:00",
+            "time": "2021-08-02T13:20:23+00:00",
-            "default-branch": true,
            "type": "library",
            "installation-source": "source",
            "autoload": {
@@ -1684,18 +1681,18 @@
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "19d03c391c6abb6791f5f757fb36e551bffeaa68"
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/19d03c391c6abb6791f5f757fb36e551bffeaa68",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
-                "reference": "19d03c391c6abb6791f5f757fb36e551bffeaa68",
+                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
                "shasum": ""
            },
            "require": {
                "php": ">=7.1"
            },
-            "time": "2021-07-13T14:34:27+00:00",
+            "time": "2021-07-28T13:41:28+00:00",
            "default-branch": true,
            "type": "library",
            "extra": {
@@ -1746,7 +1743,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/main"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.1"
            },
            "funding": [
                {

--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -6,30 +6,28 @@
    'aliases' => 
    array (
    ),
-    'reference' => '3fb1e7bfb44c282528c719c13beabd3eac4d9cff',
+    'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
    'name' => 'yidian/yaf_demo',
  ),
  'versions' => 
  array (
    'api/php_services' => 
    array (
-      'pretty_version' => 'dev-master',
+      'pretty_version' => 'v1.0.1',
-      'version' => 'dev-master',
+      'version' => '1.0.1.0',
      'aliases' => 
      array (
-        0 => '9999999-dev',
      ),
-      'reference' => 'e7505fbd9f5dda96dd12fffee729a4851b4ab127',
+      'reference' => 'ab75ba5d34e8ee22e8628234a45de8a0dee0a51c',
    ),
    'api/php_utils' => 
    array (
-      'pretty_version' => 'dev-master',
+      'pretty_version' => 'v1.0.1',
-      'version' => 'dev-master',
+      'version' => '1.0.1.0',
      'aliases' => 
      array (
-        0 => '9999999-dev',
      ),
-      'reference' => 'c9c90ab981f939bbf89d321d3101d58da1e797c6',
+      'reference' => '26abffd9afc5b90b7f42f10cf21813bbc3dd4f2d',
    ),
    'bacon/bacon-qr-code' => 
    array (
@@ -272,7 +270,7 @@
      array (
        0 => '1.23.x-dev',
      ),
-      'reference' => '19d03c391c6abb6791f5f757fb36e551bffeaa68',
+      'reference' => '1100343ed1a92e3a38f9ae122fc0eb21602547be',
    ),
    'symfony/property-access' => 
    array (
@@ -308,7 +306,7 @@
      'aliases' => 
      array (
      ),
-      'reference' => '3fb1e7bfb44c282528c719c13beabd3eac4d9cff',
+      'reference' => 'd92a0e16e4bd237c4597255e7d91981f7eb9f9f4',
    ),
  ),
 );
--- a/vendor/symfony/polyfill-php80/bootstrap.php
+++ b/vendor/symfony/polyfill-php80/bootstrap.php
@@ -26,13 +26,13 @@ if (!function_exists('preg_last_error_msg')) {
    function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); }
 }
 if (!function_exists('str_contains')) {
-    function str_contains(string $haystack, string $needle): bool { return p\Php80::str_contains($haystack, $needle); }
+    function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
 }
 if (!function_exists('str_starts_with')) {
-    function str_starts_with(string $haystack, string $needle): bool { return p\Php80::str_starts_with($haystack, $needle); }
+    function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
 }
 if (!function_exists('str_ends_with')) {
-    function str_ends_with(string $haystack, string $needle): bool { return p\Php80::str_ends_with($haystack, $needle); }
+    function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
 }
 if (!function_exists('get_debug_type')) {
    function get_debug_type($value): string { return p\Php80::get_debug_type($value); }