release

@@ -9,6 +9,7 @@ use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 
 
+
 class BaseController extends Controller
 class BaseController extends Controller
 {
 {
     /**
     /**
@@ -28,7 +29,6 @@ class BaseController extends Controller
     }
     }
 
 
     /**获取accessToken
     /**获取accessToken
-     *
      */
      */
     function getToken()
     function getToken()
     {
     {
@@ -50,17 +50,13 @@ class BaseController extends Controller
             Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]);
             Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]);
             return null;
             return null;
         }
         }
-
     }
     }
 
 
     /**
     /**
-     * 重组请求数据,返回headers和json
-     * @param string $uri
-     * @param array $reqData
-     * @param bool $isLocal
+     * 重组请求数据,返回headers
      * @return array
      * @return array
      */
      */
-    private function parseData(string $uri, array $params)
+    private function parseHeaders(array $params)
     {
     {
         if (!$accessToken = Cache::get(CacheKeyTools::tmeAccessToken())) {
         if (!$accessToken = Cache::get(CacheKeyTools::tmeAccessToken())) {
             $accessToken = $this->getToken();
             $accessToken = $this->getToken();
@@ -69,8 +65,8 @@ class BaseController extends Controller
         $heaers['accessToken'] = $accessToken;
         $heaers['accessToken'] = $accessToken;
         $heaers['timestamp'] = (string)date('YmdHis');
         $heaers['timestamp'] = (string)date('YmdHis');
         $heaers['traceId'] = (string)'1';
         $heaers['traceId'] = (string)'1';
-        $heaers['sign'] = $this->getSign($heaers,$params);
         $heaers['signMethod'] = 'md5';
         $heaers['signMethod'] = 'md5';
+        $heaers['sign'] = $this->getSign($heaers,$params);
         return $heaers;
         return $heaers;
     }
     }
 
 
@@ -89,7 +85,7 @@ class BaseController extends Controller
             } else {
             } else {
                 $params = $reqData;
                 $params = $reqData;
             }
             }
-            $headers = $this->parseData($uri, $params);
+            $headers = $this->parseHeaders($params);
             switch (strtoupper($method)) {
             switch (strtoupper($method)) {
                 case 'GET':
                 case 'GET':
                     $response = $this->client->request('GET', $url, ['query' => $params,'headers'=>$headers]);
                     $response = $this->client->request('GET', $url, ['query' => $params,'headers'=>$headers]);
@@ -118,24 +114,9 @@ class BaseController extends Controller
     /**
     /**
      * 获取签名和去空的参数
      * 获取签名和去空的参数
      * @param array $array
      * @param array $array
-     * @return array
      */
      */
     protected function getSign($heaers,$params)
     protected function getSign($heaers,$params)
     {
     {
-        $params = [
-            "batchId"   => "8934234012312323235",
-            "phone"     => "130****0815",
-            "templateId" => "M000198",
-            "bizType"=> 1,
-            "templateVariable"=> [
-                "titleMap"=> ["k"=>"v"],
-                "contentMap"=> ["k"=>"v"],
-            ],
-            "waterId"=> "8934234012312323234",
-            "platformType"=>"musician",
-            "tenant"=>"musician",
-            "accountId"=>6793497
-        ];
         $common_params = array_merge($params,$heaers);
         $common_params = array_merge($params,$heaers);
         ksort($common_params);
         ksort($common_params);
         $params = '';
         $params = '';
@@ -145,24 +126,13 @@ class BaseController extends Controller
                 continue;
                 continue;
             }
             }
             if (is_array($v)) {
             if (is_array($v)) {
+                ksort($v);
                 $params .= $k . json_encode($this->handleSubArrayNumber($v));
                 $params .= $k . json_encode($this->handleSubArrayNumber($v));
             } else {
             } else {
                 $params .= $k . $v;
                 $params .= $k . $v;
             }
             }
         }
         }
-        $result = $this->str_to_utf8('appSecret' .$this->appSecret. $params);
-        echo '拼装好的utf8字符串：'.$result;
-
-        $result = md5($result);
-        echo '摘要后的sign结果（16位）：' . substr(md5($result), 8, 16);
-        dd($result);
-        return $result;
-    }
-
-    function str_to_utf8($str = '') {
-        $current_encode = mb_detect_encoding($str, array("ASCII","GB2312","GBK",'BIG5','UTF-8'));
-        $encoded_str = mb_convert_encoding($str, 'UTF-8', $current_encode);
-        return $encoded_str;
+        return strtoupper(md5($this->appSecret . $params . $this->appSecret));
     }
     }
 
 
     /**
     /**