Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -3,10 +3,12 @@
 namespace App\Console\Commands\RankData;
 namespace App\Console\Commands\RankData;
 
 
 
 
+use App\Helper\QuanqiusouApi;
 use App\Http\Logic\Bside\RankData\RankDataLogic;
 use App\Http\Logic\Bside\RankData\RankDataLogic;
 use App\Models\RankData\RankDataLog as RankDataLogModel;
 use App\Models\RankData\RankDataLog as RankDataLogModel;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Log;
 
 
 /**
 /**

@@ -338,7 +338,7 @@ class UpdateSeoTdk extends Command
 
 
                         //AI生成
                         //AI生成
                         if (!empty($ai_commands[$ai_key]['ai'])) {
                         if (!empty($ai_commands[$ai_key]['ai'])) {
-                            $prompt = $this->getPrompt($project_id, $ai_commands[$ai_key]['ai'], $table, $v);
+                            $prompt = $this->getPrompt($project_id, $ai_commands[$ai_key]['ai'], $table, $v, $field);
                             if(!$prompt){
                             if(!$prompt){
                                 continue;
                                 continue;
                             }
                             }
@@ -465,7 +465,7 @@ class UpdateSeoTdk extends Command
         $notify_master && $this->sendNotify($project_id, 2); //通知主站按需更新
         $notify_master && $this->sendNotify($project_id, 2); //通知主站按需更新
     }
     }
 
 
-    public function getPrompt($project_id, $prompt, $table, $data){
+    public function getPrompt($project_id, $prompt, $table, $data, $field){
         // topic
         // topic
         if(strpos($prompt, '{topic}') !== false){
         if(strpos($prompt, '{topic}') !== false){
             $topic = $data[$this->topic_fields[$table]] ?? '';
             $topic = $data[$this->topic_fields[$table]] ?? '';
@@ -507,7 +507,7 @@ class UpdateSeoTdk extends Command
         }
         }
 
 
         $project = Project::find($project_id);
         $project = Project::find($project_id);
-        if (!in_array(8, explode(',', $project->deploy_optimize->special))) {
+        if (!in_array(8, explode(',', $project->deploy_optimize->special)) && $field == 'seo_title') {
             // 前缀关键词
             // 前缀关键词
             if (preg_match_all("/\{qz_(\d+)\}/", $prompt, $matches)) {
             if (preg_match_all("/\{qz_(\d+)\}/", $prompt, $matches)) {
                 foreach ($matches[0] as $key => $val) {
                 foreach ($matches[0] as $key => $val) {

@@ -196,9 +196,9 @@ class RankDataLogic extends BaseLogic
             $data['current_api_source'] = $api_no ==  10690 ? 'Yandex' : 'Google';
             $data['current_api_source'] = $api_no ==  10690 ? 'Yandex' : 'Google';
         }
         }
         $data['api_no'] = $api_no;
         $data['api_no'] = $api_no;
-        $bmseo_id = RankDataBmseo::where('project_id', $project_id)->value('id');
-        if($bmseo_id){
-            $data['bmseo_api_no'] = $bmseo_id . '_bmseo';
+        $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
+        if($api_no){
+            $data['bmseo_api_no'] = $api_no;
         }
         }
 
 
         return $data;
         return $data;
@@ -221,6 +221,10 @@ class RankDataLogic extends BaseLogic
             $api_no = $project['deploy_optimize']['api_no'] ?? 0;
             $api_no = $project['deploy_optimize']['api_no'] ?? 0;
         }
         }
 
 
+        if(!$api_no){
+            $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
+        }
+
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain_arr = parse_url($domain);
         $domain_arr = parse_url($domain);
         $domain = $domain_arr['host'] ?? $domain_arr['path'];
         $domain = $domain_arr['host'] ?? $domain_arr['path'];

@@ -36,7 +36,7 @@ class InquiryRelateDomain extends Base
             $page = 1;
             $page = 1;
             while (true) {
             while (true) {
                 try {
                 try {
-                    $res = HttpUtils::get('https://www.cmer.site/api/globalso_site', ['pagesite' => 100, 'page' => $page]);
+                    $res = HttpUtils::get('https://www.cmer.site/api/globalso_site', ['pagesize' => 100, 'page' => $page]);
                     if($res) {
                     if($res) {
                         $res = Arr::s2a($res);
                         $res = Arr::s2a($res);
                         $arr = [];
                         $arr = [];

@@ -47,18 +47,18 @@ class SyncSubmitTaskService
         $data = $task['data'];
         $data = $task['data'];
 
 
         //有关联域名 替换原数据url
         //有关联域名 替换原数据url
-        if($relate_domain){
-            $domain = $data['domain'];
-            foreach ($data as $k=>&$item){
-                if($k == 'data'){
-                    foreach ($item as &$v){
-                        $v = str_replace($domain, $relate_domain, $v);
-                    }
-                }else{
-                    $item = str_replace($domain, $relate_domain, $item);
-                }
-            }
-        }
+//        if($relate_domain){
+//            $domain = $data['domain'];
+//            foreach ($data as $k=>&$item){
+//                if($k == 'data'){
+//                    foreach ($item as &$v){
+//                        $v = str_replace($domain, $relate_domain, $v);
+//                    }
+//                }else{
+//                    $item = str_replace($domain, $relate_domain, $item);
+//                }
+//            }
+//        }
 
 
         $checkIpCountry = self::checkIpCountry($data['domain'], $data['ip'], $task['type']);
         $checkIpCountry = self::checkIpCountry($data['domain'], $data['ip'], $task['type']);