update: HttpUtil

vendor/api/php_services/src/Certification/IdCertification.php

@@ -8,9 +8,9 @@ class IdCertification
 {
     private const key                   = '_v7QkFPgzb887YD6BuBqzHPJMJalJ6Zt';
     private const secret                = 'mDenoicZs2U_wd2jVmQQpCOPeM8jaFRu';
-    private const kuangshi_ocr_url      = 'https://api.megvii.com/faceid/v3/ocridcard';
-    private const kuangshi_get_token    = 'https://api.megvii.com/faceid/v3/sdk/get_biz_token';
-    private const kuangshi_face_compare = 'https://api.megvii.com/faceid/v3/sdk/verify';
+    public const kuangshi_ocr_url      = 'https://api.megvii.com/faceid/v3/ocridcard';
+    public const kuangshi_get_token    = 'https://api.megvii.com/faceid/v3/sdk/get_biz_token';
+    public const kuangshi_face_compare = 'https://api.megvii.com/faceid/v3/sdk/verify';
 
     /**
      * 身份证合法校验
@@ -232,6 +232,7 @@ class IdCertification
         $final_data['birth_year'] = $ocr_data['response']['birth_year']['result'] ?? '';
         $final_data['completeness'] = $ocr_data['response']['completeness'] ?? -1;
         $final_data['legality'] = $ocr_data['response']['legality'] ?? (object)[];
+        $final_data['code'] = $ocr_data['response']['code'] ?? -1;
         return $final_data;
     }
 
@@ -247,6 +248,7 @@ class IdCertification
         $final_data['valid_date_end'] = $ocr_data['response']['valid_date_end']['result'] ?? '';
         $final_data['completeness'] = $ocr_data['response']['completeness'] ?? -1;
         $final_data['legality'] = $ocr_data['response']['legality'] ?? (object)[];
+        $final_data['code'] = $ocr_data['response']['code'] ?? -1;
         return $final_data;
     }
 }
\ No newline at end of file

vendor/api/php_services/src/Certification/SocialCreditCertification.php

@@ -7,7 +7,7 @@ class SocialCreditCertification
 {
     private const account           = 'BJyimingzhineng';
     private const app_key           = 'deee9c9877e5452f8838cfc5130ac5ad';
-    private const ocr_bussiness_url = 'http://apistore.xmturui.com/apistore/ocr-new';
+    public const ocr_bussiness_url = 'http://apistore.xmturui.com/apistore/ocr-new';
     private const engine_type       = 'blic-new';
 
     /**

vendor/api/php_services/src/Certification/ThreeElementsCertification.php

@@ -8,7 +8,7 @@ class ThreeElementsCertification
 {
     private const app_key                  = '392df35aa98721c597cf20b85d21eebc';
     //运营商三要素检测接口
-    private const test_mobile3_ele_Sim_url = 'https://api.goodsdatas.com:8443/credit/Mobile3EleSim';
+    public const test_mobile3_ele_Sim_url = 'https://api.goodsdatas.com:8443/credit/Mobile3EleSim';
 
     //加密需要的相关参数
     private const salt = 'A99BC8325635E303';

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

@@ -13,6 +13,7 @@ namespace  Api\PhpServices\JwUser;
 use Api\PhpUtils\Common\TimeOut;
 use Api\PhpUtils\Http\Request;
 use App\Exception\custom\CodeSpecialException;
+use Api\PhpUtils\Log\FileLog;
 
 class JwUser
 {
@@ -24,6 +25,7 @@ class JwUser
      */
     public function getUserInfo($params)
     {
+       
         $url = config('interface', 'service.jw_user.get_user_info');
         if (!$url) {
             throw new CodeSpecialException("failed");
@@ -34,11 +36,13 @@ class JwUser
         }
 
         $params = ["mobilePhone" => $params['mobile']];
-        $user_info  = (new TimeOut())->runGet($url, $params);
+        //$user_info  = (new TimeOut())->runGet($url, $params);
+        $user_info  = (new Request())->get($url, $params);
+        FileLog::info('jw_user_getUserInfo', json_encode($user_info));
         if (!$user_info) {
             throw new CodeSpecialException("timeout");
         }
-        return $user_info;
+        return !empty($user_info['response']) ? $user_info['response'] : [];
     }
     /**
      * 获取单条信息
@@ -56,11 +60,13 @@ class JwUser
         }
 
         $params = ["userId" => $params['user_id']];
-        $user_info  = (new TimeOut())->runPost($url, $params);
+        //$user_info  = (new TimeOut())->runPost($url, $params);
+        $user_info  = (new Request())->post($url, $params, 0, '', '', 0,true,'jw_user');
+        FileLog::info('jw_user_getUserByUserId', json_encode($user_info));
         if (!$user_info) {
             throw new CodeSpecialException("timeout");
         }
-        return $user_info;
+        return !empty($user_info['response']) ? $user_info['response'] : [];
     }
 
     public function getUserList($params)
@@ -75,11 +81,13 @@ class JwUser
         }
 
         $params = ["userIds" => $params['user_id']];
-        $user_info  = (new TimeOut())->runPost($url, $params);
+        //$user_info  = (new TimeOut())->runPost($url, $params);
+        $user_info  = (new Request())->post($url, $params, 0, '', '', 0,true,'jw_user');
+        FileLog::info('jw_user_getUserList', json_encode($user_info));
         if (!$user_info) {
             throw new CodeSpecialException("timeout");
         }
-        return $user_info;
+        return !empty($user_info['response']) ? $user_info['response'] : [];
     }
 
 
@@ -95,11 +103,13 @@ class JwUser
             throw new CodeSpecialException("failed");
         }
         $params = [];
-        $city_list  = (new TimeOut())->runGet($url, $params);
+        //$city_list  = (new TimeOut())->runGet($url, $params);
+        $city_list  = (new Request())->get($url, $params);
+        FileLog::info('jw_user_getAllCityTree', json_encode($city_list));
         if (!$city_list) {
             throw new CodeSpecialException("timeout");
         }
-        return $city_list;
+        return !empty($city_list['response']) ? $city_list['response'] : [];
     }
 
 
@@ -118,11 +128,13 @@ class JwUser
         if (empty($params)) {
             throw new CodeSpecialException("failed");
         }
-        $pushToken  = (new TimeOut())->runPost($url, $params);
+        //$pushToken  = (new TimeOut())->runPost($url, $params);
+        $pushToken  = (new Request())->post($url, $params, 0, '', '', 0,true,'jw_user');
+        FileLog::info('jw_user_savePushToken', json_encode($pushToken));
         if (!$pushToken) {
             throw new CodeSpecialException("timeout");
         }
-        return $pushToken;
+        return !empty($pushToken['response']) ? $pushToken['response'] : [];
     }
 
     /**
@@ -141,11 +153,13 @@ class JwUser
         }
 
         $params = ["userIds" => $params['user_id']];
-        $list  = (new TimeOut())->runPost($url, $params);
+        //$list  = (new TimeOut())->runPost($url, $params);
+        $list  = (new Request())->post($url, $params, 0, '', '', 0,true,'jw_user');
+        FileLog::info('jw_user_getUserListWithDynamic', json_encode($list));
         if (!$list) {
             throw new CodeSpecialException("timeout");
         }
-        return $list;
+        return !empty($list['response']) ? $list['response'] : [];
     }
 
     /**
@@ -164,28 +178,30 @@ class JwUser
         }
 
         $params = ["userId" => $params['user_id']];
-        $list  = (new TimeOut())->runPost($url, $params);
+        //$list  = (new TimeOut())->runPost($url, $params);
+        $list  = (new Request())->post($url, $params, 0, '', '', 0,true,'jw_user');
+        FileLog::info('jw_user_getUserDigg', json_encode($list));
         if (!$list) {
             throw new CodeSpecialException("timeout");
         }
-        return $list;
+        return !empty($list['response']) ? $list['response'] : [];
     }
 
     /**
      * 给简网同步生活号
      */
-
     public static function saveUpdateLife($params)
     {
         $url = config('interface', 'service.jw_user.save_update_life');
         if (!$url) {
             throw new CodeSpecialException("failed");
         }
-
-        $ret  = (new TimeOut())->runPost($url, $params);
+        //$ret  = (new TimeOut())->runPost($url, $params);
+        $ret  = (new Request())->post($url, $params, 0, '', '', 0,true,'jw_user');
+        FileLog::info('jw_user_saveUpdateLife', json_encode($ret));
         if (!$ret) {
             throw new CodeSpecialException("timeout");
         }
-        return $ret;
+        return !empty($ret['response']) ? $ret['response'] : [];
     }
-}
+}
\ No newline at end of file

