Commit e1a8415d e1a8415d462f28019fd4001c9fa7a47f0981ec9f by lemon

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

2 parents f5fe3ff7 2ef89a83
...@@ -104,11 +104,6 @@ class BaseController extends Controller ...@@ -104,11 +104,6 @@ class BaseController extends Controller
104 $respArr['message'] ?? '操作失败', 104 $respArr['message'] ?? '操作失败',
105 $respArr['data'] ?? [] 105 $respArr['data'] ?? []
106 ]; 106 ];
107 // if (0 !== (int)$respArr['code']) {
108 // return Response::error(-1,$respArr['message'] ?? '操作失败');
109 // } else {
110 // return Response::success($respArr['data']);
111 // }
112 } catch (\Exception $e) { 107 } catch (\Exception $e) {
113 Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]); 108 Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]);
114 return [-1,'接口请求失败',[]]; 109 return [-1,'接口请求失败',[]];
...@@ -138,6 +133,7 @@ class BaseController extends Controller ...@@ -138,6 +133,7 @@ class BaseController extends Controller
138 $params .= $k . $v; 133 $params .= $k . $v;
139 } 134 }
140 } 135 }
136 Log::channel('api')->info($params);
141 return strtoupper(md5($this->appSecret . $params . $this->appSecret)); 137 return strtoupper(md5($this->appSecret . $params . $this->appSecret));
142 } 138 }
143 139
...@@ -153,7 +149,13 @@ class BaseController extends Controller ...@@ -153,7 +149,13 @@ class BaseController extends Controller
153 // ksort($v); 149 // ksort($v);
154 $array[$k] = $this->handleSubArrayNumber($v); 150 $array[$k] = $this->handleSubArrayNumber($v);
155 } else { 151 } else {
156 $array[$k] = $v; 152 $array = array_filter($array, function ($item) {
153 if ($item === '' || $item === null) {
154 return false;
155 } else {
156 return true;
157 }
158 });
157 } 159 }
158 } 160 }
159 return $array; 161 return $array;
......