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

@@ -14,8 +14,11 @@ class WorkController extends BaseController
      */
     public function Upload(Request $request)
     {
-//        dd(basename($request->getRequestUri()));
-        list($code,$msg,$data) = $this->doApi('/invests/content/upload',$request->all());
+        $param = $request->all();
+        if ($param['type'] == 0){
+            $param['fileName'] = time() . '.' . last(explode('.',$param['fileName']));
+        }
+        list($code,$msg,$data) = $this->doApi('/invests/content/upload',$param);
         if ($code === 0) {
             return Response::success($data);
         } else {
@@ -41,6 +44,7 @@ class WorkController extends BaseController
      */
     public function searchSinger(Request $request)
     {
+        //        dd(basename($request->getRequestUri()));
         list($code,$msg,$data) = $this->doApi('/invests/content/searchSinger',$request->all());
         if ($code === 0) {
             return Response::success($data);
@@ -60,7 +64,8 @@ class WorkController extends BaseController
         $param = [
             'type' =>'0',
             'fileUrl' =>$singer_param['singerPic'] ?? '',
-            'fileName' =>last(explode('/',$file_name)) ?? '艺人头像.jpg',
+//            'fileName' =>last(explode('/',$file_name)) ?? '艺人头像.jpg',
+            'fileName' =>time() . '.' . last(explode('.',$file_name)),
         ];
         list($code,$msg,$data) = $this->doApi('/invests/content/upload',$param);
         $pic_url = $data['fileUrl'] ?? '';