From 9dd00fdb371228be5fd5d66e1c2500bdb22af968 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 12 Jul 2018 22:30:39 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E7=81=AB=E8=BD=A6=E7=9A=84=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/train/models/BIZ_intel_train_model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 282b9aa8..a33563ac 100644 --- a/application/third_party/train/models/BIZ_intel_train_model.php +++ b/application/third_party/train/models/BIZ_intel_train_model.php @@ -41,6 +41,8 @@ class BIZ_intel_train_model extends CI_Model { tl.DateRule != '' AND tp.seatPriceInfo2 IS NOT NULL + order by + departTime asc "; $query = $this->HT->query($sql); return $query->result(); @@ -104,7 +106,7 @@ class BIZ_intel_train_model extends CI_Model { } public function get_train_station($train_no){ - $sql = "SELECT * FROM trainlistDetail WHERE train_no = '{$train_no}'"; + $sql = "SELECT * FROM trainlistDetail WHERE train_no = '{$train_no}' order by trainOrder asc"; $query = $this->HT->query($sql); return $query->result(); } From 92e396296b7d14d30b6c9c592ee9612e2a1843fd Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 12 Jul 2018 22:50:44 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/models/BIZ_intel_train_model.php | 1 + 1 file changed, 1 insertion(+) 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 a33563ac..f799febf 100644 --- a/application/third_party/train/models/BIZ_intel_train_model.php +++ b/application/third_party/train/models/BIZ_intel_train_model.php @@ -24,6 +24,7 @@ class BIZ_intel_train_model extends CI_Model { tl.arriveTime, tl.UseDay, tl.DateRule, + tl.TrainMessage, tp.seatPriceInfo2 FROM trainlist tl From a73e0498972d940f17d182b7f4779bad3885b74c Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 16 Jul 2018 11:16:02 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E7=81=AB=E8=BD=A6=E7=9A=84=E5=88=B0=E8=BE=BE=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/models/BIZ_intel_train_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f799febf..0c193d8a 100644 --- a/application/third_party/train/models/BIZ_intel_train_model.php +++ b/application/third_party/train/models/BIZ_intel_train_model.php @@ -21,7 +21,7 @@ class BIZ_intel_train_model extends CI_Model { tl.trainUse, tl.RunTime, tl.departTime, - tl.arriveTime, + (select top 1 trainArrive from trainlistDetail where train_no = tl.train_no order by trainOrder desc) as arriveTime, tl.UseDay, tl.DateRule, tl.TrainMessage, From b042b940dc1a0b8bc6674439c8af4aeb2d355427 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 16 Jul 2018 13:43:03 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E9=80=81POST?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/train/controllers/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index 16cb31ca..dfbebf43 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -553,7 +553,7 @@ class search extends CI_Controller{ curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址 curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 - curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器 + //curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器 curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转 curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer if ($method == 'POST' && !empty($data)) { From dd82bdebdc755c2fc50af15a926c01b17db11bba Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Tue, 24 Jul 2018 16:41:39 +0800 Subject: [PATCH 05/22] fix amp checker empty data --- application/models/infoMetas_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php index e389361c..fd75b626 100644 --- a/application/models/infoMetas_model.php +++ b/application/models/infoMetas_model.php @@ -75,7 +75,7 @@ class InfoMetas_model extends CI_Model { AND c.ic_sitecode = ? AND c.ic_status = 1 AND CONVERT(varchar, im2.im_value) = '1' - ) AND c0.ic_sitecode = ? AND c0.ic_status = 1 AND c0.ic_url <> '' + ) AND c0.ic_sitecode = ? AND c0.ic_status = 1 AND c0.ic_url <> '' AND c0.ic_content <> '' "; $query = $this->HT->query($sql, array($site_code, $site_code)); return $query->result(); From 6b85414747722e3f5bf09a0b97540262152bd5fc Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Tue, 24 Jul 2018 16:45:05 +0800 Subject: [PATCH 06/22] fix amp checker empty data v2 --- application/models/infoMetas_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php index fd75b626..d40ca931 100644 --- a/application/models/infoMetas_model.php +++ b/application/models/infoMetas_model.php @@ -75,7 +75,7 @@ class InfoMetas_model extends CI_Model { AND c.ic_sitecode = ? AND c.ic_status = 1 AND CONVERT(varchar, im2.im_value) = '1' - ) AND c0.ic_sitecode = ? AND c0.ic_status = 1 AND c0.ic_url <> '' AND c0.ic_content <> '' + ) AND c0.ic_sitecode = ? AND c0.ic_status = 1 AND c0.ic_url <> '' AND datalength(c0.ic_content) > 0 "; $query = $this->HT->query($sql, array($site_code, $site_code)); return $query->result(); From 6cb7fe9a1ea5ae853a7d32134cb252f528c95eb4 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 26 Jul 2018 14:28:39 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=81=AB=E8=BD=A6?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=B0=83=E7=94=A8=E6=9C=BA=E5=88=B6=EF=BC=8C?= =?UTF-8?q?30=E5=A4=A9=E5=86=85=E7=9A=84=E6=9F=A5=E8=AF=A2=E5=87=BA?= =?UTF-8?q?=E9=94=99=EF=BC=8C=E4=B8=8D=E4=BD=BF=E7=94=A8=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/train/controllers/search.php | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/application/third_party/train/controllers/search.php b/application/third_party/train/controllers/search.php index dfbebf43..7ac5f7b0 100644 --- a/application/third_party/train/controllers/search.php +++ b/application/third_party/train/controllers/search.php @@ -85,23 +85,27 @@ class search extends CI_Controller{ $this->BIZ_train_model->addOrUpdate($fromStation,$toStation,$search_return); $operate_data = $search_return; }else{ - $cache_train_info = $this->BIZ_train_model->get_train_info($fromStation,$toStation); - if(empty($cache_train_info)){ - log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存为空'); - $operate_data = NULL; - }else{ - $cache_time = $cache_train_info->tpc_datetime; - $now_time = time(); - $differ_time = ($now_time - strtotime($cache_time)) / 86400; - if($differ_time >= 3){ - $this->BIZ_train_model->delete_traincache($fromStation,$toStation); - log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存超时,已经删除'); + if($this->seveth == 'yes'){ + $cache_train_info = $this->BIZ_train_model->get_train_info($fromStation,$toStation); + if(empty($cache_train_info)){ + log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存为空'); $operate_data = NULL; }else{ - $this->cache = 'yes'; - $operate_data = $cache_train_info->tpc_content; - log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|调用缓存号：'.$cache_train_info->tpc_sn.'|缓存生成的时间:'.$cache_train_info->tpc_datetime); - } + $cache_time = $cache_train_info->tpc_datetime; + $now_time = time(); + $differ_time = ($now_time - strtotime($cache_time)) / 86400; + if($differ_time >= 3){ + $this->BIZ_train_model->delete_traincache($fromStation,$toStation); + log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|缓存超时,已经删除'); + $operate_data = NULL; + }else{ + $this->cache = 'yes'; + $operate_data = $cache_train_info->tpc_content; + log_message('error','TRAIN 查询为空的链接:'.$this->url.'|出错的原因:'.$this->reason.'|调用缓存号：'.$cache_train_info->tpc_sn.'|缓存生成的时间:'.$cache_train_info->tpc_datetime); + } + } + }else{ + $operate_data = NULL; } } return $operate_data; From b09c09d64843e3cc78d552680b5951737ea4ea7d Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 26 Jul 2018 15:59:19 +0800 Subject: [PATCH 08/22] =?UTF-8?q?CHT=20=E4=BF=AE=E6=94=B9=E8=B6=85?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=89=8D=E7=BC=80https,=20=E9=BB=98=E8=AE=A4?= =?UTF-8?q?nofollow,=E8=B7=9F=E8=B8=AA=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/kindeditor/kindeditor.js | 6 +++--- js/kindeditor/plugins/link/link.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/kindeditor/kindeditor.js b/js/kindeditor/kindeditor.js index b6c39e8e..5a521f49 100644 --- a/js/kindeditor/kindeditor.js +++ b/js/kindeditor/kindeditor.js @@ -3207,9 +3207,9 @@ _extend(KCmd, { var thirdlink=false if (arguments[3] && arguments[3]=='1') { if(url.indexOf("www.chinahighlights.com") < 0 ){ - url='http://www.chinahighlights.com'+url; + url='https://www.chinahighlights.com'+url; } - url ='http://www.chinahighlights.com/redirect.asp?url='+url+'&t=78002'; + url ='https://www.chinahighlights.com/redirect.asp?url='+url+'&t=78002'; thirdlink=true; }; @@ -5780,7 +5780,7 @@ _plugin('core', function(K) { html = html.replace(/class=\"MsoNormal\"/gi, ''); html = html.replace(/file\:\/\/C:/gi, ''); html = html.replace(/

