update:composer update

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 $bucket
+     * @param $objectKey
+     * @param $httpMethod
+     * @param $contentType
+     * @param $contentMd5
+     * @param $headers
+     * @return array
+     */
+    public static function signature($bucket, $objectKey, $httpMethod, $contentType, $contentMd5, $headers)
+    {
+        $url = self::BASE_URL . self::PATH_SIGNATURE;
+
+        $timestamp = self::msectime();
+        $date = gmdate(self::KS_DATE_SCHEME);
+        $resource = "/" . $bucket . "/" . $objectKey;
+
+        $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, $highSize, $expirationTime = 60 * 60 * 24 * 365)
+    {
+        $url = self::BASE_GEN_URL . self::PATH_PIC_ENCRYPT_URL;
+        $timestamp = self::msectime();
+        $extend = [];
+        $extend["expiration_time"] = $expirationTime;
+        if ($widthSize && $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/ShopImage/GetImage.php

@@ -107,6 +107,16 @@ class GetImage
         imagedestroy($qr_img);
     }
 
+    /**
+     * @param string $code 二维码扫描后内容
+     *
+     */
+    public function getShare(string $code){
+        $qrCode = new QrCode($code);
+        header('Content-Type: '.$qrCode->getContentType());
+        echo $qrCode->writeString();die;
+    }
+
     /**
      * @param string $head_img 头像url地址
      * @param string $goods_img 商品图片url地址

vendor/api/php_services/src/Sms/Sms.php

@@ -31,7 +31,7 @@ class Sms
             'appid' => !empty($params['appid']) ? $params['appid'] : '',
             'code' => !empty($params['code']) ? $params['code'] : '',
             'key' => 'f16bdd46292480b4b82c841d90a6ba02',
-            'partner' => 'merchant-b'
+            'partner' => !empty($params['appid']) ? $params['appid'] : '',
         ];
     
         $sms  = (new TimeOut())->runGet($url, $params);
@@ -75,7 +75,7 @@ class Sms
             'appid' => !empty($params['appid']) ? $params['appid'] : 'hubble',
             'scene' => !empty($params['scene']) ? $params['scene'] : '',
             'key' => 'f16bdd46292480b4b82c841d90a6ba02',
-            'partner' => 'merchant-b',
+            'partner' => !empty($params['appid']) ? $params['appid'] : '',
             'template' => !empty($params['template']) ? $params['template'] : 7,
             'code_lenght' => !empty($params['code_lenght']) ? $params['code_lenght'] : 6,
             'ticket_expire' => !empty($params['ticket_expire']) ? $params['ticket_expire'] : 86400,

vendor/api/php_utils/src/Cache/CacheUtil.php

@@ -45,10 +45,17 @@ class CacheUtil
         if (empty($serverName)) {
             return null;
         }
-        if (isset(self::$instances[$serverName])) {
-            return self::$instances[$serverName];
+        if (empty($options)) {
+            $instancesKey = $serverName;
+        } else {
+            $instancesKey = $serverName . ':' . json_encode($options);
+        }
+        if (isset(self::$instances[$instancesKey])) {
+            return self::$instances[$instancesKey];
         }
-        return self::$instances[$serverName] = new Self($serverName, $options);
+        
+        return self::$instances[$instancesKey] = new Self($serverName, $options);
+
     }
 
     private function __construct($serverName = '', array $options = [])

vendor/api/php_utils/src/Http/HttpUtil.php

+<?php
+
+namespace Api\PhpUtils\Http;
+/*
+ * Copyright 2011-2012 Hipu Holding Inc, Beijing. All Rights Reserved.
+ * DO NOT ALERT OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * This code is distributed as free software within the company.
+ * You can redistribute it and/or modify it without any restriction.
+ * 
+ * If you need additional information or have any questions,
+ * please contact: xukf@hipu.com.
+ */
+
+/**
+ * Description of HttpUtil
+ *
+ * @author mengweifu
+ * @date 2021-7-12 20:00:00
+ */
+
+
+use Api\PhpUtils\Log\FileLog;
+use Api\PhpUtils\Mon\MonUtil;
+
+class HttpUtil
+{
+    private const CODE_SUCCESS = 0;
+    private const CODE_FAIL = 999999;
+
+    static function HEAD($url, $timeout = 10000, $retries = 1, $headers = false, $proxy = false)
+    {
+        return self::CURL($url, $timeout, $retries, $headers, false, $proxy, 'HEAD');
+    }
+    static function GET($url, $params,  $timeout = 10000, $retries = 1, $headers = false, $proxy = false, $curl_opts = array())
+    {
+        $url = $url ."?". http_build_query($params);
+        return self::CURL($url, $timeout, $retries, $headers, [], $proxy, 'GET', $curl_opts);
+    }
+    
+    static function PUT($url, $post, $timeout = 10000, $retries = 1, $headers = false, $proxy = false)
+    {
+        return self::CURL($url, $timeout, $retries, $headers, $post, $proxy, 'PUT');
+    }
+
+    static function POST($url, $post, $timeout = 10000, $retries = 1, $headers = false, $proxy = false, $curl_opts = array())
+    {
+        return self::CURL($url, $timeout, $retries, $headers, $post, $proxy, 'POST', $curl_opts);
+    }
+
+    static function DELETE($url, $timeout = 10000, $retries = 1, $headers = false, $proxy = false)
+    {
+        return self::CURL($url, $timeout, $retries, $headers, false, $proxy, 'DELETE');
+    }
+    static function CURL($url, $timeout, $retries, $headers, $post = false, $proxy = false,  $method = 'GET', $curl_opts = array())
+    {
+
+        $ch = self::CH($url, $timeout, $headers, $post, $proxy, $method, $curl_opts);
+
+
+        $result             = false;   //返回结果
+        $result_code        = self::CODE_FAIL; //错误代码
+        $result_http_code   = 0; // http code
+        $error_msg          = ''; // ch error
+
+        if (is_resource($ch) === true)
+        {
+            while (($result === false) && ($retries-- > 0))
+            {
+                $result = curl_exec($ch);
+            }
+
+            // { todo
+            if (curl_errno($ch) !== 0)
+            {
+                $GLOBALS['ERROR_MESSAGE'] = curl_error($ch);
+            }
+            $GLOBALS['HTTP_CODE'] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+            if( isset($GLOBALS['ENABLE_HEADER_REQUEST_TIME']) )
+            {
+                $GLOBALS['BELENDER_CURL_INFO'] = curl_getinfo($ch);
+                //在返回header中添加blender响应时间
+                $GLOBALS['DEPENDENT-REQUEST-TIME'] = round(curl_getinfo($ch, CURLINFO_TOTAL_TIME),4).'|'.round(curl_getinfo($ch, CURLINFO_NAMELOOKUP_TIME),4).'|'.round(curl_getinfo($ch, CURLINFO_CONNECT_TIME),4);
+                $GLOBALS['DEPENDENT-REQUEST'] = array('url'=>$url, 'method'=>$method, 'body'=>$post);
+                $GLOBALS['DEPENDENT-URI'] = parse_url($url, PHP_URL_PATH);
+                if ($GLOBALS['HTTP_CODE'] === 0)
+                {
+                    $GLOBALS['DEPENDENT-STATUS'] = 'timeout';
+                }
+                else if ($GLOBALS['HTTP_CODE'] !== 200)
+                {
+                    $GLOBALS['DEPENDENT-STATUS'] = '5xx';
+                }else
+                {
+                    $GLOBALS['DEPENDENT-STATUS'] = 'normal';
+                }
+            }
+            unset($GLOBALS['ENABLE_HEADER_REQUEST_TIME']);
+            // }
+            // 监控
+            self::addMon(
+                $url,
+                $GLOBALS['HTTP_CODE'] ?? -999,
+                round(curl_getinfo($ch, CURLINFO_TOTAL_TIME),4) * 1000
+            );
+
+            // 日志
+            self::addLog($method, $url, $post, $result);
+
+            if (curl_errno($ch) !== 0)
+            {
+                $error_msg = curl_error($ch);
+            }
+            $result_code = curl_errno($ch) === 0 ? self::CODE_SUCCESS : self::CODE_FAIL;
+            $result_http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+            curl_close($ch);
+        }
+
+        return [
+            'code' => $result_code,
+            'response' => empty(json_decode($result, true)) ? $result : json_decode($result, true),
+            'http_code' => $result_http_code,
+            'msg' => $error_msg,
+        ];
+    }
+
+    /**
+     *
+     * @param $url
+     * @param $timeout
+     * @param false $headers
+     * @param false $post
+     * @param false $proxy
+     * @param string $method
+     * @param array $curl_opts
+     * @return false|mixed|resource
+     */
+    static function CH($url, $timeout, $headers = false, $post = false, $proxy = false,  $method='GET', $curl_opts = array())
+    {
+        $ch = curl_init($url);
+
+        if (is_resource($ch) === true)
+        {
+            curl_setopt($ch, CURLOPT_FAILONERROR,           true);
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION,        true);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER,        true);
+            curl_setopt($ch, CURLOPT_TCP_NODELAY,           true);
+            curl_setopt($ch, CURLOPT_NOSIGNAL,              true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST,        false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER,        false);
+            curl_setopt($ch, CURLOPT_BUFFERSIZE,            10240);
+            curl_setopt($ch, CURLOPT_TIMEOUT_MS,            $timeout);
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT_MS,     $timeout);
+            curl_setopt($ch, CURLOPT_HTTP_VERSION,          CURL_HTTP_VERSION_1_0);
+
+            if ($headers !== false)
+            {
+                curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+            }
+            if ($proxy !== false)
+            {
+                curl_setopt($ch, CURLOPT_PROXY, $proxy);
+            }
+            if (!empty($curl_opts))
+            {
+                foreach ($curl_opts as $opt => $val)
+                {
+                    curl_setopt($ch, $opt, $val);
+                }
+            }
+            switch ($method) {
+                case 'HEAD':
+                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD');
+                    break;
+                case 'GET':
+                    break;
+                case 'POST':
+                    curl_setopt($ch, CURLOPT_POST, true);
+                    curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
+                    break;
+                case 'DELETE':
+                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+                    break;
+                case 'PUT':
+                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
+                    curl_setopt($ch, CURLOPT_POSTFIELDS, $post);
+                    break;
+                default:
+                    die('httpUtil bad method');
+                    break;
+            }
+        }
+        return $ch;
+    }
+    static function MULTI_POST($urls, $posts, $timeouts , $headers, $proxies, $curl_opts)
+    {
+        $methods  = [];
+        foreach ($urls as $k => $url) {
+            $methods[$k] = 'GET';
+        }
+        return self::MULTI_CURL($urls, $methods, $posts, $timeouts , $headers, $proxies, $curl_opts);
+    }
+
+    static function MULTI_GET($urls,$timeouts ,$headers = [], $proxies = [], $curl_opts = [])
+    {
+        $methods = $posts = [];
+        foreach ($urls as $k => $url) {
+            $methods[$k] = 'POST';
+            $posts[$k] = false;
+        }
+
+        return self::MULTI_CURL($urls, $methods, $posts, $timeouts , $headers, $proxies, $curl_opts);
+    }
+
+    /**
+     *
+     * @param array $urls 链接
+     * @param array $methods 请求方法 (GET POST ...)
+     * @param array $posts  POST 内容 参见 https://www.php.net/manual/en/function.curl-setopt.php CURLOPT_POSTFIELDS
+     * @param array $timeouts
+     * @param array $headers
+* //     * @param int $retry
+     * @param array $proxies
+     * @param array $curl_opts
+     * @return array
+     */
+    static function MULTI_CURL($urls = [], $methods = [], $posts = [], $timeouts = [], $headers = [], $proxies = [], $curl_opts = [])
+    {
+        //step one 初始化一个批处理handle
+        $mh = curl_multi_init();
+
+        //step two 往批处理handle 添加curl_init来的子handle
+        foreach ($urls as $i => $url)
+        {
+            $ch = self::CH($url, $timeouts[$i], $headers[$i], $posts[$i], $proxies[$i], $methods[$i], $curl_opts);
+            $conn[$i] = $ch;
+
+            curl_multi_add_handle($mh, $conn[$i]);
+        }
+
+        //step three 并发执行，直到请求全部结束
+        do {
+            curl_multi_exec($mh, $active);
+        } while ($active);
+
+        //step four 获取结果，移除并close handle
+        foreach ($urls as $i => $url)
+        {
+            $res[$url]=curl_multi_getcontent($conn[$i]);
+            curl_multi_remove_handle($mh,$conn[$i]);
+            curl_close($conn[$i]);
+        }
+
+        curl_multi_close($mh);
+
+        //step five 结果返回
+        return $res;
+    }
+
+    /*
+     * 监控打点，模块名默认为第三方服务url，指标为请求返回的HTTP_code与总响应时间
+     */
+    private static function addMon($url, $http_code, $request_time) {
+        MonUtil::proxyMon($url, $http_code, '', $request_time);
+    }
+
+    private static function addLog($method, $urls, $params, $response)
+    {
+        //过滤无意义的日志
+        $log = true;
+        $excludes = config('http_util', 'log.exclude');
+        if (!empty($excludes)) {
+            foreach ($excludes as $exclude) {
+                if (is_array($urls)) {
+                    foreach ($urls as $url) {
+                        if (strpos($url, $exclude) !== false) {
+                            $log = false;
+                            break;
+                        }
+                    }
+                } else {
+                    if (strpos($urls, $exclude) !== false) {
+                        $log = false;
+                        break;
+                    }
+                }
+            }
+        }
+        if (!empty($log)) {
+            $params = self::change($params);
+            FileLog::info($method, json_encode([
+                'url' => $urls,
+                'params' => $params,
+                'response' => $response
+                ]));
+        }
+    }
+
+    /**
+     * 过滤resource类型字段
+     * @param array $arr
+     * @return array
+     */
+    private static function change($arr)
+    {
+        foreach ($arr as $k => $v) {
+            if (is_array($v)) {
+                $arr[$k] = self::change($v);
+            } else {
+                if (strpos(gettype($v), 'resource') !== false) {
+                    $arr[$k] = gettype($v);
+                }
+            }
+        }
+        return $arr;
+    }
+}

