update:解决冲突

application/services/user/Weixin/Weixin.php

 <?php
-namespace App\Services\user\Weixin\Weixin;
-use App\Libraries\Http;
+
+namespace App\Services\user\Weixin;
 
 /**
  * Created by PhpStorm.
- * User: shixing
  * Date: 2018/9/12
  * Time: 10:48
  */

composer.json

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

composer.lock

@@ -4,15 +4,15 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a6ce79abff3778226d347be8c1ba2b8b",
+    "content-hash": "9e0f4999c766018291a1b9b9ffe8d780",
     "packages": [
         {
             "name": "api/php_services",
-            "version": "1.0.16",
+            "version": "1.0.17",
             "source": {
                 "type": "git",
                 "url": "https://git.yidian-inc.com:8021/bp/php_services.git",
-                "reference": "ea80bdaefe875350b425b0aee11f59bf45d7258d"
+                "reference": "5b7bce9db15629dd3b1bcca0d066e2e1f1fae404"
             },
             "require": {
                 "endroid/qr-code": "^3.9",
@@ -26,7 +26,7 @@
                 }
             },
             "description": "bp api php_services",
-            "time": "2021-09-15T02:17:53+00:00"
+            "time": "2021-09-22T06:19:58+00:00"
         },
         {
             "name": "api/php_utils",
@@ -1913,12 +1913,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b"
+                "reference": "412eda2039ad5466f823c3696c0c309e6c140086"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b",
-                "reference": "fa2c5cc3f7dac23d87429652fe0daf28d65cbd5b",
+                "url": "https://api.github.com/repos/symfony/string/zipball/412eda2039ad5466f823c3696c0c309e6c140086",
+                "reference": "412eda2039ad5466f823c3696c0c309e6c140086",
                 "shasum": ""
             },
             "require": {
@@ -1988,7 +1988,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-08-26T08:23:47+00:00"
+            "time": "2021-09-17T07:22:48+00:00"
         }
     ],
     "packages-dev": [],
@@ -2003,5 +2003,5 @@
         "ext-openssl": "*"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.0.0"
 }

vendor/api/php_services/src/JwUser/JwUser.php

@@ -38,7 +38,7 @@ class JwUser
 
         $params = ["mobilePhone" => $params['mobile']];
         $begin =  microtime(true);
