周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 6e7a948e1c351736c3846f66fca7211377e6fa6f 2 个父辈 a67d5d98 83823697

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 14 行增加 和 9 行删除
@@ -147,7 +147,8 @@ class PostInquiryForward extends Command @@ -147,7 +147,8 @@ class PostInquiryForward extends Command
147 'ip' => $detail['ip'], 147 'ip' => $detail['ip'],
148 'url' => $log['url'], 148 'url' => $log['url'],
149 'device_port' => $detail['device_port'], 149 'device_port' => $detail['device_port'],
150 - 'referrer_url' => $detail['referrer'] 150 + 'referrer_url' => $detail['referrer'],
  151 + 'user_agent' => $detail['user_agent']
151 ]; 152 ];
152 $url = $website . 'api/traffic_visit/'; 153 $url = $website . 'api/traffic_visit/';
153 $res = Http::withoutVerifying()->timeout(30)->withHeaders(['User-Agent' => $detail['user_agent']])->post($url, $data)->json(); 154 $res = Http::withoutVerifying()->timeout(30)->withHeaders(['User-Agent' => $detail['user_agent']])->post($url, $data)->json();
@@ -197,10 +197,10 @@ class RankDataLogic extends BaseLogic @@ -197,10 +197,10 @@ class RankDataLogic extends BaseLogic
197 $data['current_api_source'] = $api_no == 10690 ? 'Yandex' : 'Google'; 197 $data['current_api_source'] = $api_no == 10690 ? 'Yandex' : 'Google';
198 } 198 }
199 $data['api_no'] = $api_no; 199 $data['api_no'] = $api_no;
200 - $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');  
201 - if($api_no){  
202 - $data['bmseo_api_no'] = $api_no;  
203 - } 200 +// $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
  201 +// if($api_no){
  202 +// $data['bmseo_api_no'] = $api_no;
  203 +// }
204 204
205 return $data; 205 return $data;
206 } 206 }
@@ -222,9 +222,12 @@ class RankDataLogic extends BaseLogic @@ -222,9 +222,12 @@ class RankDataLogic extends BaseLogic
222 $api_no = $project['deploy_optimize']['api_no'] ?? 0; 222 $api_no = $project['deploy_optimize']['api_no'] ?? 0;
223 } 223 }
224 224
225 - if(!$api_no){  
226 - $api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');  
227 - } 225 +// if(!$api_no || Str::endsWith($api_no, '_bmseo')){
  226 + $bm_api_no = RankDataBmseo::where('project_id', $project_id)->value('api_no');
  227 + if($bm_api_no){
  228 + $api_no = $bm_api_no;
  229 + }
  230 +// }
228 231
229 $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ''); 232 $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
230 $domain_arr = parse_url($domain); 233 $domain_arr = parse_url($domain);
@@ -12,7 +12,8 @@ class AutoPullNotify extends Base @@ -12,7 +12,8 @@ class AutoPullNotify extends Base
12 { 12 {
13 return [ 13 return [
14 1 => '硅谷云服务器', 14 1 => '硅谷云服务器',
15 - 20 => '硅谷建站服务器', 15 + 20 => '硅谷建站服务器01',
  16 + 25 => '硅谷建站服务器02',
16 15 => '硅谷IDC服务器01(6.0美服1)', 17 15 => '硅谷IDC服务器01(6.0美服1)',
17 14 => '硅谷IDC服务器02(6.0美服2)', 18 14 => '硅谷IDC服务器02(6.0美服2)',
18 21 => '硅谷IDC服务器03(6.0美服3)', 19 21 => '硅谷IDC服务器03(6.0美服3)',