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

gxshuju



查看合并请求 !1407

@@ -50,7 +50,6 @@ class CopyProject extends Command
                 continue;
                 continue;
             }
             }
             foreach ($list as $item){
             foreach ($list as $item){
-                DB::beginTransaction();
                 try {
                 try {
                     $old_project_id = $item['data']['project_id'];
                     $old_project_id = $item['data']['project_id'];
                     $this->output('CopyProjectJob start, project_id: ' . $old_project_id);
                     $this->output('CopyProjectJob start, project_id: ' . $old_project_id);
@@ -70,9 +69,7 @@ class CopyProject extends Command
                     $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_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();
-                    DB::commit();
                 }catch (\Exception $e){
                 }catch (\Exception $e){
-                    DB::rollBack();
                     echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL . date('Y-m-d H:i:s');
                     echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL . date('Y-m-d H:i:s');
                     errorLog('项目初始化失败', $item, $e);
                     errorLog('项目初始化失败', $item, $e);
                     $item->status = NoticeLog::STATUS_FAIL;
                     $item->status = NoticeLog::STATUS_FAIL;
@@ -242,15 +239,10 @@ class CopyProject extends Command
             $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
             $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
             DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
             DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
             // 3. 跳过指定的表
             // 3. 跳过指定的表
-            if (in_array($table, [
-                'gl_customer_visit',
-                'gl_customer_visit_item',
-                'gl_inquiry_other',
-                'gl_inquiry_form_data',
-                'gl_inquiry_form'
-            ])) {
+            if (in_array($table, ['gl_customer_visit', 'gl_customer_visit_item', 'gl_inquiry_other', 'gl_inquiry_form_data', 'gl_inquiry_form'])) {
                 continue;
                 continue;
             }
             }
+            try {
                 // 4. 重新插入数据
                 // 4. 重新插入数据
                 DB::connection('custom_mysql')->table($table)->insertUsing(
                 DB::connection('custom_mysql')->table($table)->insertUsing(
                     [], // 插入所有列
                     [], // 插入所有列
@@ -259,6 +251,9 @@ class CopyProject extends Command
                         $query->select('*')->from("{$name}");
                         $query->select('*')->from("{$name}");
                     }
                     }
                 );
                 );
+            }catch (\Exception $e){
+                continue;
+            }
             // 5. 更新 project_id（如果存在）
             // 5. 更新 project_id（如果存在）
             if (Schema::connection('custom_mysql')->hasColumn($table, 'project_id')) {
             if (Schema::connection('custom_mysql')->hasColumn($table, 'project_id')) {
                 DB::connection('custom_mysql')->table($table)->update(['project_id' => $news_project_id]);
                 DB::connection('custom_mysql')->table($table)->update(['project_id' => $news_project_id]);