-        $user_info  = (new Request())->get($url, $params);
+        $user_info  = (new Request())->get($url, $params, 5000);
         $end = microtime(true);
         $total_time = round(($end - $begin), 4) * 1000;
         if (!empty($user_info['response'])) {
@@ -71,7 +71,7 @@ class JwUser
 
         $params = ["userId" => $params['user_id']];
         $begin =  microtime(true);
-        $user_info  = (new Request())->post($url, $params);
+        $user_info  = (new Request())->post($url, $params, 5000);
         $end = microtime(true);
         $total_time = round(($end - $begin), 4) * 1000;
         if (!empty($user_info['response'])) {
@@ -102,7 +102,7 @@ class JwUser
 
         $params = ["userIds" => $params['user_id']];
         $begin =  microtime(true);
-        $user_info  = (new Request())->post($url, $params);
+        $user_info  = (new Request())->post($url, $params, 5000);
         $end = microtime(true);
         $total_time = round(($end - $begin), 4) * 1000;
         if (!empty($user_info['response'])) {
@@ -133,7 +133,7 @@ class JwUser
         }
         $params = [];
         //$city_list  = (new TimeOut())->runGet($url, $params);
-        $city_list  = (new Request())->get($url, $params);
+        $city_list  = (new Request())->get($url, $params, 5000);
         FileLog::info('jw_user_getAllCityTree', json_encode($city_list));
         if (!$city_list) {
             throw new CodeSpecialException("timeout");

vendor/autoload.php

@@ -4,5 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit79ffc35c65c14e51408ef6c36a392383::getLoader();
-
+return ComposerAutoloaderInite9c1cf708c572b30ccbaa1adb865583e::getLoader();

vendor/composer/ClassLoader.php

@@ -338,7 +338,7 @@ class ClassLoader
      * Loads the given class or interface.
      *
      * @param  string    $class The name of the class
-     * @return true|null True if loaded, null otherwise
+     * @return bool|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
@@ -347,8 +347,6 @@ class ClassLoader
 
             return true;
         }
-
-        return null;
     }
 
     /**

vendor/composer/autoload_classmap.php

@@ -165,6 +165,7 @@ return array(
     'App\\Services\\tcc\\TccService' => $baseDir . '/application/services/tcc/TccService.php',
     'App\\Services\\user\\UserService' => $baseDir . '/application/services/user/UserService.php',
     'App\\Services\\user\\Weixin\\ErrorCode' => $baseDir . '/application/services/user/Weixin/ErrorCode.php',
+    'App\\Services\\user\\Weixin\\Weixin' => $baseDir . '/application/services/user/Weixin/Weixin.php',
     'App\\Services\\user\\Weixin\\WxBizDataCrypt' => $baseDir . '/application/services/user/Weixin/WxBizDataCrypt.php',
     'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'BaconQrCode\\Common\\BitArray' => $vendorDir . '/bacon/bacon-qr-code/src/Common/BitArray.php',

vendor/composer/autoload_real.php

@@ -3,8 +3,7 @@
 // autoload_real.php @generated by Composer
 
 
-class ComposerAutoloaderInit79ffc35c65c14e51408ef6c36a392383
-
+class ComposerAutoloaderInite9c1cf708c572b30ccbaa1adb865583e
 {
     private static $loader;
 
@@ -27,17 +26,14 @@ class ComposerAutoloaderInit79ffc35c65c14e51408ef6c36a392383
         require __DIR__ . '/platform_check.php';
 
 
-        spl_autoload_register(array('ComposerAutoloaderInit79ffc35c65c14e51408ef6c36a392383', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInite9c1cf708c572b30ccbaa1adb865583e', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInit79ffc35c65c14e51408ef6c36a392383', 'loadClassLoader'));
-
+        spl_autoload_unregister(array('ComposerAutoloaderInite9c1cf708c572b30ccbaa1adb865583e', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit79ffc35c65c14e51408ef6c36a392383::getInitializer($loader));
-
+            call_user_func(\Composer\Autoload\ComposerStaticInite9c1cf708c572b30ccbaa1adb865583e::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -58,16 +54,13 @@ class ComposerAutoloaderInit79ffc35c65c14e51408ef6c36a392383
         $loader->register(true);
 
         if ($useStaticLoader) {
-
-            $includeFiles = Composer\Autoload\ComposerStaticInit79ffc35c65c14e51408ef6c36a392383::$files;
-
+ 
+            $includeFiles = Composer\Autoload\ComposerStaticInite9c1cf708c572b30ccbaa1adb865583e::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-
-            composerRequire79ffc35c65c14e51408ef6c36a392383($fileIdentifier, $file);
-
+            composerRequiree9c1cf708c572b30ccbaa1adb865583e($fileIdentifier, $file);
         }
 
         return $loader;
@@ -75,8 +68,7 @@ class ComposerAutoloaderInit79ffc35c65c14e51408ef6c36a392383
 }
 
 
-function composerRequire79ffc35c65c14e51408ef6c36a392383($fileIdentifier, $file)
-
+function composerRequiree9c1cf708c572b30ccbaa1adb865583e($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
         require $file;

vendor/composer/autoload_static.php

@@ -4,8 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit79ffc35c65c14e51408ef6c36a392383
-
+class ComposerStaticInite9c1cf708c572b30ccbaa1adb865583e
 {
     public static $files = array (
         'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@@ -394,6 +393,7 @@ class ComposerStaticInit79ffc35c65c14e51408ef6c36a392383
         'App\\Services\\tcc\\TccService' => __DIR__ . '/../..' . '/application/services/tcc/TccService.php',
         'App\\Services\\user\\UserService' => __DIR__ . '/../..' . '/application/services/user/UserService.php',
         'App\\Services\\user\\Weixin\\ErrorCode' => __DIR__ . '/../..' . '/application/services/user/Weixin/ErrorCode.php',
+        'App\\Services\\user\\Weixin\\Weixin' => __DIR__ . '/../..' . '/application/services/user/Weixin/Weixin.php',
         'App\\Services\\user\\Weixin\\WxBizDataCrypt' => __DIR__ . '/../..' . '/application/services/user/Weixin/WxBizDataCrypt.php',
         'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'BaconQrCode\\Common\\BitArray' => __DIR__ . '/..' . '/bacon/bacon-qr-code/src/Common/BitArray.php',
@@ -1315,10 +1315,10 @@ class ComposerStaticInit79ffc35c65c14e51408ef6c36a392383
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit79ffc35c65c14e51408ef6c36a392383::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit79ffc35c65c14e51408ef6c36a392383::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit79ffc35c65c14e51408ef6c36a392383::$classMap;
 
+            $loader->prefixLengthsPsr4 = ComposerStaticInite9c1cf708c572b30ccbaa1adb865583e::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInite9c1cf708c572b30ccbaa1adb865583e::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInite9c1cf708c572b30ccbaa1adb865583e::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/symfony/string/Resources/data/wcswidth_table_wide.php

@@ -3,8 +3,8 @@
 /*
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
- * Unicode version: 13.0.0
- * Date: 2020-03-12T08:04:33+00:00
+ * Unicode version: 14.0.0
+ * Date: 2021-09-17T09:20:30+02:00
  */
 
 return [
@@ -450,10 +450,6 @@ return [
     ],
     [
         19968,
-        40956,
-    ],
-    [
-        40957,
         40959,
     ],
     [
@@ -840,13 +836,25 @@ return [
         101632,
         101640,
     ],
+    [
+        110576,
+        110579,
+    ],
+    [
+        110581,
+        110587,
+    ],
+    [
+        110589,
+        110590,
+    ],
     [
         110592,
         110847,
     ],
     [
         110848,
-        110878,
+        110882,
     ],
     [
         110928,
@@ -996,6 +1004,10 @@ return [
         128725,
         128727,
     ],
+    [
+        128733,
+        128735,
+    ],
     [
         128747,
         128748,
@@ -1008,6 +1020,10 @@ return [
         128992,
         129003,
     ],
+    [
+        129008,
+        129008,
+    ],
     [
         129292,
         129338,
@@ -1018,14 +1034,6 @@ return [
     ],
     [
         129351,
-        129400,
-    ],
-    [
-        129402,
-        129483,
-    ],
-    [
-        129485,
         129535,
     ],
     [
@@ -1034,7 +1042,7 @@ return [
     ],
     [
         129656,
-        129658,
+        129660,
     ],
     [
         129664,
@@ -1042,34 +1050,42 @@ return [
     ],
     [
         129680,
-        129704,
+        129708,
     ],
     [
         129712,
-        129718,
+        129722,
     ],
     [
         129728,
-        129730,
+        129733,
     ],
     [
         129744,
-        129750,
+        129753,
+    ],
+    [
+        129760,
+        129767,
+    ],
+    [
+        129776,
+        129782,
     ],
     [
         131072,
-        173789,
+        173791,
     ],
     [
-        173790,
+        173792,
         173823,
     ],
     [
         173824,
-        177972,
+        177976,
     ],
     [
-        177973,
+        177977,
         177983,
     ],
     [

vendor/symfony/string/Resources/data/wcswidth_table_zero.php

@@ -3,8 +3,8 @@
 /*
  * This file has been auto-generated by the Symfony String Component for internal use.
  *
- * Unicode version: 13.0.0
- * Date: 2020-03-12T08:04:34+00:00
+ * Unicode version: 14.0.0
+ * Date: 2021-09-17T09:20:30+02:00
  */
 
 return [
@@ -109,7 +109,11 @@ return [
         2139,
     ],
     [
-        2259,
+        2200,
+        2207,
+    ],
+    [
+        2250,
         2273,
     ],
     [
@@ -272,6 +276,10 @@ return [
         3076,
         3076,
     ],
+    [
+        3132,
+        3132,
+    ],
     [
         3134,
         3136,
@@ -470,7 +478,7 @@ return [
     ],
     [
         5938,
-        5940,
+        5939,
     ],
     [
         5970,
@@ -504,6 +512,10 @@ return [
         6155,
         6157,
     ],
+    [
+        6159,
+        6159,
+    ],
     [
         6277,
         6278,
@@ -574,7 +586,7 @@ return [
     ],
     [
         6847,
-        6848,
+        6862,
     ],
     [
         6912,
@@ -666,10 +678,6 @@ return [
     ],
     [
         7616,
-        7673,
-    ],
-    [
-        7675,
         7679,
     ],
     [
@@ -916,6 +924,10 @@ return [
         69446,
         69456,
     ],
+    [
+        69506,
+        69509,
+    ],
     [
         69633,
         69633,
@@ -924,6 +936,14 @@ return [
         69688,
         69702,
     ],
+    [
+        69744,
+        69744,
+    ],
+    [
+        69747,
+        69748,
+    ],
     [
         69759,
         69761,
@@ -936,6 +956,10 @@ return [
         69817,
         69818,
     ],
+    [
+        69826,
+        69826,
+    ],
     [
         69888,
         69890,
@@ -1252,6 +1276,14 @@ return [
         113821,
         113822,
     ],
+    [
+        118528,
+        118573,
+    ],
+    [
+        118576,
+        118598,
+    ],
     [
         119143,
         119145,
@@ -1320,6 +1352,10 @@ return [
         123184,
         123190,
     ],
+    [
+        123566,
+        123566,
+    ],
     [
         123628,
         123631,