vendor/api/php_utils/src/Lock/FrequencyLockUtil.php

+<?php
+
+namespace Api\PhpUtils\Lock;
+
+/**
+ * Redis 频率锁
+ */
+use Api\PhpUtils\Redis\RedisUtil;
+
+class FrequencyLockUtil
+{
+
+    const MIN_FREQUENCY_SECONDS = 30;   // 频率锁默认最小间隔秒数
+    const MIN_FREQUENCY_TIMES   = 1;   // 频率锁默认最小间隔秒数内最大访问次数
+
+    const PREFIX_FREQUENCY_LOCK = 'flk:';
+
+    private static $handler = null;
+
+    private static function initCache()
+    {
+        if (empty(self::$handler)){
+            //获取连接句柄, 使用gateway的codis
+            self::$handler = RedisUtil::getInstance('cache', ['serializer' => 'none']);
+        }
+    }
+
+    /**
+     * 频率锁, 每$expire秒钟允许$times次$key访问
+     *
+     * @param string $key   锁定的key
+     * @param int $times    允许访问次数
+     * @param int $expire   锁定时长,秒数
+     * @return boolean
+     */
+    public static function isLocked($key, $times = self::MIN_FREQUENCY_TIMES, $expire = self::MIN_FREQUENCY_SECONDS)
+    {
+        $key = self::PREFIX_FREQUENCY_LOCK . $key;
+        self::initCache();
+        $current_times = self::$handler->incr($key);
+        if ($current_times == 1) {
+            self::$handler->expire($key, $expire);
+        }
+        return ($current_times > $times) ? false : true;
+    }
+    
+    /**
+     * 频次减少
+     * @param  string $key   锁定的key
+     * @param  int $number   减少的值
+     * @return void
+     */
+    public static function decr($key, $number = 1)
+    {
+        $key = self::PREFIX_FREQUENCY_LOCK . $key;
+        self::initCache();
+        return self::$handler->decrby($key, $number);
+    }
+
+    /**
+     * 频次重置(测试用)
+     * @param string $key
+     */
+    public static function reset($key)
+    {
+        $key = self::PREFIX_FREQUENCY_LOCK . $key;
+        self::initCache();
+        return self::$handler->del($key);
+    }
+
+    /**
+     * 已经使用次数
+     * @param string $key
+     * @return int
+     */
+    public static function get($key)
+    {
+        $key = self::PREFIX_FREQUENCY_LOCK . $key;
+        self::initCache();
+        $times = self::$handler->get($key);
+        return intval($times);
+    }
+}

