From 9c501dc6cc74e9d194f7862934134f3f98ddab1e Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 28 Apr 2023 09:37:03 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/controllers/information.php b/application/controllers/information.php index 1fb5f01f..d4403269 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -980,6 +980,12 @@ 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); + } + public function make_www_cache_gh($device, $information, $recommand_information) { $data = array(); From dd13a79d68a346bbd480ecce6aed2eae099c3e9b Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 28 Apr 2023 10:09:44 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index d4403269..5708da6b 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 ); @@ -984,6 +984,12 @@ class Information extends CI_Controller { $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) From b15aecdea6ca82f13748218526ffc558ac327444 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 28 Apr 2023 10:11:00 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E6=B7=BB=E5=8A=A0TP=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ch-feedback-list.php | 27 ++++++------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php index 0f479280..9ecd95a8 100644 --- a/application/views/mobile_first/ch-feedback-list.php +++ b/application/views/mobile_first/ch-feedback-list.php @@ -1,27 +1,16 @@ -

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

+
+
Tour Review + + Based on 10,000+ reviews
+
$feedback) {?> From 577789078ed4cdfbf7bb3cffa54a45e6ac10b54f Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 28 Apr 2023 10:11:36 +0800 Subject: [PATCH 04/21] 11 --- application/views/mobile_first/ch-feedback-list.php | 1 - 1 file changed, 1 deletion(-) diff --git a/application/views/mobile_first/ch-feedback-list.php b/application/views/mobile_first/ch-feedback-list.php index 9ecd95a8..8d403591 100644 --- a/application/views/mobile_first/ch-feedback-list.php +++ b/application/views/mobile_first/ch-feedback-list.php @@ -1,6 +1,5 @@
Tour Review - Based on 10,000+ reviews
From 53cdec28f655abd107cb7a7baa4532703b8e4da0 Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 28 Apr 2023 10:22:29 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E5=A2=9E=E5=8A=A0TP=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ch-feedback-newest.php | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) 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) {?> From c2ce27fd6a48f0a55a29fd0c9608d143dfa698cc Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 28 Apr 2023 11:42:58 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20VISA=20FREE=20?= =?UTF-8?q?=E8=A7=84=E5=88=99=EF=BC=9B=E5=A2=9E=E5=8A=A0=20GH=E3=80=81AH?= =?UTF-8?q?=20=E5=8F=8D=E9=A6=88=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 24 ++++++++ .../views/mobile_first/ah-feedback-newest.php | 61 +++++++++++++++++++ .../mobile_first/ch-visa-free-tester.php | 6 +- .../views/mobile_first/gh-feedback-newest.php | 61 +++++++++++++++++++ 4 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 application/views/mobile_first/ah-feedback-newest.php create mode 100644 application/views/mobile_first/gh-feedback-newest.php diff --git a/application/controllers/information.php b/application/controllers/information.php index 5708da6b..1b56f46a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1153,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 { @@ -1420,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/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php new file mode 100644 index 00000000..a8660595 --- /dev/null +++ b/application/views/mobile_first/ah-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 diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php index 3e505bad..2bff472e 100644 --- a/application/views/mobile_first/ch-visa-free-tester.php +++ b/application/views/mobile_first/ch-visa-free-tester.php @@ -1153,15 +1153,19 @@ 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(); + } else { + qualify_72hours.show(); } if (diffInDays < 1 || diffInDays > 7 || indexOf144 == -1) { visa144hours = false; error_72hours.show(); + } else { + qualify_144hours.show(); } validateSuccess = (visa144hours || visa72hours) && qualify2China && thirdCountry; 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 From 46e5ac5aade044cd57dbd517d0044a9203989dee Mon Sep 17 00:00:00 2001 From: Jimmy Liow <18777396951@163.com> Date: Fri, 28 Apr 2023 11:52:54 +0800 Subject: [PATCH 07/21] =?UTF-8?q?VISA=20=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ch-visa-free-tester.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php index 2bff472e..4734b45c 100644 --- a/application/views/mobile_first/ch-visa-free-tester.php +++ b/application/views/mobile_first/ch-visa-free-tester.php @@ -1157,15 +1157,11 @@ ready(el => { if (diffInDays < 1 || diffInDays > 2 || indexOf72 == -1) { visa72hours = false; error_72hours.show(); - } else { - qualify_72hours.show(); } if (diffInDays < 1 || diffInDays > 7 || indexOf144 == -1) { visa144hours = false; error_72hours.show(); - } else { - qualify_144hours.show(); } validateSuccess = (visa144hours || visa72hours) && qualify2China && thirdCountry; @@ -1173,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(); From 6a81dc59f1ecc9f708ae4452c591129b2bff4821 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 14:25:45 +0800 Subject: [PATCH 08/21] fiax --- .../third_party/wwwlog/controllers/index.php | 75 +++++++++++-------- .../wwwlog/models/wwwlogs_model.php | 5 +- 2 files changed, 47 insertions(+), 33 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index b4e8546e..19013fe7 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,7 +48,13 @@ 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'))) { + print_r($item);die(); + $this->orders_view_path_int($item->COLI_SN, $site_code, $item->COLI_SenderIP); + } 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 . '
'; } } @@ -116,38 +127,23 @@ 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) { // 测试数据 - 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'; + // $client_id = '1682234553117123196'; + // $offset = 0; $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__ ASC + "; // 同时使用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 +155,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); @@ -191,4 +206,4 @@ class Index extends CI_Controller logVarDump($ex); } } -} +} \ No newline at end of file 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 From 3286969ab91412cd7c7f03ff97d03c7975bfe6d1 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 14:25:56 +0800 Subject: [PATCH 09/21] fix --- application/third_party/wwwlog/controllers/index.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 19013fe7..809ceadc 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -50,7 +50,6 @@ class Index extends CI_Controller foreach ($orders as $item) { $site_code = strtolower($item->COLI_WebCode); if (in_array($site_code, array('gm', 'gmhw', 'jp', 'jphw', 'ru', 'ruhw', 'it', 'ithw', 'vac', 'vachw', 'vc', 'vchw'))) { - print_r($item);die(); $this->orders_view_path_int($item->COLI_SN, $site_code, $item->COLI_SenderIP); } else { $this->orders_view_path($item->COLI_SN, $site_code, $item->COLI_SenderIP); @@ -206,4 +205,4 @@ class Index extends CI_Controller logVarDump($ex); } } -} \ No newline at end of file +} From 11e36a8ac998093f00323f14ff40d234c932ada6 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 14:34:48 +0800 Subject: [PATCH 10/21] test async --- application/third_party/wwwlog/controllers/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 809ceadc..e4e9bc16 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -56,6 +56,7 @@ class Index extends CI_Controller } echo 'COLI_WebCode:' . $item->COLI_WebCode . ' COLI_ID:' . $item->COLI_ID . ' COLI_SenderIP:' . $item->COLI_SenderIP . '
'; } + echo 'test async'; } // test From 4c16dac52ec846dbc9b389c84a2f23c86d8632b6 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 14:52:43 +0800 Subject: [PATCH 11/21] fix --- application/third_party/wwwlog/controllers/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index e4e9bc16..2abf20f7 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -56,7 +56,7 @@ class Index extends CI_Controller } echo 'COLI_WebCode:' . $item->COLI_WebCode . ' COLI_ID:' . $item->COLI_ID . ' COLI_SenderIP:' . $item->COLI_SenderIP . '
'; } - echo 'test async'; + echo 'test async v2'; } // test @@ -133,7 +133,7 @@ class Index extends CI_Controller // $COLI_SN = 1004250; // $sitecode = 'gmhw'; // $ip = '2a00:6020:41c7:3900:20c1:3c5c:c854:7095'; - // $client_id = '1682234553117123196'; + $client_id = 'test-clientid-xxoo'; // $offset = 0; $query_string = " From 2598455890390c0c47b5f3e76c646af329bfb176 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 14:58:58 +0800 Subject: [PATCH 12/21] fix --- application/third_party/wwwlog/controllers/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 2abf20f7..29ded2ff 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -50,13 +50,13 @@ class Index extends CI_Controller foreach ($orders as $item) { $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); + // $this->orders_view_path_int($item->COLI_SN, $site_code, $item->COLI_SenderIP); } 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 v2'; + echo 'test async v3'; } // test From 86f4bf1ca0849cd52fb6bc3ce15a5d55cc0d7ee6 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:09:49 +0800 Subject: [PATCH 13/21] fix client id --- .../third_party/wwwlog/controllers/index.php | 41 +++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 29ded2ff..9bc3164f 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -50,7 +50,7 @@ class Index extends CI_Controller foreach ($orders as $item) { $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); + $this->orders_view_path_int($item->COLI_SN, $site_code, $item->COLI_SenderIP, $item->COLI_OrderDetailText); } else { $this->orders_view_path($item->COLI_SN, $site_code, $item->COLI_SenderIP); } @@ -127,14 +127,41 @@ 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 = 'gmhw'; - // $ip = '2a00:6020:41c7:3900:20c1:3c5c:c854:7095'; - $client_id = 'test-clientid-xxoo'; - // $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的正则表达式 + $pattern = "/YandexId->(.+?)<-YandexId/"; + // 检查文本是否匹配正则表达式 + if (preg_match($pattern, $order_text, $matches)) { + $client_id = trim($matches[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 From 2dd7b11676710808681ad4d421edca241becb171 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:10:22 +0800 Subject: [PATCH 14/21] add v4 --- application/third_party/wwwlog/controllers/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 9bc3164f..e52914b8 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -56,7 +56,7 @@ class Index extends CI_Controller } echo 'COLI_WebCode:' . $item->COLI_WebCode . ' COLI_ID:' . $item->COLI_ID . ' COLI_SenderIP:' . $item->COLI_SenderIP . '
'; } - echo 'test async v3'; + echo 'test async v4'; } // test From 0a5ff484372cbd24928c1c2dc2efa50ebb71ac25 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:19:20 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/wwwlog/controllers/index.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index e52914b8..cd44f278 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -56,7 +56,7 @@ class Index extends CI_Controller } echo 'COLI_WebCode:' . $item->COLI_WebCode . ' COLI_ID:' . $item->COLI_ID . ' COLI_SenderIP:' . $item->COLI_SenderIP . '
'; } - echo 'test async v4'; + echo 'test async v5'; } // test @@ -154,12 +154,17 @@ class Index extends CI_Controller //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的正则表达式 - $pattern = "/YandexId->(.+?)<-YandexId/"; + $yarndexPat = "/YandexId->(.+?)<-YandexId/"; // 检查文本是否匹配正则表达式 - if (preg_match($pattern, $order_text, $matches)) { - $client_id = trim($matches[1]); + if (preg_match($yarndexPat, $order_text, $yandexMatches)) { + $client_id = trim($yandexMatches[1]); } else { - $client_id = "-- Match not found --"; + $gaPat = "/Gaid->(.+?)<-Gaid/"; + if (preg_match($yarndexPat, $order_text, $gaMatches)) { + $client_id = trim($gaMatches[1]); + } else { + $client_id = "-- Match not found --"; + } } // echo $client_id; From eabdcfaf40a885e56c74f8841fa808ae88da9b46 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:22:26 +0800 Subject: [PATCH 16/21] fix ga client id --- application/third_party/wwwlog/controllers/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index cd44f278..28c5ceea 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -56,7 +56,7 @@ class Index extends CI_Controller } echo 'COLI_WebCode:' . $item->COLI_WebCode . ' COLI_ID:' . $item->COLI_ID . ' COLI_SenderIP:' . $item->COLI_SenderIP . '
'; } - echo 'test async v5'; + echo 'test async v6'; } // test @@ -160,7 +160,7 @@ class Index extends CI_Controller $client_id = trim($yandexMatches[1]); } else { $gaPat = "/Gaid->(.+?)<-Gaid/"; - if (preg_match($yarndexPat, $order_text, $gaMatches)) { + if (preg_match($gaPat, $order_text, $gaMatches)) { $client_id = trim($gaMatches[1]); } else { $client_id = "-- Match not found --"; From 5f2a99d3e6ef2a794e7bfdbfb50a328ffb10db4c Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:23:40 +0800 Subject: [PATCH 17/21] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=EF=BC=8C+2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/wwwlog/controllers/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 28c5ceea..a327bcfd 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -56,7 +56,7 @@ class Index extends CI_Controller } echo 'COLI_WebCode:' . $item->COLI_WebCode . ' COLI_ID:' . $item->COLI_ID . ' COLI_SenderIP:' . $item->COLI_SenderIP . '
'; } - echo 'test async v6'; + // echo 'test async v6'; } // test From 03942dd4aedc4386afbe49510b2af9be0597cc1b Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:47:09 +0800 Subject: [PATCH 18/21] fix --- application/third_party/wwwlog/controllers/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index a327bcfd..a29ede3f 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -50,7 +50,7 @@ class Index extends CI_Controller foreach ($orders as $item) { $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, $item->COLI_OrderDetailText); + $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); } From 0fb39e30fd40019ddaccf953ee65422e46c314ec Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:56:38 +0800 Subject: [PATCH 19/21] fix --- application/third_party/wwwlog/controllers/index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index a29ede3f..01cd0d6c 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -175,7 +175,7 @@ class Index extends CI_Controller and (remote_addr='$ip' OR http_x_forwarded_for like '%$ip%' OR request_uri like '%$client_id%') ORDER BY __time__ ASC "; // 同时使用IP和用户ID - $from = time() - 604800 * 4; //往前 604800(7天), 1296000(15天) + $from = time() - 1296000; //往前 604800(7天), 1296000(15天) $to = time(); $request = new Aliyun_Log_Models_GetLogsRequest('globalhoghlights', $this->logstore[$sitecode], $from, $to, '', $query_string, 100, $offset, true); try { From 83926c229ba2577e08eb58381b71889be834594c Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 28 Apr 2023 15:57:16 +0800 Subject: [PATCH 20/21] fix --- application/third_party/wwwlog/controllers/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/third_party/wwwlog/controllers/index.php b/application/third_party/wwwlog/controllers/index.php index 01cd0d6c..da362b6d 100644 --- a/application/third_party/wwwlog/controllers/index.php +++ b/application/third_party/wwwlog/controllers/index.php @@ -173,9 +173,9 @@ class Index extends CI_Controller remote_addr,request_method,request_time,status,body_bytes_sent,upstream_response_time from log where 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__ ASC + ORDER BY __time__ DESC "; // 同时使用IP和用户ID - $from = time() - 1296000; //往前 604800(7天), 1296000(15天) + $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 { From acba252ccce57c823362779fb72b94c13e5eb4aa Mon Sep 17 00:00:00 2001 From: candice Date: Fri, 28 Apr 2023 16:35:02 +0800 Subject: [PATCH 21/21] =?UTF-8?q?TA=E5=9B=BE=E6=A0=87=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/mobile_first/ah-feedback-newest.php | 34 ++++--------------- 1 file changed, 7 insertions(+), 27 deletions(-) diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php index a8660595..87a75b1f 100644 --- a/application/views/mobile_first/ah-feedback-newest.php +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -1,16 +1,8 @@ -
- - Rated 4.9 out of 5 | - Excellent -
- Based on 10,000+ reviews - -
+
+
Tour Review + Based on 10,000+ reviews
+

Tour Review @@ -20,21 +12,9 @@ -

+ $feedback) {?>