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

 <?php
 <?php
+/**
+ * @remark :
+ * @name   :CopyProject.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/1/15 14:40
+ */
 
 
-namespace App\Jobs;
+namespace App\Console\Commands\Project;
 
 
-use App\Events\CopyProject;
-use App\Events\UpdateHtml;
-use App\Jobs\updateHtmlJob;
+use App\Models\Com\NoticeLog;
 use App\Models\Project\After;
 use App\Models\Project\After;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
@@ -14,48 +19,73 @@ use App\Models\Template\Setting;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Hashids\Hashids;
 use Hashids\Hashids;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
+use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Facades\Schema;
 
 
-class CopyProjectJob implements ShouldQueue
+class CopyProject extends Command
 {
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-    public $tries = 3; // 可配置任务重试次数
-
-    protected $param;
-
     /**
     /**
-     * Create a new job instance.
+     * The name and signature of the console command.
      *
      *
-     * @param  CopyImageFile  $event
-     * @return void
+     * @var string
      */
      */
-    public function __construct($data)
-    {
-        $this->param = $data;
-    }
-
+    protected $signature = 'copy_project';
 
 
     /**
     /**
-     * Handle the event.
+     * The console command description.
      *
      *
-     * @param  UpdateHtml  $event
-     * @return void
+     * @var string
      */
      */
+    protected $description = 'copy--复制项目';
+
     public function handle()
     public function handle()
     {
     {
         $projectModel = new Project();
         $projectModel = new Project();
+        while (true) {
+            $list = NoticeLog::where('type', NoticeLog::TYPE_COPY_PROJECT)->where('status', NoticeLog::STATUS_PENDING)->get();
+            if(empty($list)){
+                sleep(5);
+                continue;
+            }
+            foreach ($list as $item){
                 DB::beginTransaction();
                 DB::beginTransaction();
                 try {
                 try {
-            $this->output('CopyProjectJob start, project_id: ' . $this->param['project_id']);
-            //复制初始项目
-            $data = $projectModel::where('id', $this->param['project_id'])->first();
+                    $old_project_id = $item['data']['project_id'];
+                    $this->output('CopyProjectJob start, project_id: ' . $old_project_id);
+                    $data = $this->copyProject($old_project_id);
+                    $project_id = $data['project_id'];
+                    $type = $data['type'];
+                    $this->copyDeployBuild($old_project_id,$project_id);
+                    $this->copyDeployOptimize($old_project_id,$project_id);
+                    $this->copyPayment($old_project_id,$project_id);
+                    $this->copyAfter($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->save();
+                    DB::commit();
+                }catch (\Exception $e){
+                    DB::rollBack();
+                    echo 'error:' . $item['id'] . $e->getMessage() . PHP_EOL . date('Y-m-d H:i:s');
+                    errorLog('项目初始化失败', $item, $e);
+                    $item->status = NoticeLog::STATUS_FAIL;
+                    $item->save();
+                }
+            }
+        }
+        return true;
+    }
+
+    public function copyProject($old_project_id){
+        $projectModel = new Project();
+        $data = $projectModel::where('id', $old_project_id)->first();
         $data = $data->getAttributes();
         $data = $data->getAttributes();
         $type = $data['type'];
         $type = $data['type'];
         $data['type'] = 0;
         $data['type'] = 0;
@@ -69,7 +99,7 @@ class CopyProjectJob implements ShouldQueue
         $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);
         $projectModel->edit(['from_order_id'=>$hashids->encode($project_id)],['id'=>$project_id]);
         //复制设置的模版
         //复制设置的模版
         $settingTemplateModel = new Setting();
         $settingTemplateModel = new Setting();
-            $settingData = $settingTemplateModel::where('project_id', $this->param['project_id'])->first();
+        $settingData = $settingTemplateModel::where('project_id', $old_project_id)->first();
         if(!empty($settingData)){
         if(!empty($settingData)){
             $data = [
             $data = [
                 'template_id' =>$settingData['template_id'],
                 'template_id' =>$settingData['template_id'],
@@ -77,9 +107,20 @@ class CopyProjectJob implements ShouldQueue
             ];
             ];
             $settingTemplateModel->add($data);
             $settingTemplateModel->add($data);
         }
         }
+        return ['project_id'=>$project_id,'type'=>$type];
+    }
+
+    /**
+     * @remark :复制部署表
+     * @name   :copyDeployBuild
+     * @author :lyh
+     * @method :post
+     * @time   :2025/1/15 14:59
+     */
+    public function copyDeployBuild($old_project_id,$project_id){
         //复制部署表
         //复制部署表
         $buildModel = new DeployBuild();
         $buildModel = new DeployBuild();
-            $buildData = $buildModel::where('project_id', $this->param['project_id'])->first();
+        $buildData = $buildModel::where('project_id', $old_project_id)->first();
         if(!empty($buildData)){
         if(!empty($buildData)){
             $buildData = $buildData->getAttributes();
             $buildData = $buildData->getAttributes();
             $buildData['project_id'] = $project_id;
             $buildData['project_id'] = $project_id;
@@ -89,9 +130,20 @@ class CopyProjectJob implements ShouldQueue
             unset($buildData['id']);
             unset($buildData['id']);
             $buildModel->insert($buildData);
             $buildModel->insert($buildData);
         }
         }
+        return true;
+    }
+
+    /**
+     * @remark :复制优化表
+     * @name   :copyDeployOptimize
+     * @author :lyh
+     * @method :post
+     * @time   :2025/1/15 15:02
+     */
+    public function copyDeployOptimize($old_project_id,$project_id){
         //复制优化表
         //复制优化表
         $optimizeModel = new DeployOptimize();
         $optimizeModel = new DeployOptimize();
-            $optimizeData = $optimizeModel::where('project_id', $this->param['project_id'])->first();
+        $optimizeData = $optimizeModel::where('project_id', $old_project_id)->first();
         if(!empty($optimizeData)){
         if(!empty($optimizeData)){
             $optimizeData = $optimizeData->getAttributes();
             $optimizeData = $optimizeData->getAttributes();
             unset($optimizeData['id'],$optimizeData['domain'],$optimizeData['backlink'],$optimizeData['ai_video']);
             unset($optimizeData['id'],$optimizeData['domain'],$optimizeData['backlink'],$optimizeData['ai_video']);
@@ -99,45 +151,59 @@ class CopyProjectJob implements ShouldQueue
             $optimizeData['api_no'] = 0;
             $optimizeData['api_no'] = 0;
             $optimizeModel->insert($optimizeData);
             $optimizeModel->insert($optimizeData);
         }
         }
+        return true;
+    }
+
+    /**
+     * @remark :复制付费表
+     * @name   :copyPayment
+     * @author :lyh
+     * @method :post
+     * @time   :2025/1/15 15:03
+     */
+    public function copyPayment($old_project_id,$project_id){
         //复制付费表
         //复制付费表
         $paymentModel = new Payment();
         $paymentModel = new Payment();
-            $paymentData = $paymentModel::where('project_id', $this->param['project_id'])->first();
+        $paymentData = $paymentModel::where('project_id', $old_project_id)->first();
         if(!empty($paymentData)){
         if(!empty($paymentData)){
             $paymentData = $paymentData->getAttributes();
             $paymentData = $paymentData->getAttributes();
             unset($paymentData['id']);
             unset($paymentData['id']);
             $paymentData['project_id'] = $project_id;
             $paymentData['project_id'] = $project_id;
             $paymentModel->insert($paymentData);
             $paymentModel->insert($paymentData);
         }
         }
+        return true;
+    }
+
+    public function copyAfter($old_project_id,$project_id){
         //复制售后表
         //复制售后表
         $afterModel = new After();
         $afterModel = new After();
-            $afterData = $afterModel::where('project_id', $this->param['project_id'])->first();
+        $afterData = $afterModel::where('project_id',$old_project_id)->first();
         if(!empty($afterData)){
         if(!empty($afterData)){
             $afterData = $afterData->getAttributes();
             $afterData = $afterData->getAttributes();
             unset($afterData['id']);
             unset($afterData['id']);
             $afterData['project_id'] = $project_id;
             $afterData['project_id'] = $project_id;
             $afterModel->insert($afterData);
             $afterModel->insert($afterData);
         }
         }
+        return true;
+    }
+
+    /**
+     * @remark :复制user
+     * @name   :copyUser
+     * @author :lyh
+     * @method :post
+     * @time   :2025/1/15 15:04
+     */
+    public function copyUser($old_project_id,$project_id){
         //复制用户
         //复制用户
         $userModel = new UserModel();
         $userModel = new UserModel();
-            $userData = $userModel::where('project_id', $this->param['project_id'])->where('role_id',0)->first();
+        $userData = $userModel::where('project_id', $old_project_id)->where('role_id',0)->first();
         if(!empty($userData)){
         if(!empty($userData)){
             $userData = $userData->getAttributes();
             $userData = $userData->getAttributes();
             unset($userData['id']);
             unset($userData['id']);
             $userData['project_id'] = $project_id;
             $userData['project_id'] = $project_id;
             $userModel->insert($userData);
             $userModel->insert($userData);
         }
         }
-            DB::commit();
-        }catch (\Exception $e){
-            DB::rollBack();
-            $this->output('CopyProjectJob error, error message: ' . $e->getMessage());
-            $this->fail('error');
-        }
-        if($type != 0){
-            $this->copyMysql($this->param['project_id'],$project_id);
-        }
-        //修改项目状态
-        $projectModel->edit(['delete_status'=>0],['id'=>$project_id]);
-        $this->output('CopyProjectJob end, old project_id: ' . $this->param['project_id'] . ', new project_id: ' . $project_id);
         return true;
         return true;
     }
     }
 
 
@@ -200,4 +266,5 @@ class CopyProjectJob implements ShouldQueue
         Log::info($output);
         Log::info($output);
         return true;
         return true;
     }
     }
