diff --git a/application/controllers/information.php b/application/controllers/information.php index 1fb5f01f..1b56f46a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -660,7 +660,7 @@ class Information extends CI_Controller true ); $information->ic_content = str_replace( - '', + '', $feedback_newest_content, $information->ic_content ); @@ -980,6 +980,18 @@ class Information extends CI_Controller file_put_contents($html_path, $template, LOCK_EX); } + public function test_feedback() + { + $feedback_newest = $this->Feedback_model->get_feedback_newest(); + var_dump($feedback_newest); + + $feedback_newest_content = $this->load->view( + 'ch-feedback-newest', + array('feedback_list' => $feedback_newest), + true); + var_dump($feedback_newest_content); + } + public function make_www_cache_gh($device, $information, $recommand_information) { $data = array(); @@ -1141,6 +1153,18 @@ class Information extends CI_Controller $information->ic_content = str_replace('', $tour_form_content, $information->ic_content); } + $feedback_newest = $this->Feedback_model->get_feedback_newest(); + $feedback_newest_content = $this->load->view( + $template_path . '-feedback-newest', + array('feedback_list' => $feedback_newest), + true + ); + $information->ic_content = str_replace( + '', + $feedback_newest_content, + $information->ic_content + ); + if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')); } else { @@ -1408,6 +1432,18 @@ class Information extends CI_Controller } } + $feedback_newest = $this->Feedback_model->get_feedback_newest(); + $feedback_newest_content = $this->load->view( + $template_path . '-feedback-newest', + array('feedback_list' => $feedback_newest), + true + ); + $information->ic_content = str_replace( + '', + $feedback_newest_content, + $information->ic_content + ); + //主样式表，内联模式 if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')); diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index b4e8546e..da362b6d 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -21,10 +21,15 @@ class Index extends CI_Controller , 'gl' => 'guilinchina' , 'sht' => 'shanghaihighlights' , 'gm' => 'chinarundreisen' + , 'gmhw' => 'chinarundreisen' , 'jp' => 'arachina' + , 'jphw' => 'arachina' , 'ru' => 'chinahighlights_ru' + , 'ruhw' => 'chinahighlights_ru' , 'it' => 'viaggio-in-cina' + , 'ithw' => 'viaggio-in-cina' , 'vac' => 'viaje-a-china' + , 'vachw' => 'viaje-a-china' , 'vc' => 'voyageschine' , 'vchw' => 'voyageschine', ); //站点日志存储库，每个网站对应一个 @@ -43,9 +48,15 @@ class Index extends CI_Controller $orders = $this->wwwlogs_model->get_update_list(10); if ($orders) { foreach ($orders as $item) { - $this->orders_view_path($item->COLI_SN, strtolower($item->COLI_WebCode), $item->COLI_SenderIP); + $site_code = strtolower($item->COLI_WebCode); + if (in_array($site_code, array('gm', 'gmhw', 'jp', 'jphw', 'ru', 'ruhw', 'it', 'ithw', 'vac', 'vachw', 'vc', 'vchw'))) { + $this->orders_view_path_int($item->COLI_SN, $site_code, $item->COLI_SenderIP, 0, $item->COLI_OrderDetailText); + } else { + $this->orders_view_path($item->COLI_SN, $site_code, $item->COLI_SenderIP); + } echo 'COLI_WebCode:' . $item->COLI_WebCode . ' COLI_ID:' . $item->COLI_ID . ' COLI_SenderIP:' . $item->COLI_SenderIP . '
'; } + // echo 'test async v6'; } // test @@ -116,38 +127,55 @@ class Index extends CI_Controller } //定时抓取订单日志 - 国际站 - public function orders_view_path_int( /*$COLI_SN, $sitecode = 'cht', $ip, $offset = 0*/) + public function orders_view_path_int($COLI_SN, $sitecode = 'cht', $ip, $offset = 0, $order_text) { // 测试数据 - 2 - $COLI_SN = 1004250; - $sitecode = 'vchw'; - $ip = '2a01:cb1c:8190:df00:dc11:12fb:3ed1:1bcb'; - $offset = 0; + //$COLI_SN = 1004250; + //$sitecode = 'gmhw'; + //$ip = '2a00:6020:41c7:3900:20c1:3c5c:c854:7095'; + //$offset = 0; + //$order_text = 'Gaid-> GA1.2.1747854879.1682254516 <-Gaid + //YandexId-> 1682254516819066352 <-YandexId + //clino :g-de-in-2 + //startdate :2023-08-06 + //adultnum :4 + //Reiseroute Klasse :4 sterne hotel + //tourname :Rundreisen Nordindien 3 Wochen + //tages :21 + //Reiseroutennummer :14083 + //Geschlecht : + //Name :Firestone + //nationality :?sterreich + //E-Mail :AnaAnaki@hotmail.com + //Telefon :+4369918253609 + //来源页面 :https://www.chinarundreisen.com/indien/top-indien-reiseziele/ + // + //from:android + //Mozilla/5.0 (Linux; Android 9; SM-G950F) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Mobile Safari/537.36 X-Middleton/1'; + + // 匹配clientId的正则表达式 + $yarndexPat = "/YandexId->(.+?)<-YandexId/"; + // 检查文本是否匹配正则表达式 + if (preg_match($yarndexPat, $order_text, $yandexMatches)) { + $client_id = trim($yandexMatches[1]); + } else { + $gaPat = "/Gaid->(.+?)<-Gaid/"; + if (preg_match($gaPat, $order_text, $gaMatches)) { + $client_id = trim($gaMatches[1]); + } else { + $client_id = "-- Match not found --"; + } + } + // echo $client_id; $query_string = " * | select time_local,http_referer,request_uri,http_user_agent,http_x_forwarded_for remote_addr,request_method,request_time,status,body_bytes_sent,upstream_response_time from log where - request_uri NOT like '%.jpg' - and request_uri NOT like '%.JPG' - and request_uri NOT like '%.png' - and request_uri NOT like '%.gif' - and request_uri NOT like '%.css' - and request_uri NOT like '%.webp' - and request_uri NOT like '%.js' - and request_uri NOT like '%.woff' - and request_uri NOT like '%.ttf' - and request_uri NOT like '%.eot' - and request_uri NOT like '%.ico' - and request_uri NOT like '/guide-use.php%' - and request_uri NOT like '/index.php%' - and request_uri NOT like '/secureforms/form_token' - and request_uri NOT like '/ip/' - and request_uri NOT like '/ajax/getads/' - and request_uri NOT like '/public/template/footer.html' - and request_uri NOT like '/public/%' - and (remote_addr='$ip' OR http_x_forwarded_for like '%$ip%') - "; //ORDER BY time_local ASC 时间精度不够，会导致相同排序错误，只能用系统默认排序 - $from = time() - 604800; //往前 604800(7天), 1296000(15天) + request_uri like '/io/?event=pageview%' + and (remote_addr='$ip' OR http_x_forwarded_for like '%$ip%' OR request_uri like '%$client_id%') + ORDER BY __time__ DESC + "; // 同时使用IP和用户ID + $from = time() - 604800 * 4; //往前 604800(7天), 1296000(15天) $to = time(); $request = new Aliyun_Log_Models_GetLogsRequest('globalhoghlights', $this->logstore[$sitecode], $from, $to, '', $query_string, 100, $offset, true); try { @@ -159,8 +187,27 @@ class Index extends CI_Controller foreach ($log->getContents() as $key => $value) { $LogData->$key = $value; } - // $this->wwwlogs_model->add('wwwlogs', $LogData); - print_r($LogData); + + // 调整数据: http_referer -> request_uri, request_uri.ref -> http_referer + if (isset($LogData->http_referer) && isset($LogData->request_uri)) { + $request_uri = $LogData->request_uri; + $http_referer = $LogData->http_referer; + + // http_referer -> request_uri + $LogData->request_uri = $LogData->http_referer; + // request_uri.ref -> http_referer + $query_string_tmp = urldecode($request_uri); + parse_str($query_string_tmp, $params); + if (isset($params['ref'])) { + $LogData->http_referer = $params['ref']; + } else { + $LogData->http_referer = '(not set)'; + } + + } + + // print_r($LogData); + $this->wwwlogs_model->add('wwwlogs', $LogData); } } catch (Aliyun_Log_Exception $ex) { print_r($ex); diff --git a/application/third_party/wwwlog/models/wwwlogs_model.php b/application/third_party/wwwlog/models/wwwlogs_model.php index 5d3fbd5c..1a869af6 100644 --- a/application/third_party/wwwlog/models/wwwlogs_model.php +++ b/application/third_party/wwwlog/models/wwwlogs_model.php @@ -60,11 +60,10 @@ class wwwlogs_model extends CI_Model public function get_list() { $this->topnum ? $sql = "SELECT TOP " . $this->topnum : $sql = "SELECT "; - // 国际暂时不需要从这个里获取 - lmr - 移除 'gm','jp','ru','it','vac','vc' $sql .= " COLI_SN,COLI_ID, COLI_WebCode,COLI_Name, COLI_OrderDetailText, COLI_OrderStartDate,COLI_SenderIP,COLI_WebCode,COLI_ApplyDate from ConfirmLineInfo where 1=1 - and COLI_WebCode in ('cht','ah','gh','ct','yz','sht','gl') + and COLI_WebCode in ('cht','ah','gh','ct','yz','sht','gl','gm','jp','ru','it','vac','vc','gmhw','jphw','ruhw','ithw','vachw','vchw') and not exists (select top 1 1 from InfoManager.dbo.wwwlogs where wl_COLI_SN=COLI_SN ) and COLI_SenderIP is not null and DeleteFlag=0 @@ -86,4 +85,4 @@ class wwwlogs_model extends CI_Model } } -} +} \ No newline at end of file diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php new file mode 100644 index 00000000..87a75b1f --- /dev/null +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -0,0 +1,41 @@ + +
+
Tour Review + Based on 10,000+ reviews
+
+

