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

@@ -147,7 +147,8 @@ class PostInquiryForward extends Command
                 'ip' => $detail['ip'],
                 'url' => $log['url'],
                 'device_port' => $detail['device_port'],
-                'referrer_url' => $detail['referrer']
+                'referrer_url' => $detail['referrer'],
+                'user_agent' => $detail['user_agent']
             ];
             $url = $website . 'api/traffic_visit/';
             $res = Http::withoutVerifying()->timeout(30)->withHeaders(['User-Agent' => $detail['user_agent']])->post($url, $data)->json();

@@ -197,10 +197,10 @@ class RankDataLogic extends BaseLogic
             $data['current_api_source'] = $api_no ==  10690 ? 'Yandex' : 'Google';
         }
         $data['api_no'] = $api_no;
-        $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
-        if($api_no){
-            $data['bmseo_api_no'] = $api_no;
-        }
+//        $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
+//        if($api_no){
+//            $data['bmseo_api_no'] = $api_no;
+//        }
 
         return $data;
     }
@@ -222,9 +222,12 @@ class RankDataLogic extends BaseLogic
             $api_no = $project['deploy_optimize']['api_no'] ?? 0;
         }
 
-        if(!$api_no){
-            $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
+//        if(!$api_no || Str::endsWith($api_no, '_bmseo')){
+            $bm_api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
+            if($bm_api_no){
+                $api_no = $bm_api_no;
             }
+//        }
 
         $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain_arr = parse_url($domain);

@@ -12,7 +12,8 @@ class AutoPullNotify extends Base
     {
         return [
             1 => '硅谷云服务器',
-            20 => '硅谷建站服务器',
+            20 => '硅谷建站服务器01',
+            25 => '硅谷建站服务器02',
             15 => '硅谷IDC服务器01(6.0美服1)',
             14 => '硅谷IDC服务器02(6.0美服2)',
             21 => '硅谷IDC服务器03(6.0美服3)',