release

@@ -74,7 +74,7 @@ class BaseController extends Controller
      * 请求接口
      * @throws \GuzzleHttp\Exception\GuzzleException
      */
-    protected function doApi(string $uri, array $reqData = [], string $method = 'POST', bool $isLocal = true)
+    protected function doApi(string $uri, array $reqData = [], string $method = 'POST', bool $isLocal = false)
     {
         $url = rtrim($this->domain,'/').'/'.ltrim($uri,'/');
         try {
@@ -99,14 +99,19 @@ class BaseController extends Controller
             $respArr = json_decode($response->getBody()->getContents(), true);
 //            return $respArr;
             Log::channel('api')->info(__METHOD__, $respArr);
-            if (0 !== (int)$respArr['code']) {
-                return Response::error(-1,$respArr['message'] ?? '操作失败');
-            } else {
-                return Response::success($respArr['data']);
-            }
+            return [
+                (int)$respArr['code'],
+                $respArr['message'] ?? '操作失败',
+                $respArr['data'] ?? []
+            ];
+//            if (0 !== (int)$respArr['code']) {
+//                return Response::error(-1,$respArr['message'] ?? '操作失败');
+//            } else {
+//                return Response::success($respArr['data']);
+//            }
         } catch (\Exception $e) {
             Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]);
-            return Response::error(-1,'接口请求失败！');
+            return [-1,'接口请求失败',[]];
         }
     }
 

@@ -15,7 +15,12 @@ class WorkController extends BaseController
     public function Upload(Request $request)
     {
 //        dd(basename($request->getRequestUri()));
-        return $this->doApi('/invests/content/upload',$request->all());
+        list($code,$msg,$data) = $this->doApi('/invests/content/upload',$request->all());
+        if ($code === 0) {
+            return Response::success($data);
+        } else {
+            return Response::error(-1,$msg);
+        }
     }
 
     /** 提交专辑
@@ -23,7 +28,12 @@ class WorkController extends BaseController
      */
     public function albumOnline(Request $request)
     {
-        return $this->doApi('/invests/content/commitContent',$request->all());
+        list($code,$msg,$data) = $this->doApi('/invests/content/commitContent',$request->all());
+        if ($code === 0) {
+            return Response::success($data);
+        } else {
+            return Response::error(-1,$msg);
+        }
     }
 
     /**搜索歌手
@@ -31,7 +41,19 @@ class WorkController extends BaseController
      */
     public function singerQuery(Request $request)
     {
-        return $this->doApi('/invests/content/searchSinger',$request->all());
+        $singerName = $request->get('singerName','');
+        if (empty($singerName)){
+            return Response::error(-1,'请填写歌手名称');
+        }
+        $page = (int)$request->get('page',1);
+        $size = (int)$request->get('size',20);
+        list($code,$msg,$data) = $this->doApi('/invests/content/searchSinger',['singerName'=>$singerName]);
+        $data = array_slice($data,($page -1) * $size,$size);
+        if ($code === 0) {
+            return Response::success($data);
+        } else {
+            return Response::error(-1,$msg);
+        }
     }
 
     /**
@@ -39,7 +61,12 @@ class WorkController extends BaseController
      */
     public function singerCreate(Request $request)
     {
-        return $this->doApi('content/createSinger',$request->all());
+        list($code,$msg,$data) = $this->doApi('content/createSinger',$request->all());
+        if ($code === 0) {
+            return Response::success($data);
+        } else {
+            return Response::error(-1,$msg);
+        }
     }
 
     /** 原始版权方
@@ -47,7 +74,12 @@ class WorkController extends BaseController
      */
     public function originalCompanyQuery(Request $request)
     {
-        return $this->doApi('/invests/content/queryOriginalCopyrightCompanyList',$request->all());
+        list($code,$msg,$data) = $this->doApi('/invests/content/queryOriginalCopyrightCompanyList',$request->all());
+        if ($code === 0) {
+            return Response::success($data);
+        } else {
+            return Response::error(-1,$msg);
+        }
     }
 
     /**查询发行的歌曲id接口
@@ -55,7 +87,12 @@ class WorkController extends BaseController
      */
     public function releasedAlbumQuery(Request $request)
     {
-        return $this->doApi('/invests/content/queryComitResult',$request->all());
+        list($code,$msg,$data) = $this->doApi('/invests/content/queryComitResult',$request->all());
+        if ($code === 0) {
+            return Response::success($data);
+        } else {
+            return Response::error(-1,$msg);
+        }
     }