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

@@ -83,7 +83,7 @@ class RankData extends BaseCommands
             //白帽SEO版
             //白帽SEO版
             $list = Project::leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
             $list = Project::leftJoin('gl_project_deploy_build', 'gl_project.id', '=', 'gl_project_deploy_build.project_id')
                 ->where('gl_project.delete_status',0)
                 ->where('gl_project.delete_status',0)
-                ->where('gl_project_deploy_build.seo_plan', 1)
+                ->where('gl_project_deploy_build.seo_plan', '>', 0)
                 ->whereIn('gl_project.type',[2,3,4])
                 ->whereIn('gl_project.type',[2,3,4])
                 ->orderBy('gl_project.id', 'asc')
                 ->orderBy('gl_project.id', 'asc')
                 ->pluck('gl_project.id')->toArray();
                 ->pluck('gl_project.id')->toArray();

@@ -525,6 +525,39 @@ class OptimizeController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取聚合页链接数据
+     * @name   :getKeywordRouteList
+     * @author :lyh
+     * @method :post
+     * @time   :2025/8/22 15:02
+     */
+    public function getKeywordRouteList(){
+        $this->request->validate([
+            'project_id' => 'required',
+        ], [
+            'project_id.required' => 'project_id不能为空',
+        ]);
+        // 获取当前网站正式域名
+        $domainModel = new DomainInfo();
+        $domainInfo = $domainModel->read(['project_id' => $this->param['project_id']], ['domain']);
+        if ($domainInfo === false) {
+            $this->fail('请先设置域名');
+        }
+        $domain = 'https://' . $domainInfo['domain'] . '/';
+        ProjectServer::useProject($this->param['project_id']);
+        $productKeywordModel = new Keyword();
+        $data = [];
+        $lists = $productKeywordModel->list(['route'=>['!=',null]],'id',['id','route','seo_title']);
+        if (!empty($lists)){
+            foreach ($lists as $item){
+                $data[] = $domain . $item['route'] . '/{' . $item['seo_title'] . '}';
+            }
+        }
+        DB::disconnect('custom_mysql');
+        $this->response('success', Code::SUCCESS, $data);
+    }
+
+    /**
      * @remark :分片查询
      * @remark :分片查询
      * @name   :processChunkedList
      * @name   :processChunkedList
      * @author :lyh
      * @author :lyh
@@ -540,6 +573,9 @@ class OptimizeController extends BaseController
                 break;
                 break;
             }
             }
             foreach ($chunk['list'] as $item) {
             foreach ($chunk['list'] as $item) {
+                if(empty($item['route'])){
+                    continue;
+                }
                 $data[$key][] = $domain . $item['route'] . '/{' . $item['title'] . '}';
                 $data[$key][] = $domain . $item['route'] . '/{' . $item['title'] . '}';
             }
             }
             $offset++;
             $offset++;

@@ -142,7 +142,6 @@ class KeywordLogic extends  BaseLogic
             $this->fail('保存失败,请联系管理员');
             $this->fail('保存失败,请联系管理员');
         }
         }
         Common::del_user_cache('product_keyword',$this->user['project_id']);
         Common::del_user_cache('product_keyword',$this->user['project_id']);
-        NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD, ['project_id' => $this->user['project_id']]);
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -328,8 +328,9 @@ Route::middleware(['aloginauth'])->group(function () {
         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('/editBacklink', [Aside\Optimize\OptimizeController::class, 'editBacklink'])->name('admin.optimize_editBacklink');//设置backlink开关
-        Route::any('/setAiVideo', [Aside\Optimize\OptimizeController::class, 'setAiVideo'])->name('admin.optimize_setAiVideo');//设置backlink开关
-        Route::any('/anchorTextList', [Aside\Optimize\OptimizeController::class, 'anchorTextList'])->name('admin.optimize_anchorTextList');//设置backlink开关
+        Route::any('/setAiVideo', [Aside\Optimize\OptimizeController::class, 'setAiVideo'])->name('admin.optimize_setAiVideo');//设置ai_video
+        Route::any('/anchorTextList', [Aside\Optimize\OptimizeController::class, 'anchorTextList'])->name('admin.optimize_anchorTextList');//锚文本链接
+        Route::any('/getKeywordRouteList', [Aside\Optimize\OptimizeController::class, 'getKeywordRouteList'])->name('admin.optimize_getKeywordRouteList');//聚合页链接
         Route::any('/saveMinorLanguages', [Aside\Optimize\OptimizeController::class, 'saveMinorLanguages'])->name('admin.optimize_saveMinorLanguages');//设置小语种监控开关
         Route::any('/saveMinorLanguages', [Aside\Optimize\OptimizeController::class, 'saveMinorLanguages'])->name('admin.optimize_saveMinorLanguages');//设置小语种监控开关
         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开关
         Route::any('/getAnchorLink', [Aside\Optimize\OptimizeController::class, 'getAnchorLink'])->name('admin.optimize_getAnchorLink');//设置robots开关
         Route::any('/getAnchorLink', [Aside\Optimize\OptimizeController::class, 'getAnchorLink'])->name('admin.optimize_getAnchorLink');//设置robots开关