Commit 06211dbd 06211dbdda144910688a41aefe29d3724bbd4c40 by mengfan.xie

release

1 parent 01cd8cf4
......@@ -17,11 +17,12 @@ class Response
* @param array $data
* @return \Illuminate\Http\JsonResponse
*/
public static function success($data = [])
public static function success($data = [], string $msg = '请求成功')
{
return response()->json([
'code' => ErrorCode::SERVER_OK,
'data' => $data instanceof LengthAwarePaginator ? self::paginator($data) : $data
'data' => $data instanceof LengthAwarePaginator ? self::paginator($data) : $data,
'msg' => $msg
]);
}
......
......@@ -64,7 +64,7 @@ class BaseController extends Controller
$heaers['appId'] = $this->appId;
$heaers['accessToken'] = $accessToken;
$heaers['timestamp'] = (string)date('YmdHis');
$heaers['traceId'] = (string)'1';
$heaers['traceId'] = 'hk_'.(string)time();
$heaers['signMethod'] = 'md5';
$heaers['sign'] = $this->getSign($heaers,$params);
return $heaers;
......@@ -81,13 +81,12 @@ class BaseController extends Controller
if ($isLocal) {
$data_file = database_path('Release/'.last(explode("/",$uri)).'.query.php');
$params = include("$data_file");
$params['tmeBrandId'] = 105737;
if (last(explode("/",$uri)) == 'upload'){
$params['md5'] = md5($params['url']);
}
} else {
$params = $reqData;
}
$params['tmeBrandId'] = (int)env('TME_BRANDID',8888888);
var_dump(json_encode($params,JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
exit();
$headers = $this->parseHeaders($params);
switch (strtoupper($method)) {
case 'GET':
......@@ -99,12 +98,11 @@ class BaseController extends Controller
break;
}
$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['msg'] ?? '操作失败');
} else {
$response_file = database_path('release/' . $uri . '.resp');
file_put_contents($response_file, var_export($respArr['data'],true));
return Response::success($respArr['data']);
}
} catch (\Exception $e) {
......@@ -121,16 +119,17 @@ class BaseController extends Controller
protected function getSign($heaers,$params)
{
$common_params = array_merge($params,$heaers);
ksort($common_params);
$params = '';
foreach ($common_params as $k=>$v)
{
if ('' === $v || null === $v || [] === $v) {
continue;
}
if (is_array($v)) {
ksort($v);
$params .= $k . json_encode($this->handleSubArrayNumber($v));
$params .= $k . json_encode($this->handleSubArrayNumber($v), JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
} else {
$params .= $k . $v;
}
......@@ -147,11 +146,10 @@ class BaseController extends Controller
{
foreach ($array as $k=>$v) {
if (is_array($v)) {
// ksort($v);
$array[$k] = $this->handleSubArrayNumber($v);
} else {
if (is_numeric($v) && is_int($v)) {
$array[$k] = (string)$v;
}
$array[$k] = $v;
}
}
return $array;
......
......@@ -15,23 +15,23 @@ class WorkController extends BaseController
public function Upload(Request $request)
{
// dd(basename($request->getRequestUri()));
return $this->doApi('content/upload',$request->all());
return $this->doApi('/invests/content/upload',$request->all());
}
/**
/** 提交专辑
* @param Request $request
*/
public function albumOnline(Request $request)
{
return $this->doApi('content/commitContent',$request->all());
return $this->doApi('/invests/content/commitContent',$request->all());
}
/**
/**搜索歌手
* @param Request $request
*/
public function singerQuery(Request $request)
{
return $this->doApi('content/searchSinger',$request->all());
return $this->doApi('/invests/content/searchSinger',$request->all());
}
/**
......@@ -42,20 +42,20 @@ class WorkController extends BaseController
return $this->doApi('content/createSinger',$request->all());
}
/**
/** 原始版权方
* @param Request $request
*/
public function originalCompanyQuery(Request $request)
{
return $this->doApi('content/queryOriginalCopyrightCompanyList',$request->all());
return $this->doApi('/invests/content/queryOriginalCopyrightCompanyList',$request->all());
}
/**
/**查询发行的歌曲id接口
* @param Request $request
*/
public function releasedAlbumQuery(Request $request)
{
return $this->doApi('content/queryComitResult',$request->all());
return $this->doApi('/invests/content/queryComitResult',$request->all());
}
......
<?php
return [
'originalCompayName' => '一寸光年',//艺人名
'originalCompanyName' => '',//艺人名
];
......
<?php
return [
'url' => '海葵测试艺人02',
'type' => 0, //文件类型: 0:图片 1:授权文件 2:音频 3:歌词 4:视频
'fileName' => '文件名称',
'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',
'type' => '1', //文件类型: 0:图片 1:授权文件 2:音频 3:歌词 4:视频
'fileName' => 'pdf.pdf',
];
# 图1 material_test/tme/img.jpg
# 文件2 material_test/tme/pdf.pdf
# 音频 material_test/tme/audio.wav
# txt material_test/tme/lyric.txt
# MP4 material_test/tme/video.mp4
......