' + '' + - '' + + '' + '' + //跟踪代码 '

' + '' + - '' + + '' + '
' + '', dialog = self.createDialog({ From 586a6c4cd1a3f7f491b8699287faf994d366275d Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 27 Jul 2018 11:51:49 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9kindeditor=E6=96=87?= =?UTF-8?q?=E4=BB=B6v?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 4add9b10..1bf173bc 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -6,7 +6,7 @@ 信息平台 - + + + diff --git a/js/kindeditor/kindeditor.js b/js/kindeditor/kindeditor.js index 5a521f49..395f7ea4 100644 --- a/js/kindeditor/kindeditor.js +++ b/js/kindeditor/kindeditor.js @@ -17,7 +17,7 @@ if (!window.console) { if (!console.log) { console.log = function () {}; } -var _VERSION = '4.1.6 (2013-03-24) 20160601', +var _VERSION = '4.1.6 (2013-03-24) 20180725', _ua = navigator.userAgent.toLowerCase(), _IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1, _GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1, From 11f4e7870ed109ed508770f5b98a286c35b52adf Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 27 Jul 2018 12:00:18 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9kindeditor=E6=96=87?= =?UTF-8?q?=E4=BB=B6v?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/header.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 2037038e..1bf173bc 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -5,8 +5,7 @@ 信息平台 - - + From a72cbce9a150aeee763b916574d2faf62ed4b090 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 30 Jul 2018 13:52:39 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B6=85=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E9=BB=98=E8=AE=A4=E4=B8=8D=E8=AE=BE=E7=BD=AE=E8=B7=9F?= =?UTF-8?q?=E8=B8=AA=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/header.php | 2 +- js/kindeditor/kindeditor.js | 2 +- js/kindeditor/plugins/link/link.js | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 1bf173bc..664cc98d 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -6,7 +6,7 @@ 信息平台 - +