+
 }
 }

@@ -754,7 +754,7 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/11/8 14:23
      * @time   :2023/11/8 14:23
      */
      */
     public function copyProject(){
     public function copyProject(){
-        CopyProjectJob::dispatch(['project_id'=>$this->param['project_id']]);
+        NoticeLog::createLog(NoticeLog::TYPE_COPY_PROJECT, ['project_id' => $this->param['project_id']]);
         return $this->success('项目复制中，请稍后前往初始化项目查看；');
         return $this->success('项目复制中，请稍后前往初始化项目查看；');
     }
     }
 
 

@@ -13,6 +13,7 @@ class NoticeLog extends Base
     const TYPE_PROJECT = 'project';
     const TYPE_PROJECT = 'project';
     const TYPE_RANK_DATA = 'rank_data';
     const TYPE_RANK_DATA = 'rank_data';
     const TYPE_INIT_PROJECT = 'init_project';
     const TYPE_INIT_PROJECT = 'init_project';
+    const TYPE_COPY_PROJECT = 'copy_project';
     const TYPE_INIT_KEYWORD = 'init_keyword';
     const TYPE_INIT_KEYWORD = 'init_keyword';
     const DELETE_PRODUCT_CATEGORY = 'delete_product_category';
     const DELETE_PRODUCT_CATEGORY = 'delete_product_category';
     const DELETE_BLOG_CATEGORY = 'delete_blog_category';
     const DELETE_BLOG_CATEGORY = 'delete_blog_category';