Skip to content

Cong.Zhao / musician-api.hikoon.com

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 06211dbd 06211dbdda144910688a41aefe29d3724bbd4c40 by mengfan.xie
Options

release

1 parent 01cd8cf4
Expand all
Inline Side-by-side
Showing 6 changed files with 35 additions and 27 deletions
...@@ -17,11 +17,12 @@ class Response ...@@ -17,11 +17,12 @@ class Response
17 * @param array $data 17 * @param array $data
18 * @return \Illuminate\Http\JsonResponse 18 * @return \Illuminate\Http\JsonResponse
19 */ 19 */
20 public static function success($data = []) 20 public static function success($data = [], string $msg = '请求成功')
21 { 21 {
22 return response()->json([ 22 return response()->json([
23 'code' => ErrorCode::SERVER_OK, 23 'code' => ErrorCode::SERVER_OK,
24 'data' => $data instanceof LengthAwarePaginator ? self::paginator($data) : $data 24 'data' => $data instanceof LengthAwarePaginator ? self::paginator($data) : $data,
25 'msg' => $msg
25 ]); 26 ]);
26 } 27 }
27 28
......
...@@ -64,7 +64,7 @@ class BaseController extends Controller ...@@ -64,7 +64,7 @@ class BaseController extends Controller
64 $heaers['appId'] = $this->appId; 64 $heaers['appId'] = $this->appId;
65 $heaers['accessToken'] = $accessToken; 65 $heaers['accessToken'] = $accessToken;
66 $heaers['timestamp'] = (string)date('YmdHis'); 66 $heaers['timestamp'] = (string)date('YmdHis');
67 $heaers['traceId'] = (string)'1'; 67 $heaers['traceId'] = 'hk_'.(string)time();
68 $heaers['signMethod'] = 'md5'; 68 $heaers['signMethod'] = 'md5';
69 $heaers['sign'] = $this->getSign($heaers,$params); 69 $heaers['sign'] = $this->getSign($heaers,$params);
70 return $heaers; 70 return $heaers;
...@@ -81,13 +81,12 @@ class BaseController extends Controller ...@@ -81,13 +81,12 @@ class BaseController extends Controller
81 if ($isLocal) { 81 if ($isLocal) {
82 $data_file = database_path('Release/'.last(explode("/",$uri)).'.query.php'); 82 $data_file = database_path('Release/'.last(explode("/",$uri)).'.query.php');
83 $params = include("$data_file"); 83 $params = include("$data_file");
84 $params['tmeBrandId'] = 105737;
85 if (last(explode("/",$uri)) == 'upload'){
86 $params['md5'] = md5($params['url']);
87 }
88 } else { 84 } else {
89 $params = $reqData; 85 $params = $reqData;
90 } 86 }
87 $params['tmeBrandId'] = (int)env('TME_BRANDID',8888888);
88 var_dump(json_encode($params,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
89 exit();
91 $headers = $this->parseHeaders($params); 90 $headers = $this->parseHeaders($params);
92 switch (strtoupper($method)) { 91 switch (strtoupper($method)) {
93 case 'GET': 92 case 'GET':
...@@ -99,12 +98,11 @@ class BaseController extends Controller ...@@ -99,12 +98,11 @@ class BaseController extends Controller
99 break; 98 break;
100 } 99 }
101 $respArr = json_decode($response->getBody()->getContents(), true); 100 $respArr = json_decode($response->getBody()->getContents(), true);
101 return $respArr;
102 Log::channel('api')->info(__METHOD__, $respArr); 102 Log::channel('api')->info(__METHOD__, $respArr);
103 if (0 !== (int)$respArr['code']) { 103 if (0 !== (int)$respArr['code']) {
104 return Response::error(-1,$respArr['msg'] ?? '操作失败'); 104 return Response::error(-1,$respArr['msg'] ?? '操作失败');
105 } else { 105 } else {
106 $response_file = database_path('release/' . $uri . '.resp');
107 file_put_contents($response_file, var_export($respArr['data'],true));
108 return Response::success($respArr['data']); 106 return Response::success($respArr['data']);
109 } 107 }
110 } catch (\Exception $e) { 108 } catch (\Exception $e) {
...@@ -121,16 +119,17 @@ class BaseController extends Controller ...@@ -121,16 +119,17 @@ class BaseController extends Controller
121 protected function getSign($heaers,$params) 119 protected function getSign($heaers,$params)
122 { 120 {
123 $common_params = array_merge($params,$heaers); 121 $common_params = array_merge($params,$heaers);
122
124 ksort($common_params); 123 ksort($common_params);
125 $params = ''; 124 $params = '';
125
126 foreach ($common_params as $k=>$v) 126 foreach ($common_params as $k=>$v)
127 { 127 {
128 if ('' === $v || null === $v || [] === $v) { 128 if ('' === $v || null === $v || [] === $v) {
129 continue; 129 continue;
130 } 130 }
131 if (is_array($v)) { 131 if (is_array($v)) {
132 ksort($v); 132 $params .= $k . json_encode($this->handleSubArrayNumber($v), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
133 $params .= $k . json_encode($this->handleSubArrayNumber($v));
134 } else { 133 } else {
135 $params .= $k . $v; 134 $params .= $k . $v;
136 } 135 }
...@@ -147,11 +146,10 @@ class BaseController extends Controller ...@@ -147,11 +146,10 @@ class BaseController extends Controller
147 { 146 {
148 foreach ($array as $k=>$v) { 147 foreach ($array as $k=>$v) {
149 if (is_array($v)) { 148 if (is_array($v)) {
149 // ksort($v);
150 $array[$k] = $this->handleSubArrayNumber($v); 150 $array[$k] = $this->handleSubArrayNumber($v);
151 } else { 151 } else {
152 if (is_numeric($v) && is_int($v)) { 152 $array[$k] = $v;
153 $array[$k] = (string)$v;
154 }
155 } 153 }
156 } 154 }
157 return $array; 155 return $array;
......
...@@ -15,23 +15,23 @@ class WorkController extends BaseController ...@@ -15,23 +15,23 @@ 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('content/upload',$request->all()); 18 return $this->doApi('/invests/content/upload',$request->all());
19 } 19 }
20 20
21 /** 21 /** 提交专辑
22 * @param Request $request 22 * @param Request $request
23 */ 23 */
24 public function albumOnline(Request $request) 24 public function albumOnline(Request $request)
25 { 25 {
26 return $this->doApi('content/commitContent',$request->all()); 26 return $this->doApi('/invests/content/commitContent',$request->all());
27 } 27 }
28 28
29 /** 29 /**搜索歌手
30 * @param Request $request 30 * @param Request $request
31 */ 31 */
32 public function singerQuery(Request $request) 32 public function singerQuery(Request $request)
33 { 33 {
34 return $this->doApi('content/searchSinger',$request->all()); 34 return $this->doApi('/invests/content/searchSinger',$request->all());
35 } 35 }
36 36
37 /** 37 /**
...@@ -42,20 +42,20 @@ class WorkController extends BaseController ...@@ -42,20 +42,20 @@ class WorkController extends BaseController
42 return $this->doApi('content/createSinger',$request->all()); 42 return $this->doApi('content/createSinger',$request->all());
43 } 43 }
44 44
45 /** 45 /** 原始版权方
46 * @param Request $request 46 * @param Request $request
47 */ 47 */
48 public function originalCompanyQuery(Request $request) 48 public function originalCompanyQuery(Request $request)
49 { 49 {
50 return $this->doApi('content/queryOriginalCopyrightCompanyList',$request->all()); 50 return $this->doApi('/invests/content/queryOriginalCopyrightCompanyList',$request->all());
51 } 51 }
52 52
53 /** 53 /**查询发行的歌曲id接口
54 * @param Request $request 54 * @param Request $request
55 */ 55 */
56 public function releasedAlbumQuery(Request $request) 56 public function releasedAlbumQuery(Request $request)
57 { 57 {
58 return $this->doApi('content/queryComitResult',$request->all()); 58 return $this->doApi('/invests/content/queryComitResult',$request->all());
59 } 59 }
60 60
61 61
......
1 <?php 1 <?php
2 return [ 2 return [
3 'originalCompayName' => '一寸光年',//艺人名 3 'originalCompanyName' => '',//艺人名
4 ]; 4 ];
......
1 <?php 1 <?php
2 return [ 2 return [
3 'url' => '海葵测试艺人02', 3 'fileUrl' => 'https://legal-1305250541.cos.ap-shanghai.myqcloud.com/material_test/tme/pdf.pdf?q-sign-algorithm=sha1&q-ak=AKIDsWu1tUr7JI1TlqgFXaNt87pFOGtFK8gx&q-sign-time=1652769055%3B1652812315&q-key-time=1652769055%3B1652812315&q-header-list=&q-url-param-list=&q-signature=06f94750474880cb5ae8d8a2728791a30639863e',
4 'type' => 0, //文件类型: 0:图片 1:授权文件 2:音频 3：歌词 4:视频 4 'type' => '1', //文件类型: 0:图片 1:授权文件 2:音频 3：歌词 4:视频
5 'fileName' => '文件名称', 5 'fileName' => 'pdf.pdf',
6 ]; 6 ];
7 7
8 8
9 # 图1 material_test/tme/img.jpg
10
11 # 文件2 material_test/tme/pdf.pdf
12
13 # 音频 material_test/tme/audio.wav
14
15 # txt material_test/tme/lyric.txt
16
17 # MP4 material_test/tme/video.mp4
9 18
......