vendor/api/php_services/src/Ksy/Ks3Api.php

+<?php
+
+namespace Api\PhpServices\Ksy;
+
+use Api\PhpUtils\Http\HttpUtil;
+
+/**
+ * 文档: http://ydwiki.yidian-inc.com/pages/viewpage.action?pageId=68515904
+ * Class Ks3Api
+ * @package Api\PhpServices\Ksy
+ */
+class Ks3Api
+{
+    const KSYUN_SK = "3wm9z0P0ja6NceaZYf477EDZrJs7dSSZ";
+    const KSYUN_AK = "47DA6034D64E7023";
+    const KS_DATE_SCHEME = 'D, d M Y H:i:s \G\M\T';
+    const BASE_URL = "http://image-upload.int.yidian-inc.com";
+    const BASE_GEN_URL = "http://image-urlgen.int.yidian-inc.com";
+    const PATH_GEN = "/v1/key/gen";
+    const PATH_SIGNATURE = "/v1/ks3/signature";
+    const PATH_PIC_ENCRYPT_URL = "/v1/url/gen";
+    const PATH_PIC_UPLOAD = "/upload";
+    const AUDIT_ID = "shqbp";
+
+    const TYPE_QUALIFICATION = "shq_qualification";//商户资质
+    const TYPE_GOODS = "shq_goods";//商品图片
+    public static $typeList = [
+        self::TYPE_QUALIFICATION,
+        self::TYPE_GOODS
+    ];
+
+    /**
+     * 获取bucket与objectKey
+     * @param $type
+     * @return mixed
+     */
+    public static function gen($type)
+    {
+        $url = self::BASE_URL . self::PATH_GEN;
+
+        $timestamp = self::msectime();
+        $md5Str = $type . "&" . $timestamp . "&" . self::KSYUN_SK;
+        $signature = self::KSYUN_AK . ":" . md5($md5Str);
+
+        $params = [
+            "timestamp" => $timestamp,
+            "signature" => $signature,
+            "type" => $type,
+        ];
+        return HttpUtil::post($url, $params);
+    }
+
+    /**
+     * 获取KS签名
+     * @param $resource
+     * @param $httpMethod
+     * @param $contentType
+     * @param $contentMd5
+     * @param $headers
+     * @return array
+     */
+    public static function signature($resource, $httpMethod, $contentType, $contentMd5, $headers, $date)
+    {
+        $url = self::BASE_URL . self::PATH_SIGNATURE;
+
+        $timestamp = self::msectime();
+
+        $md5Str = $httpMethod . "&" . $contentType . "&" . $contentMd5 . "&" . $date . "&" . $resource . "&" . $headers . "&" . $timestamp . "&" . self::KSYUN_SK;
+        $signature = self::KSYUN_AK . ":" . md5($md5Str);
+
+        $params = [
+            "timestamp" => $timestamp,
+            "signature" => $signature,
+            "http_method" => $httpMethod,
+            "content_type" => $contentType,
+            "date" => $date,
+            "content_md5" => $contentMd5,
+            "resource" => $resource,
+            "headers" => $headers,
+        ];
+        return HttpUtil::post($url, $params);
+    }
+
+    /**
+     * 生成图片访问加密链接
+     * @param $imageId
+     * @param $authId
+     * @param $widthSize
+     * @param $highSize
+     * @param int $expirationTime
+     * @return mixed
+     */
+    public static function picEncryptUrl($imageId, $widthSize = 0, $highSize = 0, $expirationTime = 60 * 60 * 24 * 365)
+    {
+        $url = self::BASE_GEN_URL . self::PATH_PIC_ENCRYPT_URL;
+        $timestamp = self::msectime();
+        $extend = [];
+        $extend["expiration_time"] = $expirationTime;
+        if (!empty($widthSize) && !empty($highSize)) {
+            $extend["query"] = "type=thumbnail_" . $widthSize . "x" . $highSize;
+        }
+        $extendJsonStr = json_encode($extend);
+        $md5Str = $extendJsonStr . "&" . $imageId . "&" . self::AUDIT_ID . "&" . $timestamp . "&" . self::KSYUN_SK;
+        $signature = self::KSYUN_AK . ":" . md5($md5Str);
+
+        $contentType = 'multipart/form-data';
+        $params = [
+            "image_id" => $imageId,
+            "auth_id" => self::AUDIT_ID,
+            "timestamp" => $timestamp,
+            "signature" => $signature,
+            "content_type" => $contentType,
+            "extend" => $extendJsonStr,
+        ];
+        return HttpUtil::post($url, $params);
+    }
+
+    /**
+     * 上传图片
+     * @param int $type
+     * @return mixed
+     */
+    public static function upload($type)
+    {
+        $url = self::BASE_URL . self::PATH_PIC_UPLOAD;
+        $timestamp = self::msectime();
+
+        $handle = fopen($_FILES['file']['tmp_name'], 'r');
+        $content = fread($handle, filesize($_FILES['file']['tmp_name']));
+
+        $extend = ["type" => $type];
+        $extendJsonStr = json_encode($extend);
+        $md5Str = $extendJsonStr . "&" . md5($content) . "&" . $timestamp . "&" . self::KSYUN_SK;
+        $signature = self::KSYUN_AK . ":" . md5($md5Str);
+
+        $params = [
+            "pic" => new \CURLFile($_FILES['file']['tmp_name'], $_FILES['file']['type']),
+            "timestamp" => $timestamp,
+            "signature" => $signature,
+            "extend" => $extendJsonStr,
+        ];
+        return HttpUtil::post($url, $params);
+    }
+
+    /**
+     * 时间戳（毫秒）
+     * @return float
+     */
+    private static function msectime()
+    {
+        list($msec, $sec) = explode(' ', microtime());
+        return (float)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);
+    }
+}
\ No newline at end of file

