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

Lyh server



查看合并请求 !1803

@@ -92,6 +92,7 @@ class CopyProject extends Command
         $data['finish_remain_day'] = 0;
         $data['finish_remain_day'] = 0;
         $data['title'] = $data['title'].'-copy';
         $data['title'] = $data['title'].'-copy';
         $data['delete_status'] = 1;
         $data['delete_status'] = 1;
+        $data['is_ai_blog'] = 0;
         unset($data['id'],$data['exclusive_aicc_day'],$data['aicc'],$data['robots'],$data['is_translate_tag'],$data['is_translate'],$data['is_minor_languages'],$data['uptime']);
         unset($data['id'],$data['exclusive_aicc_day'],$data['aicc'],$data['robots'],$data['is_translate_tag'],$data['is_translate'],$data['is_minor_languages'],$data['uptime']);
         $project_id = $projectModel->insertGetId($data);
         $project_id = $projectModel->insertGetId($data);
         $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
         $hashids = new Hashids($data['from_order_id'], 13, 'abcdefghjkmnpqrstuvwxyz1234567890');
@@ -145,7 +146,7 @@ class CopyProject extends Command
         $optimizeData = $optimizeModel::where('project_id', $old_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'],$optimizeData['is_ai_blog_send']);
             $optimizeData['project_id'] = $project_id;
             $optimizeData['project_id'] = $project_id;
             $optimizeData['api_no'] = 0;
             $optimizeData['api_no'] = 0;
             $optimizeModel->insert($optimizeData);
             $optimizeModel->insert($optimizeData);

@@ -199,8 +199,10 @@ class SyncProject extends Command
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2023/8/9 15:04
      * @time   :2023/8/9 15:04
+     * @param  :version:7->v7版本（升级项目默认为v7）
      */
      */
     public function sync($param,$is_update = 0){
     public function sync($param,$is_update = 0){
+        $version = (($is_update == 1) ? 7 : ($param['version'] ?? 0));
         $title = date('Ymd') . '-' . $param['company_name'];
         $title = date('Ymd') . '-' . $param['company_name'];
         $data = [
         $data = [
             'project'=>[
             'project'=>[
@@ -222,6 +224,7 @@ class SyncProject extends Command
                 'notice_order_id' => $param['id'],
                 'notice_order_id' => $param['id'],
                 'type' => $is_update,
                 'type' => $is_update,
                 'is_upgrade'=>$is_update,
                 'is_upgrade'=>$is_update,
+                'version'=>$version
             ],
             ],
             'deploy_build' => [
             'deploy_build' => [
                 'login_mobile'=>$param['principal_mobile']
                 'login_mobile'=>$param['principal_mobile']