合并分支 'lyh-server' 到 'master'

未续费项目增加搜索



查看合并请求 !2661

@@ -132,7 +132,7 @@ class FileController
             $amazonS3Service->uploadFiles($files,$this->path,$fileName);
             $amazonS3Service->uploadFiles($files,$this->path,$fileName);
         }
         }
         $this->saveMysql($fileModel,$files->getSize(),$files->getClientOriginalExtension(),$fileName,$hash,$this->upload_location,$files->getMimeType(),$name);
         $this->saveMysql($fileModel,$files->getSize(),$files->getClientOriginalExtension(),$fileName,$hash,$this->upload_location,$files->getMimeType(),$name);
-        $this->synchronizationFile($fileName,$this->upload_location);
+//        $this->synchronizationFile($fileName,$this->upload_location);
         $this->response('资源',Code::SUCCESS,$this->responseData($this->path.'/'.$fileName, $name));
         $this->response('资源',Code::SUCCESS,$this->responseData($this->path.'/'.$fileName, $name));
     }
     }
 
 
@@ -306,7 +306,7 @@ class FileController
             $mime = $file->getMimeType();
             $mime = $file->getMimeType();
             $this->saveMysql($fileModel,$size,$file_type,$fileName,$hash,$this->upload_location,$mime,$name);
             $this->saveMysql($fileModel,$size,$file_type,$fileName,$hash,$this->upload_location,$mime,$name);
             $data[] = $this->responseData($this->path.'/'.$fileName, $name);
             $data[] = $this->responseData($this->path.'/'.$fileName, $name);
-            $this->synchronizationFile($fileName,$this->upload_location);
+//            $this->synchronizationFile($fileName,$this->upload_location);
         }
         }
         $this->response('资源',Code::SUCCESS,$data);
         $this->response('资源',Code::SUCCESS,$data);
     }
     }