Skip to content

Cong.Zhao / musician-api.hikoon.com

Go to a project
Toggle navigation
Toggle navigation pinning
Commit cc58a0d5 cc58a0d5c50f4d4961b864feba6a96e9c06bf9ae by mengfan.xie
Options

release

1 parent d8f5167d
Inline Side-by-side
Showing 2 changed files with 55 additions and 13 deletions
...@@ -74,7 +74,7 @@ class BaseController extends Controller ...@@ -74,7 +74,7 @@ class BaseController extends Controller
74 * 请求接口 74 * 请求接口
75 * @throws \GuzzleHttp\Exception\GuzzleException 75 * @throws \GuzzleHttp\Exception\GuzzleException
76 */ 76 */
77 protected function doApi(string $uri, array $reqData = [], string $method = 'POST', bool $isLocal = true) 77 protected function doApi(string $uri, array $reqData = [], string $method = 'POST', bool $isLocal = false)
78 { 78 {
79 $url = rtrim($this->domain,'/').'/'.ltrim($uri,'/'); 79 $url = rtrim($this->domain,'/').'/'.ltrim($uri,'/');
80 try { 80 try {
...@@ -99,14 +99,19 @@ class BaseController extends Controller ...@@ -99,14 +99,19 @@ class BaseController extends Controller
99 $respArr = json_decode($response->getBody()->getContents(), true); 99 $respArr = json_decode($response->getBody()->getContents(), true);
100 // return $respArr; 100 // return $respArr;
101 Log::channel('api')->info(__METHOD__, $respArr); 101 Log::channel('api')->info(__METHOD__, $respArr);
102 if (0 !== (int)$respArr['code']) { 102 return [
103 return Response::error(-1,$respArr['message'] ?? '操作失败'); 103 (int)$respArr['code'],
104 } else { 104 $respArr['message'] ?? '操作失败',
105 return Response::success($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 // }
107 } catch (\Exception $e) { 112 } catch (\Exception $e) {
108 Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]); 113 Log::channel('api')->error(__METHOD__, ['msg'=>$e->getMessage()]);
109 return Response::error(-1,'接口请求失败！'); 114 return [-1,'接口请求失败',[]];
110 } 115 }
111 } 116 }
112 117
......
...@@ -15,7 +15,12 @@ class WorkController extends BaseController ...@@ -15,7 +15,12 @@ class WorkController extends BaseController
15 public function Upload(Request $request) 15 public function Upload(Request $request)
16 { 16 {
17 // dd(basename($request->getRequestUri())); 17 // dd(basename($request->getRequestUri()));
18 return $this->doApi('/invests/content/upload',$request->all()); 18 list($code,$msg,$data) = $this->doApi('/invests/content/upload',$request->all());
19 if ($code === 0) {
20 return Response::success($data);
21 } else {
22 return Response::error(-1,$msg);
23 }
19 } 24 }
20 25
21 /** 提交专辑 26 /** 提交专辑
...@@ -23,7 +28,12 @@ class WorkController extends BaseController ...@@ -23,7 +28,12 @@ class WorkController extends BaseController
23 */ 28 */
24 public function albumOnline(Request $request) 29 public function albumOnline(Request $request)
25 { 30 {
26 return $this->doApi('/invests/content/commitContent',$request->all()); 31 list($code,$msg,$data) = $this->doApi('/invests/content/commitContent',$request->all());
32 if ($code === 0) {
33 return Response::success($data);
34 } else {
35 return Response::error(-1,$msg);
36 }
27 } 37 }
28 38
29 /**搜索歌手 39 /**搜索歌手
...@@ -31,7 +41,19 @@ class WorkController extends BaseController ...@@ -31,7 +41,19 @@ class WorkController extends BaseController
31 */ 41 */
32 public function singerQuery(Request $request) 42 public function singerQuery(Request $request)
33 { 43 {
34 return $this->doApi('/invests/content/searchSinger',$request->all()); 44 $singerName = $request->get('singerName','');
45 if (empty($singerName)){
46 return Response::error(-1,'请填写歌手名称');
47 }
48 $page = (int)$request->get('page',1);
49 $size = (int)$request->get('size',20);
50 list($code,$msg,$data) = $this->doApi('/invests/content/searchSinger',['singerName'=>$singerName]);
51 $data = array_slice($data,($page -1) * $size,$size);
52 if ($code === 0) {
53 return Response::success($data);
54 } else {
55 return Response::error(-1,$msg);
56 }
35 } 57 }
36 58
37 /** 59 /**
...@@ -39,7 +61,12 @@ class WorkController extends BaseController ...@@ -39,7 +61,12 @@ class WorkController extends BaseController
39 */ 61 */
40 public function singerCreate(Request $request) 62 public function singerCreate(Request $request)
41 { 63 {
42 return $this->doApi('content/createSinger',$request->all()); 64 list($code,$msg,$data) = $this->doApi('content/createSinger',$request->all());
65 if ($code === 0) {
66 return Response::success($data);
67 } else {
68 return Response::error(-1,$msg);
69 }
43 } 70 }
44 71
45 /** 原始版权方 72 /** 原始版权方
...@@ -47,7 +74,12 @@ class WorkController extends BaseController ...@@ -47,7 +74,12 @@ class WorkController extends BaseController
47 */ 74 */
48 public function originalCompanyQuery(Request $request) 75 public function originalCompanyQuery(Request $request)
49 { 76 {
50 return $this->doApi('/invests/content/queryOriginalCopyrightCompanyList',$request->all()); 77 list($code,$msg,$data) = $this->doApi('/invests/content/queryOriginalCopyrightCompanyList',$request->all());
78 if ($code === 0) {
79 return Response::success($data);
80 } else {
81 return Response::error(-1,$msg);
82 }
51 } 83 }
52 84
53 /**查询发行的歌曲id接口 85 /**查询发行的歌曲id接口
...@@ -55,7 +87,12 @@ class WorkController extends BaseController ...@@ -55,7 +87,12 @@ class WorkController extends BaseController
55 */ 87 */
56 public function releasedAlbumQuery(Request $request) 88 public function releasedAlbumQuery(Request $request)
57 { 89 {
58 return $this->doApi('/invests/content/queryComitResult',$request->all()); 90 list($code,$msg,$data) = $this->doApi('/invests/content/queryComitResult',$request->all());
91 if ($code === 0) {
92 return Response::success($data);
93 } else {
94 return Response::error(-1,$msg);
95 }
59 } 96 }
60 97
61 98
......