GX

@@ -35,7 +35,7 @@ class UpdateSeoTdkCrontab extends Command
      */
     public function handle()
     {
-        $project_ids = Project::where('type', Project::TYPE_TWO)->where('uptime', '<=', date('Y-m-d H:i:s'))->pluck('id')->toArray();
+        $project_ids = Project::where('type', Project::TYPE_TWO)->where('extend_type',0)->where('delete_status',0)->where('uptime', '<=', date('Y-m-d H:i:s'))->pluck('id')->toArray();
         foreach ($project_ids as $project_id){
             try {
                 ProjectUpdateTdk::add_task($project_id);
@@ -44,7 +44,7 @@ class UpdateSeoTdkCrontab extends Command
             }
         }
 
-        $project_ids = Project::where('type', Project::TYPE_TWO)->where('tag_page_version', '>' ,1)->where('uptime', '<=', date('Y-m-d H:i:s'))->pluck('id')->toArray();
+        $project_ids = Project::where('type', Project::TYPE_TWO)->where('extend_type',0)->where('delete_status',0)->where('tag_page_version', '>' ,1)->where('uptime', '<=', date('Y-m-d H:i:s'))->pluck('id')->toArray();
         foreach ($project_ids as $project_id){
             try {
                 ProjectKeywordAiTask::add_task($project_id);

@@ -12,6 +12,7 @@ namespace App\Http\Logic\Bside\BCom;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Ai\AiBlog;
 use App\Models\Ai\AiVideo;
+use App\Models\AuthorityScore\AuthorityScore;
 use App\Models\RankData\RankDataBmseo;
 use App\Models\SeoSetting\LinkData;
 
@@ -42,14 +43,8 @@ class AuthorityScoreLogic extends BaseLogic
         $bSeoModel = new RankDataBmseo();
         $bSeoInfo = $bSeoModel->read(['project_id'=>$this->user['project_id'],'lang'=>''],['first_num','first_page_num','first_three_pages_num','first_five_pages_num','first_ten_pages_num','indexed_pages_num']);
         $data['rank'] = $bSeoInfo;
-        $parsedUrl = parse_url($this->user['domain']);
-        $domain = $parsedUrl['host'];
-        $url = 'https://www.cmer.site/api/domain/organic?domain='.$domain;
-        try {
-            $data['sem'] = http_get($url)['data'];
-        }catch (\Exception $e){
-            $data['sem'] = [];
-        }
+        $authorityScoreModel = new AuthorityScore();
+        $data['authority_score'] = $authorityScoreModel->list(['project_id'=>$this->user['project_id']],'id',['*'],'desc',10);
         $startTime = date('Y-m-01 00:00:00', strtotime($this->param['date']));
         // 结束时间（当月最后一天）
         $endTime = date('Y-m-t 23:59:59', strtotime($this->param['date']));

@@ -744,9 +744,9 @@ Route::middleware(['bloginauth'])->group(function () {
     Route::prefix('google_link')->group(function () {
         Route::any('/', [\App\Http\Controllers\Bside\GoogleKeyword\GoogleLinkController::class,'getLink'])->name('google_link_getLink');
     });
-    //白帽版本
-    Route::prefix('white_hat_report')->group(function () {
-        Route::any('/whiteHatReportInfo', [\App\Http\Controllers\Bside\BCom\AuthorityScoreController::class,'whiteHatReportInfo'])->name('white_hat_report_whiteHatReportInfo');
+    //白帽版本统计（SEMRUSH得分）
+    Route::prefix('authority_score')->group(function () {
+        Route::any('/AuthorityScoreInfo', [\App\Http\Controllers\Bside\BCom\AuthorityScoreController::class,'AuthorityScoreInfo'])->name('authority_score_AuthorityScoreInfo');
     });
 });
 //无需登录验证的路由组