+ Tour Review +

+
+ + + + + $feedback) {?> + + + + +
+
+ +
+ , + +
+
+
+
\ No newline at end of file diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php index 0f479280..8d403591 100644 --- a/application/views/mobile_first/ch-feedback-list.php +++ b/application/views/mobile_first/ch-feedback-list.php @@ -1,27 +1,15 @@ -

- - Tour Review - Based on 10,000+ reviews -

+
+
Tour Review + Based on 10,000+ reviews
+
$feedback) {?> diff --git a/application/views/mobile_first/ch-feedback-newest.php b/application/views/mobile_first/ch-feedback-newest.php index 0f479280..8d403591 100644 --- a/application/views/mobile_first/ch-feedback-newest.php +++ b/application/views/mobile_first/ch-feedback-newest.php @@ -1,27 +1,15 @@ -

- - Tour Review - Based on 10,000+ reviews -

+
+
Tour Review + Based on 10,000+ reviews
+
$feedback) {?> diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php index 3e505bad..4734b45c 100644 --- a/application/views/mobile_first/ch-visa-free-tester.php +++ b/application/views/mobile_first/ch-visa-free-tester.php @@ -1153,7 +1153,7 @@ ready(el => { const selectedOption = airportOrRailwayStation.options[airportOrRailwayStation.selectedIndex]; const indexOf72 = selectedOption.getAttribute('data-hour').indexOf('72'); const indexOf144 = selectedOption.getAttribute('data-hour').indexOf('144'); - + if (diffInDays < 1 || diffInDays > 2 || indexOf72 == -1) { visa72hours = false; error_72hours.show(); @@ -1169,6 +1169,14 @@ ready(el => { if (validateSuccess) { tip_box.show(); reason_box.hide(); + + if (visa72hours) { + qualify_72hours.show(); + } + + if (visa144hours) { + qualify_144hours.show(); + } } else { tip_box.hide(); qualify_no.show(); diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php new file mode 100644 index 00000000..a8660595 --- /dev/null +++ b/application/views/mobile_first/gh-feedback-newest.php @@ -0,0 +1,61 @@ + +
+ + Rated 4.9 out of 5 | + Excellent +
+ Based on 10,000+ reviews + +
+

+ Tour Review +

+
+
+ + + + $feedback) {?> + + + + +
+
+ +
+ , + +
+
+
+
\ No newline at end of file