Merge branch 'master' of gitlab.hikoon.com:zhaocong/musician-api.hikoon.com into release

@@ -76,6 +76,7 @@ class BaseController extends Controller
      */
      */
     protected function doApi(string $uri, array $reqData = [], string $method = 'POST', bool $isLocal = false)
     protected function doApi(string $uri, array $reqData = [], string $method = 'POST', bool $isLocal = false)
     {
     {
+        $token = uniqid();
         $url = rtrim($this->domain,'/').'/'.ltrim($uri,'/');
         $url = rtrim($this->domain,'/').'/'.ltrim($uri,'/');
         try {
         try {
             if ($isLocal) {
             if ($isLocal) {
@@ -85,8 +86,8 @@ class BaseController extends Controller
                 $params = $reqData;
                 $params = $reqData;
             }
             }
             $params['tmeBrandId'] = $params['tmeBrandId'] ?? 8888888;
             $params['tmeBrandId'] = $params['tmeBrandId'] ?? 8888888;
-            Log::channel('api')->info(__METHOD__, $params);
-//            var_dump(json_encode($params,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));  //请求参数
+            Log::channel('api')->info(__METHOD__, ['token'=>$token, 'url'=>$url, 'params'=>$params]);
+
             $headers = $this->parseHeaders($params);
             $headers = $this->parseHeaders($params);
             switch (strtoupper($method)) {
             switch (strtoupper($method)) {
                 case 'GET':
                 case 'GET':
@@ -99,14 +100,14 @@ class BaseController extends Controller
             }
             }
             $respArr = json_decode($response->getBody()->getContents(), true);
             $respArr = json_decode($response->getBody()->getContents(), true);
 
 
-            Log::channel('api')->info(__METHOD__, $respArr);
+            Log::channel('api')->info(__METHOD__, ['token'=>$token,'respArr'=>$respArr]);
             if ($respArr['code'] == '0'){
             if ($respArr['code'] == '0'){
                 return [(int)$respArr['code'],$respArr['message'] ?? '操作失败',$respArr['data'] ?? []];
                 return [(int)$respArr['code'],$respArr['message'] ?? '操作失败',$respArr['data'] ?? []];
             } else {
             } else {
                 return [(int)$respArr['code'],$respArr['message'] ?? '操作失败',[$respArr['traceId']]];
                 return [(int)$respArr['code'],$respArr['message'] ?? '操作失败',[$respArr['traceId']]];
             }
             }
         } catch (\Exception $e) {
         } catch (\Exception $e) {
-            Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]);
+            Log::channel('api')->error(__METHOD__, ['token'=>$token, 'msg'=>$e->getMessage()]);
             return [-1,'接口请求失败',[]];
             return [-1,'接口请求失败',[]];
         }
         }
     }
     }