Merge remote-tracking branch 'origin/master' into akun

@@ -33,7 +33,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 759;
+        $project_id = 450;
         ProjectServer::useProject($project_id);
         ProjectServer::useProject($project_id);
         $this->count($project_id);
         $this->count($project_id);
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');

@@ -36,7 +36,7 @@ class UpgradeProjectCount extends Command
     protected $description = '升级项目统计';
     protected $description = '升级项目统计';
 
 
     public function handle(){
     public function handle(){
-        $project_id = 759;
+        $project_id = 450;
         $oldModel = new UpdateOldInfo();
         $oldModel = new UpdateOldInfo();
         $info = $oldModel->read(['project_id'=>$project_id]);
         $info = $oldModel->read(['project_id'=>$project_id]);
         $url = $info['old_domain_online'];
         $url = $info['old_domain_online'];

@@ -124,4 +124,5 @@ class BaseController extends Controller
         $response =  response($result,$result_code,$this->header);
         $response =  response($result,$result_code,$this->header);
         throw new HttpResponseException($response);
         throw new HttpResponseException($response);
     }
     }
+
 }
 }

@@ -114,9 +114,8 @@ class FileManageController extends BaseController
         $hash = hash_file('md5', $file->getPathname());
         $hash = hash_file('md5', $file->getPathname());
         $info = FileManage::where('hash', $hash)->first();
         $info = FileManage::where('hash', $hash)->first();
         if($info){
         if($info){
-            $this->fail('文件已存在'.$hash);
+            $this->fail('文件已上传，文件名称.'.$info['name']);
         }
         }
-
         return [
         return [
             'size' => $size,
             'size' => $size,
             'extension' => $extension,
             'extension' => $extension,