vendor/composer/InstalledVersions.php

@@ -32,7 +32,7 @@ private static $installed = array (
     'aliases' => 
     array (
     ),
-    'reference' => '4c1fe21de0702d09b4178f5a5983abcd27f21135',
+    'reference' => '862a9fe5cf5c0f2a352166e06c8de2d39fc0288c',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -45,7 +45,7 @@ private static $installed = array (
       array (
         0 => '9999999-dev',
       ),
-      'reference' => 'c16d46c6ebeefe757c65053f3bf82b7b9d6234d2',
+      'reference' => 'c77ebfa6785a388d40c8b7cf5b9f46bbf309d748',
     ),
     'api/php_utils' => 
     array (
@@ -55,7 +55,7 @@ private static $installed = array (
       array (
         0 => '9999999-dev',
       ),
-      'reference' => '5a63180a75dbc41881431c6056d7170514fcadf7',
+      'reference' => '471681c72e3b7b220511c9944aab6ac6f7545106',
     ),
     'bacon/bacon-qr-code' => 
     array (
@@ -230,7 +230,7 @@ private static $installed = array (
       array (
         0 => '2.5.x-dev',
       ),
-      'reference' => '36b691b0bdbc963fb610da193a48b4c009d03a62',
+      'reference' => '6f981ee24cf69ee7ce9736146d1c57c2780598a8',
     ),
     'symfony/options-resolver' => 
     array (
@@ -335,7 +335,7 @@ private static $installed = array (
       'aliases' => 
       array (
       ),
-      'reference' => '4c1fe21de0702d09b4178f5a5983abcd27f21135',
+      'reference' => '862a9fe5cf5c0f2a352166e06c8de2d39fc0288c',
     ),
   ),
 );

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,12 +51,14 @@ 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',
     'Api\\PhpUtils\\Hystrix\\Hystrix' => $vendorDir . '/api/php_utils/src/Hystrix/Hystrix.php',
     'Api\\PhpUtils\\Kafka\\KafkaUtil' => $vendorDir . '/api/php_utils/src/Kafka/KafkaUtil.php',
     'Api\\PhpUtils\\Ksy\\Ks3Util' => $vendorDir . '/api/php_utils/src/Ksy/Ks3Util.php',
+    'Api\\PhpUtils\\Lock\\FrequencyLockUtil' => $vendorDir . '/api/php_utils/src/Lock/FrequencyLockUtil.php',
     'Api\\PhpUtils\\Log\\DaemonLog' => $vendorDir . '/api/php_utils/src/Log/DaemonLog.php',
     'Api\\PhpUtils\\Log\\FileLog' => $vendorDir . '/api/php_utils/src/Log/FileLog.php',
     'Api\\PhpUtils\\Message\\Email' => $vendorDir . '/api/php_utils/src/Message/Email.php',
@@ -106,6 +109,7 @@ return array(
     'App\\Models\\marketing\\mysql\\DistributorAuditRecord' => $baseDir . '/application/models/marketing/mysql/DistributorAuditRecord.php',
     'App\\Models\\marketing\\mysql\\Marketing' => $baseDir . '/application/models/marketing/mysql/Marketing.php',
     'App\\Models\\marketing\\mysql\\MarketingGoods' => $baseDir . '/application/models/marketing/mysql/MarketingGoods.php',
+    'App\\Models\\marketing\\mysql\\QyqGroupleader' => $baseDir . '/application/models/marketing/mysql/QyqGroupleader.php',
     'App\\Models\\shop\\mysql\\Shop' => $baseDir . '/application/models/shop/mysql/Shop.php',
     'App\\Models\\shop\\mysql\\SubShop' => $baseDir . '/application/models/shop/mysql/SubShop.php',
     'App\\Models\\tmp\\mysql\\QyqTicketData' => $baseDir . '/application/models/tmp/mysql/QyqTicketData.php',
@@ -195,6 +199,8 @@ return array(
     'DASPRiD\\Enum\\Exception\\SerializeNotSupportedException' => $vendorDir . '/dasprid/enum/src/Exception/SerializeNotSupportedException.php',
     'DASPRiD\\Enum\\Exception\\UnserializeNotSupportedException' => $vendorDir . '/dasprid/enum/src/Exception/UnserializeNotSupportedException.php',
     'DASPRiD\\Enum\\NullValue' => $vendorDir . '/dasprid/enum/src/NullValue.php',
+    'Daemon\\Goods' => $baseDir . '/daemon/Goods.php',
+    'Daemon\\Marketing' => $baseDir . '/daemon/Marketing.php',
     'Daemon\\Test' => $baseDir . '/daemon/Test.php',
     'Elasticsearch\\Client' => $vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch/Client.php',
     'Elasticsearch\\ClientBuilder' => $vendorDir . '/elasticsearch/elasticsearch/src/Elasticsearch/ClientBuilder.php',

vendor/composer/autoload_static.php

@@ -247,6 +247,7 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
         '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',
@@ -279,12 +280,14 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
         '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',
         'Api\\PhpUtils\\Hystrix\\Hystrix' => __DIR__ . '/..' . '/api/php_utils/src/Hystrix/Hystrix.php',
         'Api\\PhpUtils\\Kafka\\KafkaUtil' => __DIR__ . '/..' . '/api/php_utils/src/Kafka/KafkaUtil.php',
         'Api\\PhpUtils\\Ksy\\Ks3Util' => __DIR__ . '/..' . '/api/php_utils/src/Ksy/Ks3Util.php',
+        'Api\\PhpUtils\\Lock\\FrequencyLockUtil' => __DIR__ . '/..' . '/api/php_utils/src/Lock/FrequencyLockUtil.php',
         'Api\\PhpUtils\\Log\\DaemonLog' => __DIR__ . '/..' . '/api/php_utils/src/Log/DaemonLog.php',
         'Api\\PhpUtils\\Log\\FileLog' => __DIR__ . '/..' . '/api/php_utils/src/Log/FileLog.php',
         'Api\\PhpUtils\\Message\\Email' => __DIR__ . '/..' . '/api/php_utils/src/Message/Email.php',
@@ -335,6 +338,7 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
         'App\\Models\\marketing\\mysql\\DistributorAuditRecord' => __DIR__ . '/../..' . '/application/models/marketing/mysql/DistributorAuditRecord.php',
         'App\\Models\\marketing\\mysql\\Marketing' => __DIR__ . '/../..' . '/application/models/marketing/mysql/Marketing.php',
         'App\\Models\\marketing\\mysql\\MarketingGoods' => __DIR__ . '/../..' . '/application/models/marketing/mysql/MarketingGoods.php',
+        'App\\Models\\marketing\\mysql\\QyqGroupleader' => __DIR__ . '/../..' . '/application/models/marketing/mysql/QyqGroupleader.php',
         'App\\Models\\shop\\mysql\\Shop' => __DIR__ . '/../..' . '/application/models/shop/mysql/Shop.php',
         'App\\Models\\shop\\mysql\\SubShop' => __DIR__ . '/../..' . '/application/models/shop/mysql/SubShop.php',
         'App\\Models\\tmp\\mysql\\QyqTicketData' => __DIR__ . '/../..' . '/application/models/tmp/mysql/QyqTicketData.php',
@@ -424,6 +428,8 @@ class ComposerStaticInit90e85a2e64f8339192f3e91b8700b9f2
         'DASPRiD\\Enum\\Exception\\SerializeNotSupportedException' => __DIR__ . '/..' . '/dasprid/enum/src/Exception/SerializeNotSupportedException.php',
         'DASPRiD\\Enum\\Exception\\UnserializeNotSupportedException' => __DIR__ . '/..' . '/dasprid/enum/src/Exception/UnserializeNotSupportedException.php',
         'DASPRiD\\Enum\\NullValue' => __DIR__ . '/..' . '/dasprid/enum/src/NullValue.php',
+        'Daemon\\Goods' => __DIR__ . '/../..' . '/daemon/Goods.php',
+        'Daemon\\Marketing' => __DIR__ . '/../..' . '/daemon/Marketing.php',
         'Daemon\\Test' => __DIR__ . '/../..' . '/daemon/Test.php',
         'Elasticsearch\\Client' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/Elasticsearch/Client.php',
         'Elasticsearch\\ClientBuilder' => __DIR__ . '/..' . '/elasticsearch/elasticsearch/src/Elasticsearch/ClientBuilder.php',

vendor/composer/installed.json

@@ -7,7 +7,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.yidian-inc.com:8021/bp/php_services.git",
-                "reference": "c16d46c6ebeefe757c65053f3bf82b7b9d6234d2"
+                "reference": "c77ebfa6785a388d40c8b7cf5b9f46bbf309d748"
             },
             "require": {
                 "api/php_utils": "dev-master",
@@ -15,7 +15,7 @@
                 "perftools/php-profiler": "^0.18.0",
                 "php": "7.2.*"
             },
-            "time": "2021-07-05T11:24:52+00:00",
+            "time": "2021-07-14T06:34:04+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "source",
@@ -34,7 +34,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.yidian-inc.com:8021/bp/php_utils.git",
-                "reference": "5a63180a75dbc41881431c6056d7170514fcadf7"
+                "reference": "471681c72e3b7b220511c9944aab6ac6f7545106"
             },
             "require": {
                 "elasticsearch/elasticsearch": "~7.0",
@@ -46,7 +46,7 @@
                 "mongodb/mongodb": "1.4.3",
                 "php": "7.2.*"
             },
-            "time": "2021-07-04T07:07:52+00:00",
+            "time": "2021-07-13T14:46:05+00:00",
             "default-branch": true,
             "type": "library",
             "installation-source": "source",
@@ -1119,18 +1119,18 @@
             "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": ""
             },
             "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": {

vendor/composer/installed.php

@@ -6,7 +6,7 @@
     'aliases' => 
     array (
     ),
-    'reference' => '4c1fe21de0702d09b4178f5a5983abcd27f21135',
+    'reference' => '862a9fe5cf5c0f2a352166e06c8de2d39fc0288c',
     'name' => 'yidian/yaf_demo',
   ),
   'versions' => 
@@ -19,7 +19,7 @@
       array (
         0 => '9999999-dev',
       ),
-      'reference' => 'c16d46c6ebeefe757c65053f3bf82b7b9d6234d2',
+      'reference' => 'c77ebfa6785a388d40c8b7cf5b9f46bbf309d748',
     ),
     'api/php_utils' => 
     array (
@@ -29,7 +29,7 @@
       array (
         0 => '9999999-dev',
       ),
-      'reference' => '5a63180a75dbc41881431c6056d7170514fcadf7',
+      'reference' => '471681c72e3b7b220511c9944aab6ac6f7545106',
     ),
     'bacon/bacon-qr-code' => 
     array (
@@ -204,7 +204,7 @@
       array (
         0 => '2.5.x-dev',
       ),
-      'reference' => '36b691b0bdbc963fb610da193a48b4c009d03a62',
+      'reference' => '6f981ee24cf69ee7ce9736146d1c57c2780598a8',
     ),
     'symfony/options-resolver' => 
     array (
@@ -309,7 +309,7 @@
       'aliases' => 
       array (
       ),
-      'reference' => '4c1fe21de0702d09b4178f5a5983abcd27f21135',
+      'reference' => '862a9fe5cf5c0f2a352166e06c8de2d39fc0288c',
     ),
   ),
 );