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

@@ -45,7 +45,8 @@ class RemainDay extends Command
         2250,
         2250,
         2193,
         2193,
         2399,
         2399,
-        1685
+        1685,
+        3309
     ];//需要单独处理的项目
     ];//需要单独处理的项目
     /**
     /**
      * The console command description.
      * The console command description.

@@ -9,6 +9,7 @@
 
 
 namespace App\Console\Commands\Geo;
 namespace App\Console\Commands\Geo;
 
 
+use App\Helper\Translate;
 use App\Models\Geo\GeoPlatform;
 use App\Models\Geo\GeoPlatform;
 use App\Models\Geo\GeoQuestion;
 use App\Models\Geo\GeoQuestion;
 use App\Models\Geo\GeoQuestionLog;
 use App\Models\Geo\GeoQuestionLog;
@@ -75,6 +76,7 @@ class GeoQuestionRes extends Command
             $geoResultModel = new GeoQuestionResult();
             $geoResultModel = new GeoQuestionResult();
             $geoLogModel = new GeoQuestionLog();
             $geoLogModel = new GeoQuestionLog();
             foreach ($taskInfo['question'] as $question) {
             foreach ($taskInfo['question'] as $question) {
+                $en_question = Translate::tran($question, 'zh') ?? '';
                 foreach ($platformsArr as $platform) {
                 foreach ($platformsArr as $platform) {
                     $data = $hit_data = [];
                     $data = $hit_data = [];
                     $error_num = 0;
                     $error_num = 0;
@@ -83,7 +85,7 @@ class GeoQuestionRes extends Command
                     $error_num++;
                     $error_num++;
                     try {
                     try {
                         echo '执行次数：'.$error_num.PHP_EOL;
                         echo '执行次数：'.$error_num.PHP_EOL;
-                        if ($error_num >= 5) {
+                        if ($error_num >= 3) {
                             continue;
                             continue;
                         }
                         }
                         echo '执行平台：'.$platform.PHP_EOL;
                         echo '执行平台：'.$platform.PHP_EOL;
@@ -132,6 +134,7 @@ class GeoQuestionRes extends Command
                         'type' => $taskInfo['type'] ?? $geoQuestionModel::TYPE_BRAND,
                         'type' => $taskInfo['type'] ?? $geoQuestionModel::TYPE_BRAND,
                         'platform' => $platform,
                         'platform' => $platform,
                         'question' => $question,
                         'question' => $question,
+                        'en_question'=> $en_question,
                         'keywords' => json_encode($hit_keyword,true),//命中的关键词
                         'keywords' => json_encode($hit_keyword,true),//命中的关键词
                         'url' => json_encode($hit_url,true),//命中的网址
                         'url' => json_encode($hit_url,true),//命中的网址
                         'text' => json_encode($result,true),
                         'text' => json_encode($result,true),

@@ -9,6 +9,7 @@
 
 
 namespace App\Console\Commands\Sync;
 namespace App\Console\Commands\Sync;
 
 
+use App\Models\Manage\Manage;
 use App\Models\Manage\Mobile;
 use App\Models\Manage\Mobile;
 use App\Models\User\User;
 use App\Models\User\User;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
@@ -60,7 +61,7 @@ class SyncMobile extends Command
                 ];
                 ];
                 $mobileModel->insert($param);
                 $mobileModel->insert($param);
                 //查看当前用户是否存在
                 //查看当前用户是否存在
-                $info = $userModel->read(['mobile'=>$mobile,'project_id'=>1]);
+                $info = $userModel->read(['mobile'=>$mobile,'project_id'=>1],['id']);
                 if($info === false){
                 if($info === false){
                     $data = [
                     $data = [
                         'mobile'=>$mobile,
                         'mobile'=>$mobile,
@@ -73,6 +74,9 @@ class SyncMobile extends Command
                 }
                 }
             }
             }
             $data[] = '13083988828';
             $data[] = '13083988828';
+            $managerModel = new Manage();
+            $mobileArr = $managerModel->selectField(['status'=>1],'mobile');
+            $data = array_values(array_unique(array_merge($data,$mobileArr)));
             $userModel->edit(['status'=>1],['project_id'=>1,'mobile'=>['not in',$data]]);
             $userModel->edit(['status'=>1],['project_id'=>1,'mobile'=>['not in',$data]]);
             $userModel->edit(['status'=>0],['project_id'=>1,'mobile'=>['in',$data]]);
             $userModel->edit(['status'=>0],['project_id'=>1,'mobile'=>['in',$data]]);
         }
         }

@@ -43,7 +43,7 @@ class GeoQuestionResLogic extends BaseLogic
      * @time   :2025/7/4 9:48
      * @time   :2025/7/4 9:48
      */
      */
     public function getResultList($map = [],$page = 1,$row = 20){
     public function getResultList($map = [],$page = 1,$row = 20){
-        $filed = ['id','project_id','question_id','platform','question','keywords','url','created_at','updated_at'];
+        $filed = ['id','project_id','question_id','platform','question','en_question','keywords','url','created_at','updated_at'];
         $query = $this->model->formatQuery($map);
         $query = $this->model->formatQuery($map);
         $query = $query->where(function ($q) {
         $query = $query->where(function ($q) {
             $q->whereRaw('JSON_LENGTH(keywords) > 0')
             $q->whereRaw('JSON_LENGTH(keywords) > 0')

@@ -554,7 +554,7 @@ class RankDataLogic extends BaseLogic
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $without_extension_project_ids = [658]; //是否达标只统计主词的
         $extension_project_ids = [354]; //扩展词也到达标的
         $extension_project_ids = [354]; //扩展词也到达标的
         $compliance_project_ids = [2163,257,823,1750,497]; //直接达标处理的
         $compliance_project_ids = [2163,257,823,1750,497]; //直接达标处理的
-        $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685];//暂停的项目
+        $ceaseProjectId = [354, 378, 649, 1226, 1283, 1703, 1893, 2066, 2250,2193,2399,1685,3309];//暂停的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         $uptimeProjectId = [1434,1812,276,2414,2974];//按上线时间统计的项目
         //一个项目多个api_no
         //一个项目多个api_no
         $multiple_api_no_project_ids = [
         $multiple_api_no_project_ids = [

@@ -138,7 +138,8 @@ class Project extends Base
     public static function seoMap()
     public static function seoMap()
     {
     {
         return [
         return [
-            1 => '白帽SEO方案'
+            1 => 'GEO标准版',
+            2 => 'GEO商务版'
         ];
         ];
     }
     }
     /**
     /**