vendor/api/php_services/src/Ksy/Ksyun.php

@@ -2,6 +2,8 @@
 
 namespace Api\PhpServices\Ksy;
 use Api\PhpUtils\Http\Request;
+use Api\PhpUtils\Mon\MonUtil;
+use GuzzleHttp\TransferStats;
 
 class Ksyun
 {
@@ -41,6 +43,12 @@ class Ksyun
         ];
 
         $res = (new Request())->post(self::get_down_from_ksyun, $post_data,50, 'json',[],1,true);
+        if(isset($res['response']['code'])){
+            $code = $res['response']['code'];
+        }else{
+            $code = -1;
+        }
+        (new MonUtil())::proxyMon(self::get_down_from_ksyun, $code, 'merchant',round((new TransferStats())->getHandlerStat('total_time'),4) * 1000);
         if (isset($res['code'],$res['response']['status']) && $res['response']['status'] === 'success') {
             return $res['response']['data'];
         }

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 bool|null True if loaded, null otherwise
+     * @return true|null True if loaded, null otherwise
      */
     public function loadClass($class)
     {
@@ -347,6 +347,8 @@ class ClassLoader
 
             return true;
         }
+
+        return null;
     }
 
     /**

vendor/composer/autoload_classmap.php

@@ -18,6 +18,7 @@ return array(
     'Api\\PhpServices\\Idgen\\Idgen' => $vendorDir . '/api/php_services/src/Idgen/Idgen.php',
     'Api\\PhpServices\\Interaction\\InterDynamic' => $vendorDir . '/api/php_services/src/Interaction/InterDynamic.php',
     'Api\\PhpServices\\JwUser\\JwUser' => $vendorDir . '/api/php_services/src/JwUser/JwUser.php',
+    'Api\\PhpServices\\Ksy\\Ks3Api' => $vendorDir . '/api/php_services/src/Ksy/Ks3Api.php',
     'Api\\PhpServices\\Ksy\\Ksyun' => $vendorDir . '/api/php_services/src/Ksy/Ksyun.php',
     'Api\\PhpServices\\LifeAccount\\Account' => $vendorDir . '/api/php_services/src/LifeAccount/Account.php',
     'Api\\PhpServices\\Login\\Login' => $vendorDir . '/api/php_services/src/Login/Login.php',
@@ -50,6 +51,7 @@ return array(
     'Api\\PhpUtils\\Elastic\\Manager\\DocumentManager' => $vendorDir . '/api/php_utils/src/Elastic/Manager/DocumentManager.php',
     'Api\\PhpUtils\\Elastic\\Manager\\IndexManager' => $vendorDir . '/api/php_utils/src/Elastic/Manager/IndexManager.php',
     'Api\\PhpUtils\\Http\\Base' => $vendorDir . '/api/php_utils/src/Http/Base.php',
+    'Api\\PhpUtils\\Http\\HttpUtil' => $vendorDir . '/api/php_utils/src/Http/HttpUtil.php',
     'Api\\PhpUtils\\Http\\Request' => $vendorDir . '/api/php_utils/src/Http/Request.php',
     'Api\\PhpUtils\\Hystrix\\ApcuStateStorage' => $vendorDir . '/api/php_utils/src/Hystrix/ApcuStateStorage.php',
     'Api\\PhpUtils\\Hystrix\\DemoCommand' => $vendorDir . '/api/php_utils/src/Hystrix/DemoCommand.php',

vendor/composer/autoload_static.php

@@ -252,6 +252,7 @@ class ComposerStaticInit449f7c51756999ca9c3a3daf8077484c
         'Api\\PhpServices\\Idgen\\Idgen' => __DIR__ . '/..' . '/api/php_services/src/Idgen/Idgen.php',
         'Api\\PhpServices\\Interaction\\InterDynamic' => __DIR__ . '/..' . '/api/php_services/src/Interaction/InterDynamic.php',
         'Api\\PhpServices\\JwUser\\JwUser' => __DIR__ . '/..' . '/api/php_services/src/JwUser/JwUser.php',
+        'Api\\PhpServices\\Ksy\\Ks3Api' => __DIR__ . '/..' . '/api/php_services/src/Ksy/Ks3Api.php',
         'Api\\PhpServices\\Ksy\\Ksyun' => __DIR__ . '/..' . '/api/php_services/src/Ksy/Ksyun.php',
         'Api\\PhpServices\\LifeAccount\\Account' => __DIR__ . '/..' . '/api/php_services/src/LifeAccount/Account.php',
         'Api\\PhpServices\\Login\\Login' => __DIR__ . '/..' . '/api/php_services/src/Login/Login.php',
@@ -284,6 +285,7 @@ class ComposerStaticInit449f7c51756999ca9c3a3daf8077484c
         'Api\\PhpUtils\\Elastic\\Manager\\DocumentManager' => __DIR__ . '/..' . '/api/php_utils/src/Elastic/Manager/DocumentManager.php',
         'Api\\PhpUtils\\Elastic\\Manager\\IndexManager' => __DIR__ . '/..' . '/api/php_utils/src/Elastic/Manager/IndexManager.php',
         'Api\\PhpUtils\\Http\\Base' => __DIR__ . '/..' . '/api/php_utils/src/Http/Base.php',
+        'Api\\PhpUtils\\Http\\HttpUtil' => __DIR__ . '/..' . '/api/php_utils/src/Http/HttpUtil.php',
         'Api\\PhpUtils\\Http\\Request' => __DIR__ . '/..' . '/api/php_utils/src/Http/Request.php',
         'Api\\PhpUtils\\Hystrix\\ApcuStateStorage' => __DIR__ . '/..' . '/api/php_utils/src/Hystrix/ApcuStateStorage.php',
         'Api\\PhpUtils\\Hystrix\\DemoCommand' => __DIR__ . '/..' . '/api/php_utils/src/Hystrix/DemoCommand.php',

vendor/composer/installed.json

@@ -7,7 +7,7 @@
             "source": {
                 "type": "git",
                 "url": "https://gitlab.yidian-inc.com/bp/php_services.git",
-                "reference": "58888c4a083e384080d78606f362809a89b8c672"
+                "reference": "e68700976b8cca3ecf4de5bfdb8c0df1276a25bd"
             },
             "require": {
                 "api/php_utils": "dev-master",
@@ -15,7 +15,7 @@
                 "perftools/php-profiler": "^0.18.0",
                 "php": "7.2.*"
             },
-            "time": "2021-07-09T13:44:16+00:00",
+            "time": "2021-07-14T13:59:01+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "source",
@@ -34,7 +34,7 @@
             "source": {
                 "type": "git",
                 "url": "https://gitlab.yidian-inc.com/bp/php_utils.git",
-                "reference": "6495e3a31134e644072208c19610924912f4683a"
+                "reference": "3c343d9deec02d60db43c034d1c5916b024eed3a"
             },
             "require": {
                 "elasticsearch/elasticsearch": "~7.0",
@@ -46,7 +46,7 @@
                 "mongodb/mongodb": "1.4.3",
                 "php": "7.2.*"
             },
-            "time": "2021-07-10T12:30:06+00:00",
+            "time": "2021-07-14T12:48:42+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "source",
@@ -1282,12 +1282,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "36b691b0bdbc963fb610da193a48b4c009d03a62"
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/36b691b0bdbc963fb610da193a48b4c009d03a62",
-                "reference": "36b691b0bdbc963fb610da193a48b4c009d03a62",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/6f981ee24cf69ee7ce9736146d1c57c2780598a8",
+                "reference": "6f981ee24cf69ee7ce9736146d1c57c2780598a8",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1299,7 +1299,7 @@
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2021-06-09T13:36:38+00:00",
+            "time": "2021-07-12T14:48:14+00:00",
             "default-branch": true,
             "type": "library",
             "extra": {
@@ -1890,12 +1890,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
+                "reference": "19d03c391c6abb6791f5f757fb36e551bffeaa68"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
-                "reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/19d03c391c6abb6791f5f757fb36e551bffeaa68",
+                "reference": "19d03c391c6abb6791f5f757fb36e551bffeaa68",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1907,7 +1907,7 @@
             "require": {
                 "php": ">=7.1"
             },
-            "time": "2021-02-19T12:13:01+00:00",
+            "time": "2021-07-13T14:34:27+00:00",
             "default-branch": true,
             "type": "library",
             "extra": {
@@ -1958,7 +1958,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/main"
             },
             "funding": [
                 {

vendor/symfony/polyfill-php80/README.md

@@ -16,7 +16,7 @@ This component provides features added to PHP 8.0 core:
 - [`get_resource_id`](https://php.net/get_resource_id)
 
 More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
 
 License
 =======