Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -90,7 +90,7 @@ class VideoTask extends Command
                 continue;
                 continue;
             }
             }
             ProjectServer::useProject($task_project->project_id);
             ProjectServer::useProject($task_project->project_id);
-            $keyword = $this->getProjectKeyword();
+            $keyword = $this->getProjectKeyword($task_project->number);
             // 已经没有需要生成视频的关键词
             // 已经没有需要生成视频的关键词
             if (!$keyword) {
             if (!$keyword) {
                 $task_project->status = KeywordVideoTask::STATUS_CLOSE;
                 $task_project->status = KeywordVideoTask::STATUS_CLOSE;
@@ -155,12 +155,13 @@ class VideoTask extends Command
 
 
     /**
     /**
      * 获取未生成页面的关键词
      * 获取未生成页面的关键词
+     * @param $number
      * @return mixed
      * @return mixed
      */
      */
-    public function getProjectKeyword()
+    public function getProjectKeyword($number)
     {
     {
         $keyword_arr_id = Keyword::where('video', null)->whereNotNull('keyword_content')->pluck('id')->toArray();
         $keyword_arr_id = Keyword::where('video', null)->whereNotNull('keyword_content')->pluck('id')->toArray();
-        $keyword_id = array_rand($keyword_arr_id, 500);
+        $keyword_id = array_rand($keyword_arr_id, $number);
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         $keyword = Keyword::whereIn("id", $keyword_id)->get();
         return $keyword;
         return $keyword;
     }
     }

@@ -277,7 +277,9 @@ class Demo extends Command
                             'type'=>$v1['type'],
                             'type'=>$v1['type'],
                             'keywords'=>$v1['keywords'],
                             'keywords'=>$v1['keywords'],
                             'service_day'=>$v1['service_day'],
                             'service_day'=>$v1['service_day'],
-                            'project_id'=>$v['project_id']
+                            'project_id'=>$v['project_id'],
+                            'created_at'=>date('Y-m-d H:i:s'),
+                            'updated_at'=>date('Y-m-d H:i:s')
                         ];
                         ];
                     }
                     }
                 }
                 }

@@ -5,19 +5,15 @@ namespace App\Http\Controllers\Aside\Optimize;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
-use App\Http\Logic\Aside\Optimize\OptimizeLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\Ai\AiPrefix;
 use App\Models\Ai\AiPrefix;
 use App\Models\ASide\APublicModel;
 use App\Models\ASide\APublicModel;
 use App\Models\Channel\Channel;
 use App\Models\Channel\Channel;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
-use App\Models\Manage\Manage;
 use App\Models\Manage\ManageHr;
 use App\Models\Manage\ManageHr;
-use App\Models\Project\OnlineCheck;
+use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RankData\RankData;
 use App\Models\RankData\RankData;
-use App\Models\Task\Task;
-use Illuminate\Support\Facades\DB;
 
 
 /**
 /**
  * @remark :优化
  * @remark :优化
@@ -194,6 +190,7 @@ class OptimizeController extends BaseController
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.quality_mid AS quality_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.design_mid AS design_mid',
             'gl_project_deploy_optimize.start_date AS start_date',
             'gl_project_deploy_optimize.start_date AS start_date',
+            'gl_project_deploy_optimize.backlink AS backlink',
         ];
         ];
         return $select;
         return $select;
     }
     }
@@ -365,4 +362,24 @@ class OptimizeController extends BaseController
         $projectModel->edit([$this->param['type']=>$this->param['status']],['id'=>$this->param['project_id']]);
         $projectModel->edit([$this->param['type']=>$this->param['status']],['id'=>$this->param['project_id']]);
         $this->response('success');
         $this->response('success');
     }
     }
+
+    /**
+     * @remark :标记反向链接
+     * @name   :editBacklink
+     * @author :lyh
+     * @method :post
+     * @time   :2024/2/29 9:18
+     */
+    public function editBacklink(){
+        $this->request->validate([
+            'project_id'=>'required',
+            'backlink'=>'required',
+        ],[
+            'project_id.required' => 'project_id不能为空',
+            'backlink.required' => 'backlink不能为空',
+        ]);
+        $optimizeModel = new DeployOptimize();
+        $optimizeModel->edit(['backlink'=>$this->param['backlink']],['project_id'=>$this->param['project_id']]);
+        $this->response('success');
+    }
 }
 }

@@ -316,15 +316,20 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 13:57
      * @time   :2023/8/30 13:57
      */
      */
     protected function saveMinorLanguages($minor_language){
     protected function saveMinorLanguages($minor_language){
+        $data = [];
         //查询数据是否存在
         //查询数据是否存在
         $languageModel = new MinorLanguages();
         $languageModel = new MinorLanguages();
         $languageModel->del(['project_id'=>$this->param['id']]);
         $languageModel->del(['project_id'=>$this->param['id']]);
         if(!empty($minor_language)){
         if(!empty($minor_language)){
             foreach ($minor_language as $k => $v){
             foreach ($minor_language as $k => $v){
-                $v['project_id'] = $this->param['id'];
-                $minor_language[$k] = $v;
+                if(!empty($v['language'])){
+                    $v['project_id'] = $this->param['id'];
+                    $data[] = $v;
+                }
+            }
+            if(!empty($data)){
+                $languageModel->insert($minor_language);
             }
             }
-            $languageModel->insert($minor_language);
         }
         }
         return $this->success();
         return $this->success();
     }
     }

@@ -270,6 +270,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/getAiPrefix', [Aside\Optimize\OptimizeController::class, 'getAiPrefix'])->name('admin.optimize_getAiPrefix');//获取Ai前后缀
         Route::any('/getAiPrefix', [Aside\Optimize\OptimizeController::class, 'getAiPrefix'])->name('admin.optimize_getAiPrefix');//获取Ai前后缀
         Route::any('/saveAiPrefix', [Aside\Optimize\OptimizeController::class, 'saveAiPrefix'])->name('admin.optimize_saveAiPrefix');//保存Ai前后缀
         Route::any('/saveAiPrefix', [Aside\Optimize\OptimizeController::class, 'saveAiPrefix'])->name('admin.optimize_saveAiPrefix');//保存Ai前后缀
         Route::any('/setRobots', [Aside\Optimize\OptimizeController::class, 'setRobots'])->name('admin.optimize_setRobots');//设置robots开关
         Route::any('/setRobots', [Aside\Optimize\OptimizeController::class, 'setRobots'])->name('admin.optimize_setRobots');//设置robots开关
+        Route::any('/editBacklink', [Aside\Optimize\OptimizeController::class, 'editBacklink'])->name('admin.optimize_editBacklink');//设置backlink开关
         Route::any('/editTranslateStatus', [Aside\Optimize\OptimizeController::class, 'editTranslateStatus'])->name('admin.optimize_editTranslateStatus');//设置robots开关
         Route::any('/editTranslateStatus', [Aside\Optimize\OptimizeController::class, 'editTranslateStatus'])->name('admin.optimize_editTranslateStatus');//设置robots开关
     });
     });
     //生成关键字
     //生成关键字