Commit fea69294 fea69294461f62c7f35b2d0ec20e2b54290e5324 by lemon

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

2 parents 3cfddac0 a4e78a9f
...@@ -14,8 +14,11 @@ class WorkController extends BaseController ...@@ -14,8 +14,11 @@ class WorkController extends BaseController
14 */ 14 */
15 public function Upload(Request $request) 15 public function Upload(Request $request)
16 { 16 {
17 // dd(basename($request->getRequestUri())); 17 $param = $request->all();
18 list($code,$msg,$data) = $this->doApi('/invests/content/upload',$request->all()); 18 if ($param['type'] == 0){
19 $param['fileName'] = time() . '.' . last(explode('.',$param['fileName']));
20 }
21 list($code,$msg,$data) = $this->doApi('/invests/content/upload',$param);
19 if ($code === 0) { 22 if ($code === 0) {
20 return Response::success($data); 23 return Response::success($data);
21 } else { 24 } else {
...@@ -41,6 +44,7 @@ class WorkController extends BaseController ...@@ -41,6 +44,7 @@ class WorkController extends BaseController
41 */ 44 */
42 public function searchSinger(Request $request) 45 public function searchSinger(Request $request)
43 { 46 {
47 // dd(basename($request->getRequestUri()));
44 list($code,$msg,$data) = $this->doApi('/invests/content/searchSinger',$request->all()); 48 list($code,$msg,$data) = $this->doApi('/invests/content/searchSinger',$request->all());
45 if ($code === 0) { 49 if ($code === 0) {
46 return Response::success($data); 50 return Response::success($data);
...@@ -60,7 +64,8 @@ class WorkController extends BaseController ...@@ -60,7 +64,8 @@ class WorkController extends BaseController
60 $param = [ 64 $param = [
61 'type' =>'0', 65 'type' =>'0',
62 'fileUrl' =>$singer_param['singerPic'] ?? '', 66 'fileUrl' =>$singer_param['singerPic'] ?? '',
63 'fileName' =>last(explode('/',$file_name)) ?? '艺人头像.jpg', 67 // 'fileName' =>last(explode('/',$file_name)) ?? '艺人头像.jpg',
68 'fileName' =>time() . '.' . last(explode('.',$file_name)),
64 ]; 69 ];
65 list($code,$msg,$data) = $this->doApi('/invests/content/upload',$param); 70 list($code,$msg,$data) = $this->doApi('/invests/content/upload',$param);
66 $pic_url = $data['fileUrl'] ?? ''; 71 $pic_url = $data['fileUrl'] ?? '';
......