From 86bf3e3667a77d616db9259a3d21227d7e03e61d Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 20 Jun 2025 14:27:11 +0800 Subject: [PATCH 1/9] d --- application/views/cache/update.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/cache/update.php b/application/views/cache/update.php index 3cd8e9a4..db78210f 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -63,7 +63,7 @@ $(function () { //更新静态页，异步请求队列(setp_set个) - var setp_set = 5; + var setp_set = 4; $('#update').on('click', function () { var $data = $('.data'); for (var i = 0; i < setp_set; i++) { @@ -110,7 +110,7 @@ var num_zero = 1; function count_num(num) { - $('#count_num').html('已更新' + num + '个页面 进度' + (Math.ceil(num * 100 / )) + '% ').show(); + $('#count_num').html('已更新' + num + '个页面 进度' + (Math.ceil(num * 100 / )) + '% ').show(); num_zero++; } }); From a5047812685d6d7fd9c65a64a38b9be6966b902f Mon Sep 17 00:00:00 2001 From: Ycc Date: Mon, 23 Jun 2025 14:43:18 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0HTravel=E7=AB=99=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 3 +++ application/helpers/info_helper.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index e3b658eb..e34d218f 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -395,6 +395,7 @@ $config['site'] = [ 'ch' => ['site_code' => 'ch', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => ['TDJ', 'ycc'], 'site_user' => ',ycc,'], 'ah' => ['site_code' => 'ah', 'site_id' => 141, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.asiahighlights.com', 'site_url' => 'https://www.asiahighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'jh' => ['site_code' => 'jh', 'site_id' => 186, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.japanhighlights.com', 'site_url' => 'https://www.japanhighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], + 'HTravel' => ['site_code' => 'htravel', 'site_id' => 187, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.highlightstravel.com', 'site_url' => 'https://www.highlightstravel.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'gh' => ['site_code' => 'gh', 'site_id' => 163, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.globalhighlights.com', 'site_url' => 'https://www.globalhighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'gm' => ['site_code' => 'gm', 'site_id' => 22, 'site_lgc' => '4', 'site_url' => 'https://www.chinarundreisen.com', 'site_image_url' => '//bilder.chinarundreisen.com', 'site_authors' => ['DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'], 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'], 'gh_gm' => ['site_code' => 'gh_gm', 'site_id' => 178, 'site_lgc' => '4', 'site_url' => 'https://www.globalhighlights.de', 'site_image_url' => '//www.globalhighlights.de', 'site_authors' => ['DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'], 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'], @@ -548,6 +549,7 @@ $config['css_source_mbj'] = 'https://www.mybeijingchina.com/css/layout.c $config['css_source_yz'] = 'https://www.yangtzeriver.org/css/css3/bootstrap/bootstrap.css'; $config['css_source_ah'] = 'https://data.asiahighlights.com/css/mobile-first.css'; $config['css_source_jh'] = 'https://data.japanhighlights.com/css/mobile-first.css'; +$config['css_source_htravel'] = 'https://data.highlightstravel.com/css/mobile-first.css'; $config['css_source_gh'] = 'https://data.globalhighlights.com/css/gh-global.css'; $config['css_source_ct'] = 'https://data.chinatravel.com/css/min.php?f=/css/css3/bootstrap/bootstrap.css,/css/css3/style.css,/css/css3/destination-details.css'; $config['css_source_chinatravel'] = 'https://data.chinatravel.com/css/newcss3/base.css'; @@ -563,6 +565,7 @@ $config['cache']['ch']['cache_path'] = 'D:\wwwcache\chinahighlights.com $config['cache']['ah']['cache_path'] = 'D:\wwwcache\asiahighlights.com'; $config['cache']['jh']['cache_path'] = 'D:\wwwcache\japanhighlights.com'; $config['cache']['gh']['cache_path'] = 'D:\wwwcache\globalhighlights.com'; +$config['cache']['htravel']['cache_path'] = 'D:\wwwcache\highlightstravel.com'; $config['cache']['chinatravel']['cache_path'] = 'D:\wwwcache\mobile-first\chinatravel.com'; $config['cache']['shanghai']['cache_path'] = 'D:\wwwcache\mobile-first\shanghaihighlights.com'; $config['cache']['beijing']['cache_path'] = 'D:\wwwcache\mobile-first\mybeijingchina.com'; diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php index cc87ec76..43eaaa51 100644 --- a/application/helpers/info_helper.php +++ b/application/helpers/info_helper.php @@ -103,7 +103,7 @@ function is_mobile_first() { $CI = &get_instance(); $sitecode = $CI->config->item('site_code'); - if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'jh' || $sitecode == 'shanghai' || $sitecode=='beijing' || $sitecode == "trainspread" || $sitecode=="guilin" || $sitecode=="hly") { + if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'htravel' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'jh' || $sitecode == 'shanghai' || $sitecode=='beijing' || $sitecode == "trainspread" || $sitecode=="guilin" || $sitecode=="hly") { return true; } else { return false; @@ -375,5 +375,5 @@ function compress_css($buffer) function replace_image_url($ic_content) { $CI = &get_instance(); - return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'), $ic_content); + return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'), subject: $ic_content); } \ No newline at end of file From 155c2599c8047b1a027051cd09772ad81ea3e32f Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 23 Jun 2025 14:49:52 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=AD=E6=B3=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/helpers/info_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php index 43eaaa51..b165469f 100644 --- a/application/helpers/info_helper.php +++ b/application/helpers/info_helper.php @@ -375,5 +375,5 @@ function compress_css($buffer) function replace_image_url($ic_content) { $CI = &get_instance(); - return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'), subject: $ic_content); + return str_replace($CI->config->item('media_image_url'), $CI->config->item('site_image_url'), $ic_content); } \ No newline at end of file From 56a015cb969dbb6929a0d30c57498b632f270f0d Mon Sep 17 00:00:00 2001 From: Ycc Date: Mon, 23 Jun 2025 15:09:32 +0800 Subject: [PATCH 4/9] =?UTF-8?q?AH=E6=A8=A1=E6=9D=BF=E6=94=B9=E4=B8=BAHTrav?= =?UTF-8?q?el?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 4 +- application/controllers/information.php | 37 ++++++++++++------- .../{ah-add-this.php => htravel-add-this.php} | 0 ...-breadcrumb.php => htravel-breadcrumb.php} | 0 ...> htravel-chiang-mai-lantern-festival.php} | 0 ...-list.php => htravel-feedback-30-list.php} | 0 ...ist.php => htravel-feedback-city-list.php} | 0 ...ack-list.php => htravel-feedback-list.php} | 0 ...-10.php => htravel-feedback-newest-10.php} | 0 ...newest.php => htravel-feedback-newest.php} | 0 ...k-right.php => htravel-feedback-right.php} | 0 ...ah-google-ad.php => htravel-google-ad.php} | 0 .../{ah-gp-form.php => htravel-gp-form.php} | 0 .../{ah-h1.php => htravel-h1.php} | 0 ...ge-form.php => htravel-info-page-form.php} | 0 ...uiry-form.php => htravel-inquiry-form.php} | 0 ...p => htravel-lantern-festival-gp-form.php} | 0 ...2025.php => htravel-lantern-form-2025.php} | 0 ...tern-form.php => htravel-lantern-form.php} | 0 ...own.php => htravel-new-year-countdown.php} | 0 ...ext-mobile.php => htravel-next-mobile.php} | 0 .../{ah-next.php => htravel-next.php} | 0 .../{ah-pc.php => htravel-pc.php} | 0 ...cle.php => htravel-recommends-article.php} | 0 ...s-tour.php => htravel-recommends-tour.php} | 0 ...hp => htravel-structured-data-article.php} | 0 ...=> htravel-structured-data-breadcrumb.php} | 0 ...t-list.php => htravel-tips-right-list.php} | 0 ...st-form.php => htravel-tour-list-form.php} | 0 ...s-mobile.php => htravel-why-us-mobile.php} | 0 ....php => htravel-why-us-tour-detail-pc.php} | 0 ...pc.php => htravel-why-us-tour-list-pc.php} | 0 .../mobile_first/{ah.php => htravel.php} | 0 {.github => ithub}/workflows/Deploy CN.yml | 0 {.github => ithub}/workflows/Deploy.yml | 0 35 files changed, 25 insertions(+), 16 deletions(-) rename application/views/mobile_first/{ah-add-this.php => htravel-add-this.php} (100%) rename application/views/mobile_first/{ah-breadcrumb.php => htravel-breadcrumb.php} (100%) rename application/views/mobile_first/{ah-chiang-mai-lantern-festival.php => htravel-chiang-mai-lantern-festival.php} (100%) rename application/views/mobile_first/{ah-feedback-30-list.php => htravel-feedback-30-list.php} (100%) rename application/views/mobile_first/{ah-feedback-city-list.php => htravel-feedback-city-list.php} (100%) rename application/views/mobile_first/{ah-feedback-list.php => htravel-feedback-list.php} (100%) rename application/views/mobile_first/{ah-feedback-newest-10.php => htravel-feedback-newest-10.php} (100%) rename application/views/mobile_first/{ah-feedback-newest.php => htravel-feedback-newest.php} (100%) rename application/views/mobile_first/{ah-feedback-right.php => htravel-feedback-right.php} (100%) rename application/views/mobile_first/{ah-google-ad.php => htravel-google-ad.php} (100%) rename application/views/mobile_first/{ah-gp-form.php => htravel-gp-form.php} (100%) rename application/views/mobile_first/{ah-h1.php => htravel-h1.php} (100%) rename application/views/mobile_first/{ah-info-page-form.php => htravel-info-page-form.php} (100%) rename application/views/mobile_first/{ah-inquiry-form.php => htravel-inquiry-form.php} (100%) rename application/views/mobile_first/{ah-lantern-festival-gp-form.php => htravel-lantern-festival-gp-form.php} (100%) rename application/views/mobile_first/{ah-lantern-form-2025.php => htravel-lantern-form-2025.php} (100%) rename application/views/mobile_first/{ah-lantern-form.php => htravel-lantern-form.php} (100%) rename application/views/mobile_first/{ah-new-year-countdown.php => htravel-new-year-countdown.php} (100%) rename application/views/mobile_first/{ah-next-mobile.php => htravel-next-mobile.php} (100%) rename application/views/mobile_first/{ah-next.php => htravel-next.php} (100%) rename application/views/mobile_first/{ah-pc.php => htravel-pc.php} (100%) rename application/views/mobile_first/{ah-recommends-article.php => htravel-recommends-article.php} (100%) rename application/views/mobile_first/{ah-recommends-tour.php => htravel-recommends-tour.php} (100%) rename application/views/mobile_first/{ah-structured-data-article.php => htravel-structured-data-article.php} (100%) rename application/views/mobile_first/{ah-structured-data-breadcrumb.php => htravel-structured-data-breadcrumb.php} (100%) rename application/views/mobile_first/{ah-tips-right-list.php => htravel-tips-right-list.php} (100%) rename application/views/mobile_first/{ah-tour-list-form.php => htravel-tour-list-form.php} (100%) rename application/views/mobile_first/{ah-why-us-mobile.php => htravel-why-us-mobile.php} (100%) rename application/views/mobile_first/{ah-why-us-tour-detail-pc.php => htravel-why-us-tour-detail-pc.php} (100%) rename application/views/mobile_first/{ah-why-us-tour-list-pc.php => htravel-why-us-tour-list-pc.php} (100%) rename application/views/mobile_first/{ah.php => htravel.php} (100%) rename {.github => ithub}/workflows/Deploy CN.yml (100%) rename {.github => ithub}/workflows/Deploy.yml (100%) diff --git a/application/config/config.php b/application/config/config.php index e34d218f..e5fc5f95 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -395,7 +395,7 @@ $config['site'] = [ 'ch' => ['site_code' => 'ch', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => ['TDJ', 'ycc'], 'site_user' => ',ycc,'], 'ah' => ['site_code' => 'ah', 'site_id' => 141, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.asiahighlights.com', 'site_url' => 'https://www.asiahighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'jh' => ['site_code' => 'jh', 'site_id' => 186, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.japanhighlights.com', 'site_url' => 'https://www.japanhighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], - 'HTravel' => ['site_code' => 'htravel', 'site_id' => 187, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.highlightstravel.com', 'site_url' => 'https://www.highlightstravel.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], + 'HTravel' => ['site_code' => 'htravel', 'site_id' => 187, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.highlightstravel.com', 'site_url' => 'https://www.highlightstravel.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'gh' => ['site_code' => 'gh', 'site_id' => 163, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.globalhighlights.com', 'site_url' => 'https://www.globalhighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'gm' => ['site_code' => 'gm', 'site_id' => 22, 'site_lgc' => '4', 'site_url' => 'https://www.chinarundreisen.com', 'site_image_url' => '//bilder.chinarundreisen.com', 'site_authors' => ['DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'], 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'], 'gh_gm' => ['site_code' => 'gh_gm', 'site_id' => 178, 'site_lgc' => '4', 'site_url' => 'https://www.globalhighlights.de', 'site_image_url' => '//www.globalhighlights.de', 'site_authors' => ['DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'], 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'], @@ -793,7 +793,7 @@ $config['InfoType_ct'] = [ ]; //AH站点用到了 -$config['InfoType_ah'] = [ +$config['InfoType_htravel'] = [ '国家信息' => 'country_info', '区域信息' => 'area_info', '国家信息列表页' => 'country_info_list', diff --git a/application/controllers/information.php b/application/controllers/information.php index 44badc07..18e1f576 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -484,6 +484,9 @@ class Information extends CI_Controller if (in_array($this->config->item('site_code'), array('ah'))) { $this->config->set_item('templates', $this->config->item('templates_ah')); } + if (in_array($this->config->item('site_code'), array('htravel'))) { + $this->config->set_item('templates', $this->config->item('templates_htravel')); + } if (in_array($this->config->item('site_code'), array('pgr'))) { $this->config->set_item('templates', $this->config->item('templates_pgr')); } @@ -499,8 +502,8 @@ class Information extends CI_Controller if ($Structure->is_sitecode == 'ct') { $data['infoTypeList'] = $this->config->item('InfoType_ct'); - } elseif ($Structure->is_sitecode == 'ah') { - $data['infoTypeList'] = $this->config->item('InfoType_ah'); + } elseif ($Structure->is_sitecode == 'htravel') { + $data['infoTypeList'] = $this->config->item('InfoType_htravel'); } else { switch ($data['rootInformation']->ic_ht_area_type) { case 'c': //城市 @@ -710,12 +713,12 @@ class Information extends CI_Controller $this->make_www_cache('mobile', $information_new, $recommand_information); $this->make_www_cache('pc', $information_new, $recommand_information); //echo ' |000~111: '.$this->benchmark->elapsed_time('000', '111'); - } else if (strcasecmp($site_code, "ah") == 0 && !empty($auto_update_cache)) { + } else if (strcasecmp($site_code, "htravel") == 0 && !empty($auto_update_cache)) { //读取模板生成PC和移动优先文件 $recommand_information = $this->recommand_information($information); $information_new = $this->Information_model->Detail($this->input->post('is_id')); - $this->make_www_cache_ah('mobile', $information_new, $recommand_information); - $this->make_www_cache_ah('pc', $information_new, $recommand_information); + $this->make_www_cache_htravel('mobile', $information_new, $recommand_information); + $this->make_www_cache_htravel('pc', $information_new, $recommand_information); } else if (strcasecmp($site_code, "gh") == 0 && !empty($auto_update_cache)) { $recommand_information = $this->recommand_information($information); $information_new = $this->Information_model->Detail($this->input->post('is_id')); @@ -748,9 +751,9 @@ class Information extends CI_Controller $this->make_www_cache_hly($information_new); } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) { $update_info_log = $this->update_cache($ic_url); - } else if (strcasecmp($site_code, "ah") == 0 && !empty($auto_update_cache)) { + } else if (strcasecmp($site_code, "htravel") == 0 && !empty($auto_update_cache)) { //$update_info_log = $this->update_cache($ic_url); - } else if (strcasecmp($site_code, "cht") != 0 && strcasecmp($site_code, "gm") != 0 && strcasecmp($site_code, "ah") != 0) { //非cht站点并且非GM并且非AH + } else if (strcasecmp($site_code, "cht") != 0 && strcasecmp($site_code, "gm") != 0 && strcasecmp($site_code, "htravel") != 0) { //非cht站点并且非GM并且非AH $update_info_log = $this->update_cache($ic_url); } else if (strcasecmp($site_code, "ct") == 0 && !empty($auto_update_cache)) { $update_info_log = $this->update_cache($ic_url); @@ -830,9 +833,9 @@ class Information extends CI_Controller if ($this->config->item('site_code') == 'ch') { $this->make_www_cache('pc', $information, $recommand_information); $this->make_www_cache('mobile', $information, $recommand_information); - } else if ($this->config->item('site_code') == 'ah') { - $this->make_www_cache_ah('pc', $information, $recommand_information); - $this->make_www_cache_ah('mobile', $information, $recommand_information); + } else if ($this->config->item('site_code') == 'htravel') { + $this->make_www_cache_htravel('pc', $information, $recommand_information); + $this->make_www_cache_htravel('mobile', $information, $recommand_information); }else if ($this->config->item('site_code') == 'jh') { $this->make_www_cache_jh('pc', $information, $recommand_information); $this->make_www_cache_jh('mobile', $information, $recommand_information); @@ -2179,7 +2182,7 @@ class Information extends CI_Controller file_put_contents($html_path, $template, LOCK_EX); } - public function make_www_cache_ah($device, $information, $recommand_information) + public function make_www_cache_htravel($device, $information, $recommand_information) { $data = array(); @@ -5638,7 +5641,7 @@ class Information extends CI_Controller $exclude_ids = array($information->is_id); //需要排除的is_id，防止通过页面显示相同内容，默认排除本身，每个推荐内容都需要排除已经推荐过的 foreach ($root_recommands as $item) { - if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh' or $this->config->item('site_code') == 'jh') { //如果是AH CH GH的页面，取消重复检测 + if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh' or $this->config->item('site_code') == 'jh' or $this->config->item('site_code') == 'htravel') { //如果是AH CH GH的页面，取消重复检测 $exclude_ids = array(0); } $result = $this->recommand_information_rule($information, $root_detail, $item, $exclude_ids); @@ -5648,7 +5651,7 @@ class Information extends CI_Controller } foreach ($group_recommands as $item) { - if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh' or $this->config->item('site_code') == 'jh') { //如果是AH CH GH JH的页面，取消重复检测 + if ($this->config->item('site_code') == 'ah' or $this->config->item('site_code') == 'ch' or $this->config->item('site_code') == 'gh' or $this->config->item('site_code') == 'jh' or $this->config->item('site_code') == 'htravel') { //如果是AH CH GH JH的页面，取消重复检测 $exclude_ids = array(0); } if (empty($data[$item->ir_name])) { @@ -5805,7 +5808,13 @@ class Information extends CI_Controller $url = 'https://www.asiahighlights.com/index.php/information/detail/?static_html_url=' . $url . '&static_html_optimize=comeon'; } break; - + case 'htravel': + if ($delete_only === true) { + $url = 'https://www.highlightstravel.com/index.php/information/delete_cache_8X913mksJ/?static_html_url=' . $url; + } else { // static_html_optimize=comeon 启用静态化压缩和js、css延迟加载 + $url = 'https://www.highlightstravel.com/index.php/information/detail/?static_html_url=' . $url . '&static_html_optimize=comeon'; + } + break; case 'gm': //GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台 //if ($delete_only) { diff --git a/application/views/mobile_first/ah-add-this.php b/application/views/mobile_first/htravel-add-this.php similarity index 100% rename from application/views/mobile_first/ah-add-this.php rename to application/views/mobile_first/htravel-add-this.php diff --git a/application/views/mobile_first/ah-breadcrumb.php b/application/views/mobile_first/htravel-breadcrumb.php similarity index 100% rename from application/views/mobile_first/ah-breadcrumb.php rename to application/views/mobile_first/htravel-breadcrumb.php diff --git a/application/views/mobile_first/ah-chiang-mai-lantern-festival.php b/application/views/mobile_first/htravel-chiang-mai-lantern-festival.php similarity index 100% rename from application/views/mobile_first/ah-chiang-mai-lantern-festival.php rename to application/views/mobile_first/htravel-chiang-mai-lantern-festival.php diff --git a/application/views/mobile_first/ah-feedback-30-list.php b/application/views/mobile_first/htravel-feedback-30-list.php similarity index 100% rename from application/views/mobile_first/ah-feedback-30-list.php rename to application/views/mobile_first/htravel-feedback-30-list.php diff --git a/application/views/mobile_first/ah-feedback-city-list.php b/application/views/mobile_first/htravel-feedback-city-list.php similarity index 100% rename from application/views/mobile_first/ah-feedback-city-list.php rename to application/views/mobile_first/htravel-feedback-city-list.php diff --git a/application/views/mobile_first/ah-feedback-list.php b/application/views/mobile_first/htravel-feedback-list.php similarity index 100% rename from application/views/mobile_first/ah-feedback-list.php rename to application/views/mobile_first/htravel-feedback-list.php diff --git a/application/views/mobile_first/ah-feedback-newest-10.php b/application/views/mobile_first/htravel-feedback-newest-10.php similarity index 100% rename from application/views/mobile_first/ah-feedback-newest-10.php rename to application/views/mobile_first/htravel-feedback-newest-10.php diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/htravel-feedback-newest.php similarity index 100% rename from application/views/mobile_first/ah-feedback-newest.php rename to application/views/mobile_first/htravel-feedback-newest.php diff --git a/application/views/mobile_first/ah-feedback-right.php b/application/views/mobile_first/htravel-feedback-right.php similarity index 100% rename from application/views/mobile_first/ah-feedback-right.php rename to application/views/mobile_first/htravel-feedback-right.php diff --git a/application/views/mobile_first/ah-google-ad.php b/application/views/mobile_first/htravel-google-ad.php similarity index 100% rename from application/views/mobile_first/ah-google-ad.php rename to application/views/mobile_first/htravel-google-ad.php diff --git a/application/views/mobile_first/ah-gp-form.php b/application/views/mobile_first/htravel-gp-form.php similarity index 100% rename from application/views/mobile_first/ah-gp-form.php rename to application/views/mobile_first/htravel-gp-form.php diff --git a/application/views/mobile_first/ah-h1.php b/application/views/mobile_first/htravel-h1.php similarity index 100% rename from application/views/mobile_first/ah-h1.php rename to application/views/mobile_first/htravel-h1.php diff --git a/application/views/mobile_first/ah-info-page-form.php b/application/views/mobile_first/htravel-info-page-form.php similarity index 100% rename from application/views/mobile_first/ah-info-page-form.php rename to application/views/mobile_first/htravel-info-page-form.php diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/htravel-inquiry-form.php similarity index 100% rename from application/views/mobile_first/ah-inquiry-form.php rename to application/views/mobile_first/htravel-inquiry-form.php diff --git a/application/views/mobile_first/ah-lantern-festival-gp-form.php b/application/views/mobile_first/htravel-lantern-festival-gp-form.php similarity index 100% rename from application/views/mobile_first/ah-lantern-festival-gp-form.php rename to application/views/mobile_first/htravel-lantern-festival-gp-form.php diff --git a/application/views/mobile_first/ah-lantern-form-2025.php b/application/views/mobile_first/htravel-lantern-form-2025.php similarity index 100% rename from application/views/mobile_first/ah-lantern-form-2025.php rename to application/views/mobile_first/htravel-lantern-form-2025.php diff --git a/application/views/mobile_first/ah-lantern-form.php b/application/views/mobile_first/htravel-lantern-form.php similarity index 100% rename from application/views/mobile_first/ah-lantern-form.php rename to application/views/mobile_first/htravel-lantern-form.php diff --git a/application/views/mobile_first/ah-new-year-countdown.php b/application/views/mobile_first/htravel-new-year-countdown.php similarity index 100% rename from application/views/mobile_first/ah-new-year-countdown.php rename to application/views/mobile_first/htravel-new-year-countdown.php diff --git a/application/views/mobile_first/ah-next-mobile.php b/application/views/mobile_first/htravel-next-mobile.php similarity index 100% rename from application/views/mobile_first/ah-next-mobile.php rename to application/views/mobile_first/htravel-next-mobile.php diff --git a/application/views/mobile_first/ah-next.php b/application/views/mobile_first/htravel-next.php similarity index 100% rename from application/views/mobile_first/ah-next.php rename to application/views/mobile_first/htravel-next.php diff --git a/application/views/mobile_first/ah-pc.php b/application/views/mobile_first/htravel-pc.php similarity index 100% rename from application/views/mobile_first/ah-pc.php rename to application/views/mobile_first/htravel-pc.php diff --git a/application/views/mobile_first/ah-recommends-article.php b/application/views/mobile_first/htravel-recommends-article.php similarity index 100% rename from application/views/mobile_first/ah-recommends-article.php rename to application/views/mobile_first/htravel-recommends-article.php diff --git a/application/views/mobile_first/ah-recommends-tour.php b/application/views/mobile_first/htravel-recommends-tour.php similarity index 100% rename from application/views/mobile_first/ah-recommends-tour.php rename to application/views/mobile_first/htravel-recommends-tour.php diff --git a/application/views/mobile_first/ah-structured-data-article.php b/application/views/mobile_first/htravel-structured-data-article.php similarity index 100% rename from application/views/mobile_first/ah-structured-data-article.php rename to application/views/mobile_first/htravel-structured-data-article.php diff --git a/application/views/mobile_first/ah-structured-data-breadcrumb.php b/application/views/mobile_first/htravel-structured-data-breadcrumb.php similarity index 100% rename from application/views/mobile_first/ah-structured-data-breadcrumb.php rename to application/views/mobile_first/htravel-structured-data-breadcrumb.php diff --git a/application/views/mobile_first/ah-tips-right-list.php b/application/views/mobile_first/htravel-tips-right-list.php similarity index 100% rename from application/views/mobile_first/ah-tips-right-list.php rename to application/views/mobile_first/htravel-tips-right-list.php diff --git a/application/views/mobile_first/ah-tour-list-form.php b/application/views/mobile_first/htravel-tour-list-form.php similarity index 100% rename from application/views/mobile_first/ah-tour-list-form.php rename to application/views/mobile_first/htravel-tour-list-form.php diff --git a/application/views/mobile_first/ah-why-us-mobile.php b/application/views/mobile_first/htravel-why-us-mobile.php similarity index 100% rename from application/views/mobile_first/ah-why-us-mobile.php rename to application/views/mobile_first/htravel-why-us-mobile.php diff --git a/application/views/mobile_first/ah-why-us-tour-detail-pc.php b/application/views/mobile_first/htravel-why-us-tour-detail-pc.php similarity index 100% rename from application/views/mobile_first/ah-why-us-tour-detail-pc.php rename to application/views/mobile_first/htravel-why-us-tour-detail-pc.php diff --git a/application/views/mobile_first/ah-why-us-tour-list-pc.php b/application/views/mobile_first/htravel-why-us-tour-list-pc.php similarity index 100% rename from application/views/mobile_first/ah-why-us-tour-list-pc.php rename to application/views/mobile_first/htravel-why-us-tour-list-pc.php diff --git a/application/views/mobile_first/ah.php b/application/views/mobile_first/htravel.php similarity index 100% rename from application/views/mobile_first/ah.php rename to application/views/mobile_first/htravel.php diff --git a/.github/workflows/Deploy CN.yml b/ithub/workflows/Deploy CN.yml similarity index 100% rename from .github/workflows/Deploy CN.yml rename to ithub/workflows/Deploy CN.yml diff --git a/.github/workflows/Deploy.yml b/ithub/workflows/Deploy.yml similarity index 100% rename from .github/workflows/Deploy.yml rename to ithub/workflows/Deploy.yml From dfa51974f35062fb4ec33bda492923bf6c11426e Mon Sep 17 00:00:00 2001 From: Ycc Date: Mon, 23 Jun 2025 15:16:41 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=90=8D=E5=8C=BA?= =?UTF-8?q?=E5=88=86=E5=A4=A7=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/config.php b/application/config/config.php index e5fc5f95..054f1cfa 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -395,7 +395,7 @@ $config['site'] = [ 'ch' => ['site_code' => 'ch', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => ['TDJ', 'ycc'], 'site_user' => ',ycc,'], 'ah' => ['site_code' => 'ah', 'site_id' => 141, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.asiahighlights.com', 'site_url' => 'https://www.asiahighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'jh' => ['site_code' => 'jh', 'site_id' => 186, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.japanhighlights.com', 'site_url' => 'https://www.japanhighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], - 'HTravel' => ['site_code' => 'htravel', 'site_id' => 187, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.highlightstravel.com', 'site_url' => 'https://www.highlightstravel.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], + 'htravel' => ['site_code' => 'htravel', 'site_id' => 187, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.highlightstravel.com', 'site_url' => 'https://www.highlightstravel.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'gh' => ['site_code' => 'gh', 'site_id' => 163, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => 'https://images.globalhighlights.com', 'site_url' => 'https://www.globalhighlights.com', 'site_sitemap' => '', 'site_authors' => ['X', 'sfx'], 'site_user' => [',ycc,sfx,X,']], 'gm' => ['site_code' => 'gm', 'site_id' => 22, 'site_lgc' => '4', 'site_url' => 'https://www.chinarundreisen.com', 'site_image_url' => '//bilder.chinarundreisen.com', 'site_authors' => ['DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'], 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'], 'gh_gm' => ['site_code' => 'gh_gm', 'site_id' => 178, 'site_lgc' => '4', 'site_url' => 'https://www.globalhighlights.de', 'site_image_url' => '//www.globalhighlights.de', 'site_authors' => ['DX', 'X', 'K', 'Lan', 'lmr', 'zyh', 'ZYHL', 'TDJ'], 'site_user' => ',ycc,lmr,B,zyh,DX,X,K,htc,zm,bhn,Lan,Tony,zyh,J,v,ZYHL,TDJ,LYY,shw,'], From ac79ca3198810627359bb8bb5e4087865b48dfec Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Mon, 23 Jun 2025 15:42:16 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {ithub => .github}/workflows/Deploy CN.yml | 0 {ithub => .github}/workflows/Deploy.yml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {ithub => .github}/workflows/Deploy CN.yml (100%) rename {ithub => .github}/workflows/Deploy.yml (100%) diff --git a/ithub/workflows/Deploy CN.yml b/.github/workflows/Deploy CN.yml similarity index 100% rename from ithub/workflows/Deploy CN.yml rename to .github/workflows/Deploy CN.yml diff --git a/ithub/workflows/Deploy.yml b/.github/workflows/Deploy.yml similarity index 100% rename from ithub/workflows/Deploy.yml rename to .github/workflows/Deploy.yml From 3a392f881ac5243efd538f432711461a9bd9b7e3 Mon Sep 17 00:00:00 2001 From: candice Date: Tue, 24 Jun 2025 14:04:06 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAHT=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htravel-chiang-mai-lantern-festival.php | 4 +- .../mobile_first/htravel-feedback-30-list.php | 6 +- .../htravel-feedback-city-list.php | 10 +- .../mobile_first/htravel-feedback-list.php | 8 +- .../htravel-feedback-newest-10.php | 6 +- .../mobile_first/htravel-feedback-newest.php | 6 +- application/views/mobile_first/htravel-h1.php | 36 ++--- .../mobile_first/htravel-info-page-form.php | 4 +- .../mobile_first/htravel-inquiry-form.php | 2 +- .../htravel-lantern-festival-gp-form.php | 2 +- .../htravel-lantern-form-2025.php | 4 +- .../mobile_first/htravel-lantern-form.php | 2 +- .../htravel-new-year-countdown.php | 2 +- .../mobile_first/htravel-next-mobile.php | 18 +-- .../views/mobile_first/htravel-next.php | 18 +-- application/views/mobile_first/htravel-pc.php | 143 ++++++++---------- .../htravel-recommends-article.php | 12 +- .../mobile_first/htravel-recommends-tour.php | 8 +- .../htravel-structured-data-article.php | 8 +- .../htravel-structured-data-breadcrumb.php | 4 +- .../mobile_first/htravel-tour-list-form.php | 2 +- application/views/mobile_first/htravel.php | 66 ++++---- 22 files changed, 166 insertions(+), 205 deletions(-) diff --git a/application/views/mobile_first/htravel-chiang-mai-lantern-festival.php b/application/views/mobile_first/htravel-chiang-mai-lantern-festival.php index 2979b9d5..06ba4c28 100644 --- a/application/views/mobile_first/htravel-chiang-mai-lantern-festival.php +++ b/application/views/mobile_first/htravel-chiang-mai-lantern-festival.php @@ -2,7 +2,7 @@

Chiang Mai Authentic Sky Lantern Festival on Nov. 5, 2025

-
+

Select a Ticket Type:

@@ -568,7 +568,7 @@ background: #fff;margin-top: 15px; margin-bottom: 20px; display: none;"> return result; } - + - + + src="https://data.highlightstravel.com/min/?f=/js/jquery-1.8.2.min.js,/js/jquery.mailAutoComplete-4.0.min.js"> ', $template); //额外样式 @@ -2563,7 +2563,7 @@ class Information extends CI_Controller $template = str_replace('', '', $template); } //设置内容图片缓加载 - $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.asiahighlights.com/grey.gif'); + $lazy_content = $this->html_optimize_lib->set_lazy_loader($information->ic_content, 'https://data.highlightstravel.com/grey.gif'); $template = str_replace('', $lazy_content, $template); //Google广告代码 @@ -2584,7 +2584,7 @@ class Information extends CI_Controller // 设置图片尺寸 // 优化过图片目录：D:\wwwroot\origin-images.chinahighlights.com\optimize\ - $www_local_path = 'D:/wwwroot/origin-www.asiahighlights.com'; + $www_local_path = 'D:/wwwroot/origin-www.highlightstravel.com'; $image_local_path = 'D:/wwwroot/origin-images.chinahighlights.com/optimize'; if (is_dir($www_local_path) && is_dir($image_local_path)) { $template = $this->html_optimize_lib->set_image_size_local($template, $www_local_path, $image_local_path);