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

Lyh server



查看合并请求 !1481

@@ -68,6 +68,7 @@ class AiBlogAuthorTask extends Command
                 continue;
                 continue;
             }
             }
             if($result['status'] != 200){
             if($result['status'] != 200){
+                sleep(10);
                 continue;
                 continue;
             }
             }
             if(empty($result['data'])){
             if(empty($result['data'])){

@@ -55,18 +55,11 @@ class CopyProject extends Command
                     $this->output('CopyProjectJob start, project_id: ' . $old_project_id);
                     $this->output('CopyProjectJob start, project_id: ' . $old_project_id);
                     $data = $this->copyProject($old_project_id);
                     $data = $this->copyProject($old_project_id);
                     $project_id = $data['project_id'];
                     $project_id = $data['project_id'];
-                    $type = $data['type'];
                     $this->copyDeployBuild($old_project_id,$project_id);
                     $this->copyDeployBuild($old_project_id,$project_id);
                     $this->copyDeployOptimize($old_project_id,$project_id);
                     $this->copyDeployOptimize($old_project_id,$project_id);
                     $this->copyPayment($old_project_id,$project_id);
                     $this->copyPayment($old_project_id,$project_id);
                     $this->copyAfter($old_project_id,$project_id);
                     $this->copyAfter($old_project_id,$project_id);
                     $this->copyUser($old_project_id,$project_id);
                     $this->copyUser($old_project_id,$project_id);
-                    if($type != 0){
-                        $this->copyMysql($old_project_id,$project_id);
-                    }
-                    //修改项目状态
-                    $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
-                    $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
                     $item->status = NoticeLog::STATUS_SUCCESS;
                     $item->status = NoticeLog::STATUS_SUCCESS;
                     $item->save();
                     $item->save();
                 }catch (\Exception $e){
                 }catch (\Exception $e){
@@ -75,6 +68,14 @@ class CopyProject extends Command
                     $item->status = NoticeLog::STATUS_FAIL;
                     $item->status = NoticeLog::STATUS_FAIL;
                     $item->save();
                     $item->save();
                 }
                 }
+                try {
+                    $this->copyMysql($old_project_id,$project_id);
+                }catch (\Exception $e){
+                    echo '复制数据库失败：'.$old_project_id . '<->'.$project_id;
+                }
+                //修改项目状态
+                $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
+                $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
             }
             }
         }
         }
         return true;
         return true;