diff --git a/application/config/config.php b/application/config/config.php index cd5f9c03..657ae842 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -429,6 +429,7 @@ $config['site'] = array( 'beijing' => array('site_code' => 'beijing', 'site_id' => 98, 'site_lgc' => '106', 'site_url' => 'https://www.mybeijingchina.com', 'site_image_url' => 'https://images.mybeijingchina.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), 'trainspread' => array('site_code' => 'trainspread', 'site_id' => 149, 'site_lgc' => '1', 'site_url' => 'https://www.trainspread.com', 'site_image_url' => 'https://images.trainspread.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), 'guilin' => array('site_code' => 'guilin', 'site_id' => 90, 'site_lgc' => '103', 'site_url' => 'https://www.guilinchina.net/', 'site_image_url' => 'https://images.guilinchina.net', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), + 'hly' => array('site_code' => 'hly', 'site_id' => 151, 'site_lgc' => '2', 'site_url' => 'https://www.hualiyingtravel.com', 'site_image_url' => 'https://www.hualiyingtravel.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), 'cht' => array('site_code' => 'cht', 'site_id' => 14, 'site_lgc' => '1', 'site_url' => 'https://www.chinahighlights.com', 'site_image_url' => 'https://images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin', 'sw', 'zl', 'wbl', 'yqw', 'lf', 'zhm', 'pkl'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,v,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,zl,syt,gavin,zm,htc,yqw,bhn,lmj,wbl,yqw,LYY,zhm,si'), ); @@ -769,6 +770,7 @@ $config['css_source_shanghai'] = 'https://data.shanghaihighlights.com/css/css3/b $config['css_source_beijing'] = 'https://www.mybeijingchina.com/css/css3/base.css'; $config['css_source_trainspread'] = 'https://data.trainspread.com/css/base.css'; $config['css_source_guilin'] = 'https://data.guilinchina.net/css/css3/base.css'; +$config['css_source_hly'] = 'https://www.hualiyingtravel.com/css/csse3/base.css'; $config['css_source_ts'] = 'https://www.trainspread.com/css/bootstrap.min.css'; //静态文件生成路径 @@ -787,6 +789,7 @@ $config['cache']['chinatravel']['cache_path'] = 'D:\wwwcache\mobile-first\chinat $config['cache']['shanghai']['cache_path'] = 'D:\wwwcache\mobile-first\shanghaihighlights.com'; $config['cache']['beijing']['cache_path'] = 'D:\wwwcache\mobile-first\mybeijingchina.com'; $config['cache']['trainspread']['cache_path'] = 'D:\wwwcache\mobile-first\trainspread.com'; +$config['cache']['hly']['cache_path'] = 'D:\wwwcache\mobile-first\hualiyingtravel.com'; $config['cache']['guilin']['cache_path'] = 'D:\wwwcache\mobile-first\guilinchina.net'; //静态文件更新接口 diff --git a/application/controllers/information.php b/application/controllers/information.php index 79bf04ff..97868112 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -743,6 +743,9 @@ class Information extends CI_Controller } else if (strcasecmp($site_code, "guilin") == 0 && !empty($auto_update_cache)) { $information_new = $this->Information_model->Detail($this->input->post('is_id')); $this->make_www_cache_gl($information_new); + } else if (strcasecmp($site_code, "hly") == 0 && !empty($auto_update_cache)) { + $information_new = $this->Information_model->Detail($this->input->post('is_id')); + $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)) { @@ -5115,6 +5118,13 @@ class Information extends CI_Controller #endregion } + /** + * 花梨鹰网站 www.hualiyingtravel.com的静态化 + */ + public function make_www_cache_hly($information){ + + } + //通过内容找到第一张图片 public function set_photo_content($ic_photo, $ic_content) { diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php index 68ba1c55..0749aeae 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") { + if ($sitecode == 'ch' || $sitecode == 'ah' || $sitecode == 'chinatravel' || $sitecode == 'gh' || $sitecode == 'jh' || $sitecode == 'shanghai' || $sitecode=='beijing' || $sitecode == "trainspread" || $sitecode=="guilin" || $sitecode="hly") { return true; } else { return false; diff --git a/application/third_party/ctmobilefirst/controllers/api.php b/application/third_party/ctmobilefirst/controllers/api.php index 7953a1fd..574777f7 100644 --- a/application/third_party/ctmobilefirst/controllers/api.php +++ b/application/third_party/ctmobilefirst/controllers/api.php @@ -371,6 +371,15 @@ class Api extends CI_Controller { 'imagesUrl'=>'images.guilinchina.net', ]; + $hly = [ + 'dei_sn' => '31', + 'LGC' =>'2', + 'WebCode'=>'hly', + 'WebUrl'=>'www.hualiyingtravel.com', + 'WebCdn'=>'www.hualiyingtravel.com', + 'imagesUrl'=>'www.hualiyingtravel.com', + ]; + $localeMap = [ 'chinatravel' => $chinatravel, @@ -378,6 +387,7 @@ class Api extends CI_Controller { 'beijing' => $beijing, 'trainspread' => $trainspread, 'guilin' =>$guilin, + 'hly' =>$hly, ]; if (isset($_GET["webcode"])){ diff --git a/application/third_party/train/models/BIZ_intel_train_model.php b/application/third_party/train/models/BIZ_intel_train_model.php index e9a9c140..0ca8fcb1 100644 --- a/application/third_party/train/models/BIZ_intel_train_model.php +++ b/application/third_party/train/models/BIZ_intel_train_model.php @@ -145,7 +145,8 @@ class BIZ_intel_train_model extends CI_Model { TrainStation_intel tsi2 ON tsi2.station_id = tsi_ToStation - where tsi1.s_country = 'china' or tsi2.s_country = 'china' + where tsi1.s_country = 'china' or tsi2.s_country = 'china' + and ISNULL(tsi_check,0)<>1 "; $query = $this->HT->query($sql); return $query->result(); diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 911072b5..27f23a84 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -863,7 +863,7 @@ if (!empty($setting_website_nav)) { - config->item('site_code'), array('ct', 'chinatravel', 'shanghai', 'beijing', 'trainspread','guilin'))) { + config->item('site_code'), array('ct', 'chinatravel', 'shanghai', 'beijing', 'trainspread','guilin','hly'))) { ?>