gx

@@ -69,7 +69,7 @@ class UpdateProgress extends Command
         if(!empty($info)){
         if(!empty($info)){
             $info = (array)$info;
             $info = (array)$info;
             //超时时间
             //超时时间
-            $time =  date("Y-m-d H:i:s",strtotime($info['created_at']) + $info['total_num'] * 3600);
+            $time =  date("Y-m-d H:i:s",strtotime($info['created_at']) + $info['total_num'] * 60);
             if($time > date("Y-m-d H:i:s")){
             if($time > date("Y-m-d H:i:s")){
                 DB::connection('custom_mysql')->table('gl_update_progress')->where('id',$info['id'])->update(['current_num'=>$info['total_num']]);
                 DB::connection('custom_mysql')->table('gl_update_progress')->where('id',$info['id'])->update(['current_num'=>$info['total_num']]);
                 //获取当前项目的用户
                 //获取当前项目的用户

@@ -159,8 +159,8 @@ class ProofreadingController extends BaseController
             'updated_at'=>date('Y-m-d H:i:s')
             'updated_at'=>date('Y-m-d H:i:s')
         ];
         ];
         $proofreadingModel = new Proofreading();
         $proofreadingModel = new Proofreading();
-        DB::beginTransaction();
-        try {
+//        DB::beginTransaction();
+//        try {
             $proofreadingModel->del(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'type'=>2]);
             $proofreadingModel->del(['language_id'=>$this->param['language_id'],'url'=>$this->param['url'],'type'=>2]);
             //删除成功后，重新添加
             //删除成功后，重新添加
             $save_data = [];
             $save_data = [];
@@ -170,11 +170,11 @@ class ProofreadingController extends BaseController
                 $save_data[] = $param;
                 $save_data[] = $param;
             }
             }
             $proofreadingModel->insert($save_data);
             $proofreadingModel->insert($save_data);
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('系统错误请联系管理员');
-        }
+//            DB::commit();
+//        }catch (\Exception $e){
+//            DB::rollBack();
+//            $this->fail('系统错误请联系管理员');
+//        }
         $this->response('success');
         $this->response('success');
     }
     }
 
 

@@ -134,7 +134,7 @@ class FileController
             }
             }
         }
         }
         $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);
-        return $this->response('资源',Code::SUCCESS,$this->responseData($this->path.'/'.$fileName, $name));
+        $this->response('资源',Code::SUCCESS,$this->responseData($this->path.'/'.$fileName, $name));
     }
     }
 
 
     /**
     /**