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

gx批量操作关键词



查看合并请求 !1839

@@ -44,6 +44,7 @@ class CopyProject extends Command
     public function handle()
     {
         while (true) {
+            $projectModel = new Project();
             $list = NoticeLog::where('type', NoticeLog::TYPE_COPY_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get();
             if(empty($list)){
                 sleep(30);
@@ -71,10 +72,12 @@ class CopyProject extends Command
                 sleep(60);
                 try {
                     $this->copyMysql($old_project_id,$project_id);
+                    $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
                 }catch (\Exception $e){
                     echo '复制数据库失败：'.$old_project_id . '<->'.$project_id;
                 }
-                $this->output('CopyProjectJob end, old project_id: ' . $old_project_id . ', new project_id: ' . $project_id);
+                //修改项目状态
+                $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
             }
         }
         return true;
@@ -206,13 +209,62 @@ class CopyProject extends Command
     }
     //复制数据库
     public function copyMysql($project_id,$new_project_id){
-        Artisan::call("php artisan copy_project_s $project_id $new_project_id");
+        //切换数据库配置
+        $project = ProjectServer::useProject($new_project_id);
+        //创建数据库
+        ProjectServer::createDatabase($project);
+        //创建表
+        $this->initTable($project_id,$new_project_id);
         //修改项目状态
         $projectModel = new Project();
         $projectModel->edit(['delete_status'=>0],['id'=>$new_project_id]);
     }
 
     /**
+     * @remark :创建数据库
+     * @name   :initTable
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/11 10:09
+     */
+    public function initTable($project_id, $news_project_id)
+    {
+        // 设置源数据库
+        config(['database.connections.custom_tmp_mysql_copy.database' => 'gl_data_' . $project_id]);
+        $database_name = DB::connection('custom_tmp_mysql_copy')->getDatabaseName();
+        // 获取源数据库的所有表
+        $tables = Schema::connection('custom_tmp_mysql_copy')->getAllTables();
+        $tables = array_column($tables, 'Tables_in_' . $database_name);
+        foreach ($tables as $table) {
+            // 1. 删除目标数据库中的表
+            DB::connection('custom_mysql')->statement("DROP TABLE IF EXISTS {$table}");
+            // 2. 重新创建表
+            $sql = DB::connection('custom_tmp_mysql_copy')->select("SHOW CREATE TABLE {$table}");
+            DB::connection('custom_mysql')->statement(get_object_vars($sql[0])['Create Table']);
+            // 3. 跳过指定的表
+            if (in_array($table, ['gl_customer_visit', 'gl_customer_visit_item', 'gl_inquiry_other', 'gl_inquiry_form_data', 'gl_inquiry_form'])) {
+                continue;
+            }
+            try {
+                // 4. 重新插入数据
+                DB::connection('custom_mysql')->table($table)->insertUsing(
+                    [], // 插入所有列
+                    function ($query) use ($table, $project_id) {
+                        $name = 'gl_data_' . $project_id . '.' . $table;
+                        $query->select('*')->from("{$name}");
+                    }
+                );
+            }catch (\Exception $e){
+                continue;
+            }
+            // 5. 更新 project_id（如果存在）
+            if (Schema::connection('custom_mysql')->hasColumn($table, 'project_id')) {
+                DB::connection('custom_mysql')->table($table)->update(['project_id' => $news_project_id]);
+            }
+        }
+        return true;
+    }
+    /**
      * @param $message
      * @return bool
      */

@@ -159,13 +159,17 @@ class ProjectLogic extends BaseLogic
      * @param  :1->建站中 2->优化中 3->建站完成 6-》错误单
      */
     public function projectSave(){
-        $this->saveSeoPlan($this->param['id'],$this->param['type'],$this->param['deploy_build']['plan'],$this->param['deploy_build']['seo_plan'],$this->param['deploy_optimize']['optimist_mid'] ?? 0,$this->param['deploy_optimize']['quality_mid'] ?? 0);
-        $this->checkAiBlog($this->param['main_lang_id'],$this->param['is_ai_blog'],$this->param['company'],$this->param['deploy_optimize']['company_en_name'] ?? '',$this->param['deploy_optimize']['company_en_description'] ?? '');
-        DB::beginTransaction();
-        try {
-            if($this->param['type'] == Project::TYPE_SEVEN){
-                $this->setTypeSevenEdit($this->param);
-            }else{
+        if($this->param['type'] == Project::TYPE_SEVEN){
+            $this->setTypeSevenEdit($this->param);
+        }else{
+            //优化设置默认关闭
+            $this->param['is_ai_blog'] = 0;
+            $this->param['deploy_optimize']['is_ai_blog_send'] = 0;
+            $this->param['deploy_optimize']['is_auto_keywords'] = 0;
+            $this->saveSeoPlan($this->param['id'],$this->param['type'],$this->param['deploy_build']['plan'],$this->param['deploy_build']['seo_plan'],$this->param['deploy_optimize']['optimist_mid'] ?? 0,$this->param['deploy_optimize']['quality_mid'] ?? 0);
+            $this->checkAiBlog($this->param['main_lang_id'],$this->param['is_ai_blog'],$this->param['company'],$this->param['deploy_optimize']['company_en_name'] ?? '',$this->param['deploy_optimize']['company_en_description'] ?? '');
+            DB::beginTransaction();
+            try {
                 //初始化项目
                 $this->param = $this->createProjectData($this->param);
                 //双向绑定服务器,需放到保存项目的上方
@@ -191,11 +195,11 @@ class ProjectLogic extends BaseLogic
                 $this->syncImageFile($this->param['project_location'],$this->param['id']);
                 //同步信息表
                 (new SyncService())->projectAcceptAddress($this->param['id']);
+                DB::commit();
+            }catch (\Exception $e){
+                DB::rollBack();
+                $this->fail('保存失败，请联系管理员');
             }
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->fail('保存失败，请联系管理员');
         }
         return $this->success();
     }