周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 ef4e351d629b65a1234a6739aadc5e0e9bc9b2b6 1 个父辈 381e2be9

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 8 行增加 和 9 行删除
... ... @@ -80,6 +80,7 @@ class postInquiry extends Command
}
public function visit(ReInquiryDetail $detail, ReInquiryDetailLog $log){
$website = 'https://' . $detail['re_website'] . '/';
if($detail['is_v6']) {
$data = [
'ip' => $detail['ip'],
... ... @@ -88,30 +89,27 @@ class postInquiry extends Command
'referrer_url' => $detail['referrer'],
'user_agent' => $detail['user_agent'],
];
$res = Http::withoutVerifying()->post($detail['re_website'] . 'api/traffic_visit/', $data)->json();
$res = Http::withoutVerifying()->post($website . 'api/traffic_visit/', $data)->json();
if (empty($res['status']) || $res['status'] != 200) {
$log->status = ReInquiryDetailLog::STATUS_FAIL;
$log->remark = $res['message'] ?? '';
$log->save();
Log::channel('inquiry_relay')->error('inquiry_relay visit error', [$res, $detail['re_website'] . 'api/traffic_visit/',$data]);
Log::channel('inquiry_relay')->error('inquiry_relay visit error', [$res, $website . 'api/traffic_visit/',$data]);
return false;
}
}else{
//v4 v5分离项目 往测试链接推
$website = $detail['re_website'];
$client = new \GuzzleHttp\Client();
$site_array = $client->request('GET', "https://www.quanqiusou.cn/extend_api/saas/split.php", [
'proxy' => env('CURL_PROXY'), // 代理服务器地址和端口号
])->getBody()->getContents();
$site_array = json_decode($site_array, true);
$mail_urls = array_column($site_array, 'main_url');
$key = array_search('https://' . $detail['re_website'] . '/', $mail_urls);
$key = array_search($website, $mail_urls);
if ($key !== false) {
// 分离项目 推送到测试链接
$website = $site_array[$key]['test_url'];
}else{
$website = 'https://' . $website . '/';
}
$data = [
... ... @@ -138,6 +136,7 @@ class postInquiry extends Command
}
public function inquiry(ReInquiryDetail $detail, ReInquiryDetailLog $log){
$website = 'https://' . $detail['re_website'] . '/';
// v6
if($detail['is_v6']) {
$data = [
... ... @@ -150,16 +149,16 @@ class postInquiry extends Command
if($detail->email){
$data['email'] = $detail->email;
}else{
$data['__amp_source_origin'] = trim($detail['re_website'], '/');
$data['__amp_source_origin'] = trim($website, '/');
}
$res = Http::withoutVerifying()->withHeaders(['User-Agent' => $detail['user_agent']])->post($detail['re_website'] . 'api/inquiryQd/', $data)->json();
$res = Http::withoutVerifying()->withHeaders(['User-Agent' => $detail['user_agent']])->post($website . 'api/inquiryQd/', $data)->json();
if(empty($res['code']) || $res['code'] != 200){
$log->status = ReInquiryDetailLog::STATUS_FAIL;
$log->remark = $res['message'] ?? '';
$log->save();
Log::channel('inquiry_relay')->error('inquiry_relay v6 inquiry error', [$res, $detail['website'] . 'api/inquiryQd/', $data]);
Log::channel('inquiry_relay')->error('inquiry_relay v6 inquiry error', [$res, $website . 'api/inquiryQd/', $data]);
return false;
}
}else{
... ...