From fb0bce8d5cd1f119e00c46fa408b8a25207b354b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Fri, 12 Oct 2018 10:19:24 +0800 Subject: [PATCH 001/222] =?UTF-8?q?CT=E7=9A=84AMP=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/libraries/Amplib.php | 1 - .../htmlcompressor/controllers/index.php | 2 +- .../htmlcompressor/views/amp-template/ct.php | 236 ++++++++++++++++++ 3 files changed, 237 insertions(+), 2 deletions(-) create mode 100644 application/third_party/htmlcompressor/views/amp-template/ct.php diff --git a/application/libraries/Amplib.php b/application/libraries/Amplib.php index 5630d27b..e2551eb8 100644 --- a/application/libraries/Amplib.php +++ b/application/libraries/Amplib.php @@ -59,7 +59,6 @@ class Amplib { $websitehost = $this->CI->config->item('site_url'); $html_source_url = $this->CI->config->item('site_url') . $data['information']->ic_url; } - //获取网页当前源码，然后发送到信息平台 $html_source = GET_HTTP($html_source_url); if (!empty($html_source)) { diff --git a/application/third_party/htmlcompressor/controllers/index.php b/application/third_party/htmlcompressor/controllers/index.php index 999907c2..376836fa 100644 --- a/application/third_party/htmlcompressor/controllers/index.php +++ b/application/third_party/htmlcompressor/controllers/index.php @@ -157,7 +157,7 @@ class Index extends CI_Controller } if (substr($url, 0, 2) == '//') { //https或http - return urldecode(str_replace('//', 'https://', $url)); + return urldecode('https://'.substr($url, 2, strlen($url)-2)); //只替换开头的//，部分url不规范，有//在url中间 } return urldecode($host . $url); diff --git a/application/third_party/htmlcompressor/views/amp-template/ct.php b/application/third_party/htmlcompressor/views/amp-template/ct.php new file mode 100644 index 00000000..687125fe --- /dev/null +++ b/application/third_party/htmlcompressor/views/amp-template/ct.php @@ -0,0 +1,236 @@ + + + + +<!--@TITLE@--> + + + + + + + + + + + + + + + +
+
China Travel ® CUSTOMIZE
+
+ + +
+
✕
+
+ + + + + + + + + + + + + \ No newline at end of file From e20588a9dfcc43ee6ec945c695d7389d8b31b903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Fri, 12 Oct 2018 14:15:47 +0800 Subject: [PATCH 002/222] =?UTF-8?q?ct=E7=9A=84amp=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/htmlcompressor/views/amp-template/ct.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/ct.php b/application/third_party/htmlcompressor/views/amp-template/ct.php index 687125fe..c5048912 100644 --- a/application/third_party/htmlcompressor/views/amp-template/ct.php +++ b/application/third_party/htmlcompressor/views/amp-template/ct.php @@ -3,19 +3,17 @@ <!--@TITLE@--> - - + @@ -209,6 +207,7 @@ footer p { margin-bottom:0.5rem;} +

Contact us | About us

From 26819f4e345988f99ec741495f131919fd905f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Fri, 12 Oct 2018 16:40:57 +0800 Subject: [PATCH 003/222] =?UTF-8?q?=E6=96=B0=E5=A2=9ECT=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B9=B3=E5=8F=B0AMP=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/CT_AMP_Loader.php | 51 +++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 application/controllers/CT_AMP_Loader.php diff --git a/application/controllers/CT_AMP_Loader.php b/application/controllers/CT_AMP_Loader.php new file mode 100644 index 00000000..1925477d --- /dev/null +++ b/application/controllers/CT_AMP_Loader.php @@ -0,0 +1,51 @@ +load->model('information_model'); + $this->load->model('infoMetas_model'); + $this->load->library('Tags_analysis'); + } + + // http://localhost:8002/guide-use.php/amp_loader/test/?info_url=/yangtzecruise/ + /** + * 加载已经发布的页面 + */ + public function load() { + $info_url = $this->input->get_post('info_url'); + $information_detail = $this->information_model->get_by_url($info_url); + $ic_id = $information_detail->ic_id; + $meta_amp_status = $this->InfoMetas_model->get($ic_id, 'AMP_STATUS'); + if ($meta_amp_status) { + $meta_amp_html = $this->InfoMetas_model->get($ic_id, 'AMP'); + $include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); + echo $include_price_html; + } else { + header('HTTP/1.1 404 Not Found'); + header("status: 404 Not Found"); + show_404(); + exit; + } + } + + // http://localhost:8002/guide-use.php/amp_loader/test/?info_url=/yangtzecruise/ + /** + * 测试保存的页面 + */ + public function test() { + $info_url = $this->input->get_post('info_url'); + $information_detail = $this->information_model->get_by_url($info_url); + if (empty($information_detail)) { + echo $info_url.'没有信息类型'; + } + $ic_id = $information_detail->ic_id; + $meta_amp_html = $this->InfoMetas_model->get($ic_id, 'AMP'); + $include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); + echo $include_price_html; + } +} From 214697e30cb235dbdbccb18305cca50a106fccc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 15 Oct 2018 09:54:50 +0800 Subject: [PATCH 004/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0ct=5Fget=5Fby=5Furl?= =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=88=E6=A0=B9=E6=8D=AEURL=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BF=A1=E6=81=AF=E5=86=85=E5=AE=B9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/models/information_model.php | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/application/models/information_model.php b/application/models/information_model.php index aa164191..6edf6873 100644 --- a/application/models/information_model.php +++ b/application/models/information_model.php @@ -359,4 +359,54 @@ class Information_model extends CI_Model { return $query->result(); } + + //ct + function ct_get_by_url($ic_url,$webcode) + { + $this->ic_url_is_id=" AND ic.ic_url = N".$this->HT->escape($ic_url); + $sql = "SELECT is1.is_id, \n" + . " is1.is_parent_id, \n" + . " is1.is_path, \n" + . " is1.is_level, \n" + . " is1.is_sort, \n" + . " is1.is_sitecode, \n" + . " is1.is_datetime, \n" + . " is1.is_ic_id, \n" + . " ic.ic_id, \n" + . " ic.ic_url, \n" + . " ic.ic_url_title, \n" + . " ic.ic_type, \n" + . " ic.ic_title, \n" + . " ic.ic_content, \n" + . " ic.ic_summary, \n" + . " ic.ic_seo_title, \n" + . " ic.ic_seo_description, \n" + . " ic.ic_seo_keywords, \n" + . " ic.ic_show_bread_crumbs, \n" + . " ic.ic_status, \n" + . " ic.ic_template, \n" + . " ic.ic_photo, \n" + . " ic.ic_photo_width, \n" + . " ic.ic_photo_height, \n" + . " ic.ic_sitecode, \n" + . " ic.ic_recommend_tours, \n" + . " ic.ic_recommend_packages, \n" + . " ic.ic_datetime, \n" + . " ic.ic_ht_area_id, \n" + . " ic.ic_ht_area_type, \n" + . " ic.ic_ht_product_id, \n" + . " ic.ic_ht_product_type, \n" + . " ic.ic_author \n" + . " FROM infoStructures is1 \n" + . " INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n" + . " AND ic.ic_sitecode = is1.is_sitecode \n" + . " WHERE ic.ic_type <> 'none' and is1.is_sitecode = ? "; + $sql .= $this->ic_url_is_id; + $query = $this->HT->query($sql, $webcode); + // print_r($this->HT->queries); + + return $query->row(); + } + + } From 4720088acdc0c9939bdadf1b28cc2adda715ed73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 15 Oct 2018 10:02:25 +0800 Subject: [PATCH 005/222] =?UTF-8?q?ct=5Fget=5Fby=5Furl=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8CT=E6=96=B0=E7=9A=84=E5=87=BD=E6=95=B0=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96=E4=BF=A1=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/CT_AMP_Loader.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/application/controllers/CT_AMP_Loader.php b/application/controllers/CT_AMP_Loader.php index 1925477d..bda8aa02 100644 --- a/application/controllers/CT_AMP_Loader.php +++ b/application/controllers/CT_AMP_Loader.php @@ -3,7 +3,7 @@ if (!defined('BASEPATH')) { exit('No direct script access allowed'); } -class Amp_Loader extends CI_Controller { +class CT_Amp_Loader extends CI_Controller { function __construct() { parent::__construct(); @@ -18,13 +18,17 @@ class Amp_Loader extends CI_Controller { */ public function load() { $info_url = $this->input->get_post('info_url'); - $information_detail = $this->information_model->get_by_url($info_url); + $webcode = $this->input->get_post('webcode'); + if(!isset($webcode) ) { + $webcode="ct"; + } + $information_detail = $this->information_model->ct_get_by_url($info_url, $webcode); $ic_id = $information_detail->ic_id; $meta_amp_status = $this->InfoMetas_model->get($ic_id, 'AMP_STATUS'); if ($meta_amp_status) { $meta_amp_html = $this->InfoMetas_model->get($ic_id, 'AMP'); - $include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); - echo $include_price_html; + //$include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); + echo $meta_amp_html; } else { header('HTTP/1.1 404 Not Found'); header("status: 404 Not Found"); @@ -39,13 +43,13 @@ class Amp_Loader extends CI_Controller { */ public function test() { $info_url = $this->input->get_post('info_url'); - $information_detail = $this->information_model->get_by_url($info_url); + $information_detail = $this->information_model->ct_get_by_url($info_url, "ct"); if (empty($information_detail)) { echo $info_url.'没有信息类型'; } $ic_id = $information_detail->ic_id; $meta_amp_html = $this->InfoMetas_model->get($ic_id, 'AMP'); - $include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); - echo $include_price_html; + //$include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); + echo $meta_amp_html; } } From 42a2aa171a28854f80ee515c389752adad1094f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 15 Oct 2018 10:08:14 +0800 Subject: [PATCH 006/222] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84Tags=5Fanalysis=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/CT_AMP_Loader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/CT_AMP_Loader.php b/application/controllers/CT_AMP_Loader.php index bda8aa02..099537fe 100644 --- a/application/controllers/CT_AMP_Loader.php +++ b/application/controllers/CT_AMP_Loader.php @@ -9,7 +9,7 @@ class CT_Amp_Loader extends CI_Controller { parent::__construct(); $this->load->model('information_model'); $this->load->model('infoMetas_model'); - $this->load->library('Tags_analysis'); + //$this->load->library('Tags_analysis'); } // http://localhost:8002/guide-use.php/amp_loader/test/?info_url=/yangtzecruise/ From 9ac162c73e3992ec1c276b583b7a466062e46aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 15 Oct 2018 11:02:20 +0800 Subject: [PATCH 007/222] =?UTF-8?q?=E8=AF=BB=E5=8F=96CT=E7=9A=84AMP?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E6=9C=AC=E5=9C=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/CT_AMP_Loader.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/application/controllers/CT_AMP_Loader.php b/application/controllers/CT_AMP_Loader.php index 099537fe..27ba257b 100644 --- a/application/controllers/CT_AMP_Loader.php +++ b/application/controllers/CT_AMP_Loader.php @@ -8,7 +8,7 @@ class CT_Amp_Loader extends CI_Controller { function __construct() { parent::__construct(); $this->load->model('information_model'); - $this->load->model('infoMetas_model'); + $this->load->model('InfoMetas_model'); //$this->load->library('Tags_analysis'); } @@ -22,6 +22,9 @@ class CT_Amp_Loader extends CI_Controller { if(!isset($webcode) ) { $webcode="ct"; } + // $info_url="/yangtzecruise/"; + // $webcode="cht"; + $information_detail = $this->information_model->ct_get_by_url($info_url, $webcode); $ic_id = $information_detail->ic_id; $meta_amp_status = $this->InfoMetas_model->get($ic_id, 'AMP_STATUS'); @@ -42,8 +45,9 @@ class CT_Amp_Loader extends CI_Controller { * 测试保存的页面 */ public function test() { - $info_url = $this->input->get_post('info_url'); - $information_detail = $this->information_model->ct_get_by_url($info_url, "ct"); + // $info_url = $this->input->get_post('info_url'); + $info_url = "/yangtzecruise/"; + $information_detail = $this->information_model->ct_get_by_url($info_url, "cht"); if (empty($information_detail)) { echo $info_url.'没有信息类型'; } From eb641844f860a1b164a50260763ece1d2bb5ee3c Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 14:17:05 +0800 Subject: [PATCH 008/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 990f7f65..6abbcd44 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,6 +23,7 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); + $pc_html = $this->input->get_post('pc_html'); $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); @@ -36,6 +37,13 @@ class Info_amp extends CI_Controller } else { $this->InfoMetas_model->update($icid, 'AMP_BODY', $html); } + //pc_html + $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY_PC'); + if ($meta === false) { + $this->InfoMetas_model->add($icid, 'AMP_BODY_PC', $pc_html); + } else { + $this->InfoMetas_model->update($icid, 'AMP_BODY_PC', $pc_html); + } //json $meta = $this->InfoMetas_model->get($icid, 'AMP_JSON'); if ($meta === false) { From 9f191846d7938cec481a659e46acbd7e87677400 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 14:31:39 +0800 Subject: [PATCH 009/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 6abbcd44..539b7bac 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,7 +23,7 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->get_post('pc_html'); + $pc_html = $this->input->get_post('pc_html') || ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From aa63f3548fc89516b1a852f97a0988e6c0b71f7c Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 14:33:07 +0800 Subject: [PATCH 010/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 539b7bac..d40b4b52 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,7 +23,8 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->get_post('pc_html') || ''; + $pc_html = $this->input->get_post('pc_html'); + if ($pc_html == 0) $pc_html = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From b6ba292b830b396436d9d30db91de87985fafd48 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:03:08 +0800 Subject: [PATCH 011/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index d40b4b52..8fdb3016 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,7 +24,7 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->get_post('pc_html'); - if ($pc_html == 0) $pc_html = ''; + if ($pc_html == 0) $pc_html = 'error'; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 1e4f63a72a1900288e614b45038e41f7b3eb0177 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:39:36 +0800 Subject: [PATCH 012/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 8fdb3016..1a41ade6 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,7 +23,7 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->get_post('pc_html'); + $pc_html = $this->input->post_get('pc_html', false); if ($pc_html == 0) $pc_html = 'error'; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); From 4ca2be8fb891e921f790ff0b41c96041913f4939 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:41:01 +0800 Subject: [PATCH 013/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 1a41ade6..5c25a9fa 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,7 +23,7 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->post_get('pc_html', false); + $pc_html = $this->input->post('pc_html', FALSE); if ($pc_html == 0) $pc_html = 'error'; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); From bc746ac6db255a323a4fa0d2c44a308f9928b9e2 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:43:22 +0800 Subject: [PATCH 014/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 5c25a9fa..54a446cf 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,7 +24,10 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html', FALSE); - if ($pc_html == 0) $pc_html = 'error'; + if ($pc_html == 0) { + die($_POST['pc_html']); + $pc_html = 'error'; + } $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 0843c6459d2e96aa93213d9f4aac125c10357f24 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:45:15 +0800 Subject: [PATCH 015/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 54a446cf..7093e426 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -25,7 +25,8 @@ class Info_amp extends CI_Controller $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html', FALSE); if ($pc_html == 0) { - die($_POST['pc_html']); + //die($_POST['pc_html']); + echo $pc_html; $pc_html = 'error'; } $css = $this->input->get_post('css'); From e1f2247fa546e95cbf4dca50ddef77db7e648f9b Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:46:42 +0800 Subject: [PATCH 016/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 7093e426..4df3038a 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,9 +24,10 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html', FALSE); + echo $pc_html; if ($pc_html == 0) { //die($_POST['pc_html']); - echo $pc_html; + //echo $pc_html; $pc_html = 'error'; } $css = $this->input->get_post('css'); From 0d800bb5d6f11ab7a7e01423c539b869bf78df50 Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 17 Oct 2018 15:48:04 +0800 Subject: [PATCH 017/222] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=94=E7=89=9B?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tuniu/controllers/tuniu_train.php | 33 +++++++++++-------- .../tuniu/helpers/tuniu_helper.php | 4 +-- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/application/third_party/tuniu/controllers/tuniu_train.php b/application/third_party/tuniu/controllers/tuniu_train.php index 559fba16..79e251e3 100644 --- a/application/third_party/tuniu/controllers/tuniu_train.php +++ b/application/third_party/tuniu/controllers/tuniu_train.php @@ -59,27 +59,38 @@ class Tuniu_train extends CI_Controller{ "sign": "'.$sign.'", "timestamp": "'.$time.'", "data": { "trainDate": "'.$date.'", "fromStation": "'.$fromStation.'", "toStation": "'.$toStation.'", "trainCode": "" } - }'; + }'; + //设置请求接口时间 + $api_start_time = microtime(true); + $back_data = post_tuniu($url,$post_data,$method = 'POST'); + $back_data = null; + //接口结束时间 + $api_end_time = microtime(true); + + //计算响应时间 + $api_responsive_time = $api_end_time - $api_start_time; - log_message('error','tuniutrain 原始数据:'.$back_data); - //print_r(json_decode($back_data));die(); - //$log_info = ''; + if(!empty($back_data)){ + $tn_info = json_decode($back_data); + $retrun_code = $tn_info->returnCode; + $return_msg = $tn_info->errorMsg; + }else{ + $retrun_code = '404'; + $return_msg = '途牛接口未响应'; + } + //记录数据格式 |出发站|到达站|发车时间|接口响应时间|接口返回代码|接口返回信息 + log_message('error','tuniutrain|'.$fromStation.'|'.$toStation.'|'.$date.'|'.$api_responsive_time.'|'.$retrun_code.'|'.$return_msg); - $tn_info = json_decode($back_data); - $retrun_code = $tn_info->returnCode; - $return_msg = $tn_info->errorMsg; if(isset($tn_info->data)){ if(empty(json_decode($back_data)->data)){ $isCache = true; - //$log_info = 'tuniutrain data缺失|数据源:'.$fromStation.'|'.$toStation.'|'.$date.'|retrun_code:'.$retrun_code.'|return_msg:'.$return_msg; }else{ $this->tuniuprice_model->addOrUpdate($fromStation,$toStation,$back_data); } }else{ $isCache = true; - //$log_info = 'tuniutrain 接口未响应|数据源:'.$fromStation.'|'.$toStation.'|'.$date.'|retrun_code:'.$retrun_code.'|return_msg:'.$return_msg; } if($isCache){ @@ -90,12 +101,8 @@ class Tuniu_train extends CI_Controller{ if(!empty($trainCache)){ $back_data = $trainCache->tpc_content; $isCache = true; - //$log_info .= '|调用缓存'; - //log_message('error',$log_info); }else{ $back_data = null; - //$log_info .= '|缓存为空'; - //log_message('error',$log_info); } } } diff --git a/application/third_party/tuniu/helpers/tuniu_helper.php b/application/third_party/tuniu/helpers/tuniu_helper.php index eb76527d..55a44a9c 100644 --- a/application/third_party/tuniu/helpers/tuniu_helper.php +++ b/application/third_party/tuniu/helpers/tuniu_helper.php @@ -44,8 +44,8 @@ curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包 curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type:application/json')); } - curl_setopt($curl, CURLOPT_TIMEOUT, 25); // 设置超时限制防止死循环 - curl_setopt($curl, CURLOPT_TIMEOUT_MS, 25000); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_TIMEOUT, 40); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_TIMEOUT_MS, 40000); // 设置超时限制防止死循环 curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容 curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 $tmpInfo = curl_exec($curl); // 执行操作 From f9d0ebb0a69a8735dc615b18b7771b96420214e7 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:48:04 +0800 Subject: [PATCH 018/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 4df3038a..566422fd 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,11 +24,10 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html', FALSE); - echo $pc_html; - if ($pc_html == 0) { + if (!$pc_html) { //die($_POST['pc_html']); //echo $pc_html; - $pc_html = 'error'; + $pc_html = 'error2'; } $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); From f259c1b45a0ba63c345b52a07ee1c232120f1e28 Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 17 Oct 2018 15:50:15 +0800 Subject: [PATCH 019/222] =?UTF-8?q?=E6=B3=A8=E9=87=8A=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/third_party/tuniu/controllers/tuniu_train.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/tuniu/controllers/tuniu_train.php b/application/third_party/tuniu/controllers/tuniu_train.php index 79e251e3..56556403 100644 --- a/application/third_party/tuniu/controllers/tuniu_train.php +++ b/application/third_party/tuniu/controllers/tuniu_train.php @@ -64,7 +64,7 @@ class Tuniu_train extends CI_Controller{ $api_start_time = microtime(true); $back_data = post_tuniu($url,$post_data,$method = 'POST'); - $back_data = null; + //接口结束时间 $api_end_time = microtime(true); From 2053632e473385acff8110743ff42785a10a16e1 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 15:50:35 +0800 Subject: [PATCH 020/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 566422fd..59f26796 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,11 +24,7 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html', FALSE); - if (!$pc_html) { - //die($_POST['pc_html']); - //echo $pc_html; - $pc_html = 'error2'; - } + if (!$pc_html) $pc_html = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 5412d185a08959bb2433cc5fae40410eb7b8e629 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Wed, 17 Oct 2018 16:01:11 +0800 Subject: [PATCH 021/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0PC=20AMP=20BODY=20|?= =?UTF-8?q?=20fix=207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 59f26796..3fd6f024 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,7 +24,7 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html', FALSE); - if (!$pc_html) $pc_html = ''; + if ($pc_html==0) $pc_html = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From a3380a68c953bf11700aff2fd43d31b57d7e7097 Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 17 Oct 2018 16:32:02 +0800 Subject: [PATCH 022/222] =?UTF-8?q?=E9=80=94=E7=89=9B=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=B0=E5=BD=95=E7=BC=93=E5=AD=98=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tuniu/controllers/tuniu_train.php | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/application/third_party/tuniu/controllers/tuniu_train.php b/application/third_party/tuniu/controllers/tuniu_train.php index 56556403..c8f64aeb 100644 --- a/application/third_party/tuniu/controllers/tuniu_train.php +++ b/application/third_party/tuniu/controllers/tuniu_train.php @@ -64,7 +64,7 @@ class Tuniu_train extends CI_Controller{ $api_start_time = microtime(true); $back_data = post_tuniu($url,$post_data,$method = 'POST'); - + $back_data = null; //接口结束时间 $api_end_time = microtime(true); @@ -79,9 +79,6 @@ class Tuniu_train extends CI_Controller{ $retrun_code = '404'; $return_msg = '途牛接口未响应'; } - //记录数据格式 |出发站|到达站|发车时间|接口响应时间|接口返回代码|接口返回信息 - log_message('error','tuniutrain|'.$fromStation.'|'.$toStation.'|'.$date.'|'.$api_responsive_time.'|'.$retrun_code.'|'.$return_msg); - if(isset($tn_info->data)){ if(empty(json_decode($back_data)->data)){ @@ -100,13 +97,23 @@ class Tuniu_train extends CI_Controller{ $trainCache = $this->tuniuprice_model->get_train_cache($fromStation,$toStation); if(!empty($trainCache)){ $back_data = $trainCache->tpc_content; - $isCache = true; + $cachedata = true; }else{ $back_data = null; + $cachedata = false; } } } + if($cachedata){ + $cacheuse = '使用缓存'; + }else{ + $cacheuse = '缓存为空'; + } + + //记录数据格式 |出发站|到达站|发车时间|接口响应时间|接口返回代码|接口返回信息|是否调用缓存 + log_message('error','tuniutrain|'.$fromStation.'|'.$toStation.'|'.$date.'|'.$api_responsive_time.'|'.$retrun_code.'|'.$return_msg.'|'.$cacheuse); + //途牛数据格式转换 $return_data = new stdClass(); $return_data->httpstatus = 200; From 63fdde7f74c0dd12b4a7a23994042e7839bcdeb0 Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 17 Oct 2018 16:35:03 +0800 Subject: [PATCH 023/222] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/tuniu/controllers/tuniu_train.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/third_party/tuniu/controllers/tuniu_train.php b/application/third_party/tuniu/controllers/tuniu_train.php index c8f64aeb..5dcdecb0 100644 --- a/application/third_party/tuniu/controllers/tuniu_train.php +++ b/application/third_party/tuniu/controllers/tuniu_train.php @@ -43,6 +43,7 @@ class Tuniu_train extends CI_Controller{ //做超过预售期的处理查询 $isCache = false; $iseven = false; + $cachedata = false; $now_time = time(); $differ = (strtotime($date) - $now_time) / 86400; if($differ > 29){ @@ -64,7 +65,7 @@ class Tuniu_train extends CI_Controller{ $api_start_time = microtime(true); $back_data = post_tuniu($url,$post_data,$method = 'POST'); - $back_data = null; + //$back_data = null; //接口结束时间 $api_end_time = microtime(true); From f4e548f22b7d69a6e8fae84c9cc049a9b798f436 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Thu, 18 Oct 2018 15:27:43 +0800 Subject: [PATCH 024/222] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A7=E7=89=88?= =?UTF-8?q?=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 7b6b12c5..6832d846 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -2,10 +2,7 @@ +
+
+ - //添加绑定景点 - function add_landscape(area_id, lsi_sn) { - var urlReQuery = ""; - $.ajax({ - type: "get", - url: urlReQuery + '/' + area_id + '/' + lsi_sn, - success: function (data, textStatus) { - var dataArray = $.parseJSON(data);//JSON.parse(data); - for (var key in dataArray) { - if (dataArray[key].name == 'ok') { - window.location.href = dataArray[key].value; - return true; - } else if (dataArray[key].name == 'no') { - $.modaldialog.error(dataArray[key].value); - return false; - } +
+ +
+ +
+ + + +
+
+
+
+ +
+
+ session->userdata('session_admin'); + $show_photo_meta = get_meta($information->ic_id, 'meta_use_list_picture'); + $amp_photo = ''; + if ($information->ic_photo && $show_photo_meta !== 'no') { + $amp_photo = $this->config->item('site_image_url') . $information->ic_photo; } - }, - error: function () { - $.modaldialog.error('发生错误，请联系YCC'); - return false; - } - }); - } + $amp_build_url = "/amp_app/?icid=" . $information->ic_id . "&is_path=" . $information->is_path . "&usr=" . urlencode($amp_user['OPI_Name']) . "&url=" . urlencode($information->ic_url) . "&photo=" . urlencode($amp_photo) . "&site=" . urlencode($this->config->item('site_url')) . "&imgurl=" . urlencode($this->config->item('site_image_url')); + ?> + + + | + | + + + amp_status === '1') { ?> + + + amp_status === '2') { ?> + + + amp_status === '0') { ?> + + +
+
+ +
+
+
+
+
+
链接标题
+ +
+
+
+
链接地址 + + + ic_sitecode == 'cht') { ?> + + + ic_sitecode == 'gm') { ?> + + +
+ +
+
+ + - +
+
+ + + + + + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + + - //跳转到前台页面 - function goto_page() { - var site_url = 'config->item('site_url') ?>'; - $('#goto_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } +
+
+ + +
+
+ + +
+
+ + +
- //跳转到测试页面 - function goto_test_page() { - var site_url = 'http://192.155.224.195:8080/guide-use.php/travelguide/guide/?static_html_url='; - $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } - //德语站点跳转测试页面 - function goto_gmtest_page() { - var site_url = 'http://gm.test/gm.php/information/detail/?static_html_url='; - $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } - function goto_test_page_pgr() { - var site_url = 'http://192.155.250.125:8011/guide.php/travelguide/guide/?static_html_url='; - $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); - return true; - } +
+ + +
+
+ + + + + + + + + + + + + + + + + +

+
+ +
+ +
From 6237e3c41940bc90ff6a4a296115126ba6454fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Thu, 18 Oct 2018 16:34:09 +0800 Subject: [PATCH 026/222] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tour_map/controllers/index.php | 20 ++ .../third_party/tour_map/views/welcome.php | 198 ++++++++++++++++++ css/images/car.png | Bin 0 -> 3243 bytes css/images/plane.png | Bin 0 -> 3345 bytes css/images/ship.png | Bin 0 -> 3189 bytes css/images/train.png | Bin 0 -> 2973 bytes 6 files changed, 218 insertions(+) create mode 100644 application/third_party/tour_map/controllers/index.php create mode 100644 application/third_party/tour_map/views/welcome.php create mode 100644 css/images/car.png create mode 100644 css/images/plane.png create mode 100644 css/images/ship.png create mode 100644 css/images/train.png diff --git a/application/third_party/tour_map/controllers/index.php b/application/third_party/tour_map/controllers/index.php new file mode 100644 index 00000000..f3a5aeb3 --- /dev/null +++ b/application/third_party/tour_map/controllers/index.php @@ -0,0 +1,20 @@ +load->view('welcome'); + } + + +} \ No newline at end of file diff --git a/application/third_party/tour_map/views/welcome.php b/application/third_party/tour_map/views/welcome.php new file mode 100644 index 00000000..7645abaf --- /dev/null +++ b/application/third_party/tour_map/views/welcome.php @@ -0,0 +1,198 @@ + + + + + + + + + 简单路径 + + + + + + + + + + + +'Beijing','start_lng'=>'116.41667','start_lat'=>'39.91667','end'=>'Xian','end_lng'=>'108.95000','end_lat'=>'34.26667','traffic'=>'2','memo'=>'G87'); +$tour[]=array('start'=>'Xian','start_lng'=>'108.95000','start_lat'=>'34.26667','end'=>'Guilin','end_lng'=>'110.290247','end_lat'=>'25.273915','traffic'=>'3','memo'=>'CA1225'); +$tour[]=array('start'=>'Guilin','start_lng'=>'110.290247','start_lat'=>'25.273915','end'=>'Longsheng','end_lng'=>'110.648739','end_lat'=>'24.828426','traffic'=>'5','memo'=>''); +$tour[]=array('start'=>'Longsheng','start_lng'=>'110.648739','start_lat'=>'24.828426','end'=>'Guilin','end_lng'=>'110.290247','end_lat'=>'25.273915','traffic'=>'5','memo'=>''); +$tour[]=array('start'=>'Guilin','start_lng'=>'110.290247','start_lat'=>'25.273915','end'=>'Yangshuo','end_lng'=>'110.496593','end_lat'=>'24.778481','traffic'=>'5','memo'=>''); +$tour[]=array('start'=>'Yangshuo','start_lng'=>'110.496593','start_lat'=>'24.778481','end'=>'Guilin','end_lng'=>'110.290247','end_lat'=>'25.273915','traffic'=>'5','memo'=>''); +$tour[]=array('start'=>'Guilin','start_lng'=>'110.290247','start_lat'=>'25.273915','end'=>'Shanghai','end_lng'=>'121.473658','end_lat'=>'31.230378','traffic'=>'3','memo'=>'FM9350'); + ?> +
+ + + + + + \ No newline at end of file diff --git a/css/images/car.png b/css/images/car.png new file mode 100644 index 0000000000000000000000000000000000000000..44317ea711247e2b8cc31a93987da88c2f4d74dc GIT binary patch literal 3243 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 literal 0 HcmV?d00001 diff --git a/css/images/plane.png b/css/images/plane.png new file mode 100644 index 0000000000000000000000000000000000000000..bd3857f84b668f6fbe1b819c062a2653168acc03 GIT binary patch literal 3345 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 b+P?t+K#^$0i?jS500000NkvXXu0mjfV!>Pb literal 0 HcmV?d00001 diff --git a/css/images/ship.png b/css/images/ship.png new file mode 100644 index 0000000000000000000000000000000000000000..0ffe94f05d11dba840ce3d269430b5eca4baf5ef GIT binary patch literal 3189 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 basD>|PZv+sbZa~_00000NkvXXu0mjfd!+;y literal 0 HcmV?d00001 diff --git a/css/images/train.png b/css/images/train.png new file mode 100644 index 0000000000000000000000000000000000000000..f871d0f0bfe5b1c2e36a738fc89bae0a06c6138d GIT binary patch literal 2973 zcmV;O3u5$%P)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z0Ln>3K~#9!?A5UeLNO44;XnF7un+{BfCJb$gQI6`&_{) zHczndFcOnP%t4A=NbW0giE+*$#mQPcq6-{=Su?)@D_{>efU>TQw7ErC6u|MRI6w#3 z_#O}n*a6cQ`F<+EGH`z|01ZH;38;Xz7U1i}KLJE3?h9DND((a50b9*3m;(b%K&kx> zjAH|eH|s+oKLIW&0Bs?Eetfl>e}T~kkO6-Uu)ruq8%l9)M!o|XkO3L+`+)lZ5?vSw Ta)EVW00000NkvXXu0mjfq+^+e literal 0 HcmV?d00001 From 0c5924cebbd9b1d2b500a07b5007fca83fbc3bf6 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 09:15:53 +0800 Subject: [PATCH 027/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AMP=5FBODY=5FPC=5FSTA?= =?UTF-8?q?TUS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index fdebbf9a..f1f8f85d 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -538,17 +538,25 @@ } $amp_build_url = "/amp_app/?icid=" . $information->ic_id . "&is_path=" . $information->is_path . "&usr=" . urlencode($amp_user['OPI_Name']) . "&url=" . urlencode($information->ic_url) . "&photo=" . urlencode($amp_photo) . "&site=" . urlencode($this->config->item('site_url')) . "&imgurl=" . urlencode($this->config->item('site_image_url')); ?> - + ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { + $PcAmpChecked = 'checked'; + } else { + $PcAmpChecked = ''; + } + ?> | | From 9dccffe3edc975295b2235b5e0c25c306d9ce2ef Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 09:42:21 +0800 Subject: [PATCH 028/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AMP=5FBODY=5FPC=5FSTA?= =?UTF-8?q?TUS=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 3fd6f024..e205b625 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,8 +23,8 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->post('pc_html', FALSE); - if ($pc_html==0) $pc_html = ''; + $pc_html = $this->input->post('pc_html'); + if ($pc_html) echo $pc_html;; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 5673597b121592171e9baf00069aac774f36df2c Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 09:45:28 +0800 Subject: [PATCH 029/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AMP=5FBODY=5FPC=5FSTA?= =?UTF-8?q?TUS=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index e205b625..583c899b 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,7 +24,7 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html'); - if ($pc_html) echo $pc_html;; + //if ($pc_html) echo $pc_html; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); @@ -40,7 +40,7 @@ class Info_amp extends CI_Controller } //pc_html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY_PC'); - if ($meta === false) { + if (empty($meta)) { $this->InfoMetas_model->add($icid, 'AMP_BODY_PC', $pc_html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY_PC', $pc_html); From cf47d57c64cc7770fc6fd4b0240824f9b84d63c1 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 09:47:37 +0800 Subject: [PATCH 030/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AMP=5FBODY=5FPC=5FSTA?= =?UTF-8?q?TUS=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 583c899b..a7f620db 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -33,7 +33,7 @@ class Info_amp extends CI_Controller try { //html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY'); - if ($meta === false) { + if (empty($meta)) { $this->InfoMetas_model->add($icid, 'AMP_BODY', $html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY', $html); @@ -47,35 +47,35 @@ class Info_amp extends CI_Controller } //json $meta = $this->InfoMetas_model->get($icid, 'AMP_JSON'); - if ($meta === false) { + if (empty($meta)) { $this->InfoMetas_model->add($icid, 'AMP_JSON', $json); } else { $this->InfoMetas_model->update($icid, 'AMP_JSON', $json); } //css $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS'); - if ($meta === false) { + if (empty($meta)) { $this->InfoMetas_model->add($icid, 'AMP_CSS', $css); } else { $this->InfoMetas_model->update($icid, 'AMP_CSS', $css); } //script $meta = $this->InfoMetas_model->get($icid, 'AMP_SCRIPT'); - if ($meta === false) { + if (empty($meta)) { $this->InfoMetas_model->add($icid, 'AMP_SCRIPT', $script); } else { $this->InfoMetas_model->update($icid, 'AMP_SCRIPT', $script); } //schema $meta = $this->InfoMetas_model->get($icid, 'AMP_SCHEMA'); - if ($meta === false) { + if (empty($meta)) { $this->InfoMetas_model->add($icid, 'AMP_SCHEMA', $schema); } else { $this->InfoMetas_model->update($icid, 'AMP_SCHEMA', $schema); } //status $meta = $this->InfoMetas_model->get($icid, 'AMP_STATUS'); - if ($meta === false) { + if (empty($meta)) { $this->InfoMetas_model->add($icid, 'AMP_STATUS', $status); } else { $this->InfoMetas_model->update($icid, 'AMP_STATUS', $status); From 35cf1a4d035f518a96b83a8880e1f18ff162472c Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 10:07:50 +0800 Subject: [PATCH 031/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AMP=5FBODY=5FPC=5FSTA?= =?UTF-8?q?TUS=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index f1f8f85d..0fdb7525 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1284,7 +1284,7 @@ } ; //保存增加AMP判断 - lmr - ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS')) { ?> + ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') { ?> var amp_confirm = window.confirm('\n检测到页面存在AMP版本，是否需要打开AMP编辑界面？\n\r注意：如果修改了PC端版本，那么同时也需要修改AMP版本。\n'); if (amp_confirm) { window.open('', '_blank'); From 39a6fba79d3c1dc8fe1b9c56c4ae0a18c2b9e6e8 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 11:33:31 +0800 Subject: [PATCH 032/222] =?UTF-8?q?=E5=A2=9E=E5=8A=A0AMP=5FBODY=5FPC=5FSTA?= =?UTF-8?q?TUS=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index a7f620db..3e2c4470 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,7 +24,7 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html'); - //if ($pc_html) echo $pc_html; + if ($pc_html == 0) $pc_html = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 61a86b10c13615b616425665eabd676209815eb5 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 11:48:24 +0800 Subject: [PATCH 033/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 3e2c4470..01b3b437 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -25,6 +25,8 @@ class Info_amp extends CI_Controller $html = $this->input->get_post('html'); $pc_html = $this->input->post('pc_html'); if ($pc_html == 0) $pc_html = ''; + $pc_css = $this->input->post('pc_css'); + if ($pc_css == 0) $pc_css = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); @@ -45,6 +47,13 @@ class Info_amp extends CI_Controller } else { $this->InfoMetas_model->update($icid, 'AMP_BODY_PC', $pc_html); } + //pc_css + $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS_PC'); + if (empty($meta)) { + $this->InfoMetas_model->add($icid, 'AMP_CSS_PC', $pc_css); + } else { + $this->InfoMetas_model->update($icid, 'AMP_CSS_PC', $pc_css); + } //json $meta = $this->InfoMetas_model->get($icid, 'AMP_JSON'); if (empty($meta)) { From 5964a211563ad51747d1f47109b6a6bb86cf15ce Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 11:54:13 +0800 Subject: [PATCH 034/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 01b3b437..ae546474 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -35,56 +35,56 @@ class Info_amp extends CI_Controller try { //html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_BODY', $html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY', $html); } //pc_html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY_PC'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_BODY_PC', $pc_html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY_PC', $pc_html); } //pc_css $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS_PC'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_CSS_PC', $pc_css); } else { $this->InfoMetas_model->update($icid, 'AMP_CSS_PC', $pc_css); } //json $meta = $this->InfoMetas_model->get($icid, 'AMP_JSON'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_JSON', $json); } else { $this->InfoMetas_model->update($icid, 'AMP_JSON', $json); } //css $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_CSS', $css); } else { $this->InfoMetas_model->update($icid, 'AMP_CSS', $css); } //script $meta = $this->InfoMetas_model->get($icid, 'AMP_SCRIPT'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCRIPT', $script); } else { $this->InfoMetas_model->update($icid, 'AMP_SCRIPT', $script); } //schema $meta = $this->InfoMetas_model->get($icid, 'AMP_SCHEMA'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCHEMA', $schema); } else { $this->InfoMetas_model->update($icid, 'AMP_SCHEMA', $schema); } //status $meta = $this->InfoMetas_model->get($icid, 'AMP_STATUS'); - if (empty($meta)) { + if ($meta == FALSE) { $this->InfoMetas_model->add($icid, 'AMP_STATUS', $status); } else { $this->InfoMetas_model->update($icid, 'AMP_STATUS', $status); From 97755c970f33c6a3ddf3875ef1b68d4191881ef8 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 11:59:22 +0800 Subject: [PATCH 035/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index ae546474..7dfa3d5c 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -35,56 +35,56 @@ class Info_amp extends CI_Controller try { //html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_BODY', $html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY', $html); } //pc_html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY_PC'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_BODY_PC', $pc_html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY_PC', $pc_html); } //pc_css $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS_PC'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_CSS_PC', $pc_css); } else { $this->InfoMetas_model->update($icid, 'AMP_CSS_PC', $pc_css); } //json $meta = $this->InfoMetas_model->get($icid, 'AMP_JSON'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_JSON', $json); } else { $this->InfoMetas_model->update($icid, 'AMP_JSON', $json); } //css $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_CSS', $css); } else { $this->InfoMetas_model->update($icid, 'AMP_CSS', $css); } //script $meta = $this->InfoMetas_model->get($icid, 'AMP_SCRIPT'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCRIPT', $script); } else { $this->InfoMetas_model->update($icid, 'AMP_SCRIPT', $script); } //schema $meta = $this->InfoMetas_model->get($icid, 'AMP_SCHEMA'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCHEMA', $schema); } else { $this->InfoMetas_model->update($icid, 'AMP_SCHEMA', $schema); } //status $meta = $this->InfoMetas_model->get($icid, 'AMP_STATUS'); - if ($meta == FALSE) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_STATUS', $status); } else { $this->InfoMetas_model->update($icid, 'AMP_STATUS', $status); From 87a7d18e4f53d59439d5c05d57fa4bf3e9c17744 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 12:12:35 +0800 Subject: [PATCH 036/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 7dfa3d5c..2ac24192 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,9 +23,9 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->post('pc_html'); + $pc_html = $this->input->post('pchtml'); if ($pc_html == 0) $pc_html = ''; - $pc_css = $this->input->post('pc_css'); + $pc_css = $this->input->post('pccss'); if ($pc_css == 0) $pc_css = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); From 05fb7facdd8a423d0872fb1a2bde2ffcf930ecbc Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 12:42:45 +0800 Subject: [PATCH 037/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 2ac24192..e50ab1a5 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,10 +23,8 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->post('pchtml'); - if ($pc_html == 0) $pc_html = ''; - $pc_css = $this->input->post('pccss'); - if ($pc_css == 0) $pc_css = ''; + $pc_html = $this->input->get_post('pchtml'); + $pc_css = $this->input->get_post('pccss'); $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From e01bed7d4901c282e500fd52a3735b6bb78c921e Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 12:53:20 +0800 Subject: [PATCH 038/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index e50ab1a5..618f80aa 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,7 +24,9 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->get_post('pchtml'); + if ($pc_html == 0) $pc_html = ''; $pc_css = $this->input->get_post('pccss'); + if ($pc_css == 0) $pc_css = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 6e042f0dce8aba7208e9e940429d3f18fcb25d37 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 12:57:36 +0800 Subject: [PATCH 039/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 618f80aa..f12842b6 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,9 +24,9 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->get_post('pchtml'); - if ($pc_html == 0) $pc_html = ''; + if ($pc_html === 0) $pc_html = ''; $pc_css = $this->input->get_post('pccss'); - if ($pc_css == 0) $pc_css = ''; + if ($pc_css === 0) $pc_css = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From f8976bd4b834f77846f43a3ea0daba7fbc14d223 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 13:00:40 +0800 Subject: [PATCH 040/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=205?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index f12842b6..2f35bbdb 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,9 +24,9 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->get_post('pchtml'); - if ($pc_html === 0) $pc_html = ''; + if (!$pc_html) $pc_html = ''; $pc_css = $this->input->get_post('pccss'); - if ($pc_css === 0) $pc_css = ''; + if (!$pc_css) $pc_css = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From e9791ce848476dbb8b5c2a2a1f4874818c696333 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 13:04:18 +0800 Subject: [PATCH 041/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 2f35bbdb..6b132ec7 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,9 +24,9 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->get_post('pchtml'); - if (!$pc_html) $pc_html = ''; + if ($pc_html === '0') $pc_html = ''; $pc_css = $this->input->get_post('pccss'); - if (!$pc_css) $pc_css = ''; + if ($pc_css === '0') $pc_css = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 0c5940e138cd26761943e584075cf24f95a49daf Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 13:07:37 +0800 Subject: [PATCH 042/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=207?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 69cb2843..004c2f16 100644 --- a/application/models/infoMetas_model.php +++ b/application/models/infoMetas_model.php @@ -176,7 +176,7 @@ class InfoMetas_model extends CI_Model { . "SET im_value = N? \n" . "WHERE im_ic_id = ? \n" . " AND im_key = ?"; - return $this->HT->query($sql, array($im_value, $im_ic_id, $im_key)); + return $this->HT->query($sql, array((string)$im_value, $im_ic_id, $im_key)); } function delete($im_ic_id, $im_key) { From 4221c13d7e1061f9da1e07a1292ccede5dbd9281 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 13:09:23 +0800 Subject: [PATCH 043/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=20d?= =?UTF-8?q?one?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 6b132ec7..e50ab1a5 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -24,9 +24,7 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); $pc_html = $this->input->get_post('pchtml'); - if ($pc_html === '0') $pc_html = ''; $pc_css = $this->input->get_post('pccss'); - if ($pc_css === '0') $pc_css = ''; $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From 103821d6e9979320a697d2f565b886342545f8db Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 13:45:20 +0800 Subject: [PATCH 044/222] =?UTF-8?q?=E5=A2=9E=E5=87=8F=20AMP=20PC=20CSS=20d?= =?UTF-8?q?one?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/info_amp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index e50ab1a5..b9857d42 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -23,8 +23,8 @@ class Info_amp extends CI_Controller $icid = $this->input->get_post('icid'); $json = $this->input->get_post('json'); $html = $this->input->get_post('html'); - $pc_html = $this->input->get_post('pchtml'); - $pc_css = $this->input->get_post('pccss'); + $pc_html = $this->input->get_post('pc_html'); + $pc_css = $this->input->get_post('pc_css'); $css = $this->input->get_post('css'); $schema = $this->input->get_post('schema'); $script = $this->input->get_post('script'); From cb5f6eb31a092abfd53236ccdd44dc7ca75d8a52 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 14:11:38 +0800 Subject: [PATCH 045/222] fix meta add --- 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 004c2f16..9c877840 100644 --- a/application/models/infoMetas_model.php +++ b/application/models/infoMetas_model.php @@ -16,7 +16,7 @@ class InfoMetas_model extends CI_Model { . " ( \n" . " ?, ?, N? \n" . " )"; - return $this->HT->query($sql, array($im_ic_id, $im_key, $im_value)); + return $this->HT->query($sql, array($im_ic_id, $im_key, (string)$im_value)); } function get_list($im_ic_id, $im_key) { From 0308e92370ba1333cd2483cc32ddf804c7033e8a Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 19 Oct 2018 15:36:08 +0800 Subject: [PATCH 046/222] fix meta add --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 0fdb7525..bff3c77a 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -556,7 +556,7 @@ From 9251b1d2aed2aaac7565210d2cbffa7c4f599197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 22 Oct 2018 14:06:13 +0800 Subject: [PATCH 047/222] =?UTF-8?q?=E5=BE=B7=E8=AF=AD=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=8C=96=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 4e3fd961..29969e4b 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -528,7 +528,7 @@ class Information extends CI_Controller { break; case 'gm': - GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台 + //GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台 if ($delete_only) { $url = "http://144.76.185.44:8029/gm.php/information/delete_cache_23Xd913mddkgssODII?static_html_url=" . urlencode($url); } else { From 16587a189ced905405f3316db7288a2f37031e49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Mon, 22 Oct 2018 14:09:22 +0800 Subject: [PATCH 048/222] =?UTF-8?q?=E5=BE=B7=E8=AF=AD=E9=9D=99=E6=80=81?= =?UTF-8?q?=E5=8C=96=E6=9B=B4=E6=96=B0=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index bff3c77a..15942674 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1257,13 +1257,13 @@ 忽略URL重复
- config->item('site_code') == 'cht') { ?> + config->item('site_code'),array('cht','gm'))) { ?> - config->item('site_code'),array('cht','ah','gn'))) { ?> + config->item('site_code'),array('cht','ah','gm'))) { ?> From 44e019bbb81b28ad6427d248cf2105515be6cb59 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 22 Oct 2018 14:25:29 +0800 Subject: [PATCH 049/222] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=B7=E8=AF=AD?= =?UTF-8?q?=E7=AB=99=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/config/config.php b/application/config/config.php index a6ad6f16..cd9b638a 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -923,6 +923,7 @@ $config['templates_gm'] = array( '文化模板 [单页式]' => 'culture_info_detail_one_page', '文化模板 [导航式]' => 'culture_info_detail_with_category', '信息专题模板' => 'guide_top_series', + '列表式' => 'guide_info_list', '空白模板'=>'none' ); From f2d4b1401cbe70099ec1b6ef03db568bcdf6c4aa Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 24 Oct 2018 11:18:52 +0800 Subject: [PATCH 050/222] =?UTF-8?q?ah=E7=9A=84amp=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=B7=BB=E5=8A=A0addthis=E7=9A=84=E5=88=86?= =?UTF-8?q?=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/htmlcompressor/views/amp-template/ah.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/ah.php b/application/third_party/htmlcompressor/views/amp-template/ah.php index f79a2025..0f016f6e 100644 --- a/application/third_party/htmlcompressor/views/amp-template/ah.php +++ b/application/third_party/htmlcompressor/views/amp-template/ah.php @@ -15,6 +15,7 @@ + @@ -101,7 +102,7 @@
Copyright © 2018 Chinarundreisen
- +
From 76b07703d4b4f0466d3602931a1758304bf89ba5 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 8 Nov 2018 10:02:26 +0800 Subject: [PATCH 062/222] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=90=BA=E7=A8=8B=E6=8E=A5=E5=8F=A3=E7=9B=B8?= =?UTF-8?q?=E5=BA=94=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctrip/controllers/ctrip_train.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index 41509649..0262da0e 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -65,10 +65,17 @@ class ctrip_train extends CI_Controller{ $url = JSONRETURN.'SearchS2S/?From='.urlencode($from).'&To='.urlencode($to).'&DepartDate='.$date.'&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + $api_start_time = microtime(true); + //获取数据 $ResponseJson = post_ctrip($url,'','GET'); + $api_end_time = microtime(true); + $ResponseData = json_decode($ResponseJson); + $api_responsive_time = $api_end_time - $api_start_time; + + log_message('error','ctrip_trian|status:'.$ResponseData->ResponseStatus->Ack.'|相应时间:'.$api_responsive_time); //定义返回的json $ReturnData = new stdClass(); From b1329b2dada809904420fd895a9ddd2e6b0edf0e Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 8 Nov 2018 10:32:12 +0800 Subject: [PATCH 063/222] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E9=81=BF=E5=85=8D=E5=87=BA=E7=8E=B0php?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctrip/controllers/ctrip_train.php | 28 +++++++++++++++---- 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index 0262da0e..ee7b6dbb 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -43,7 +43,8 @@ class ctrip_train extends CI_Controller{ $TrainNo = $this->input->get_post('TrainNo'); if(!$date || !$from || !$to){ - exit('传参错误！'); + header("HTTP/1.1 404 Not Found"); + exit('{"httpstatus":404,"data":{"seven":false,"cache":false,"result":[],"map":{}}}'); }else{ $isCache = false; $iseven = false; @@ -55,10 +56,19 @@ class ctrip_train extends CI_Controller{ $iseven = true; } - //转换三字码为中文 - $from = $this->ctrip_model->ReplaceCodeToName($from)->station_name; - $to = $this->ctrip_model->ReplaceCodeToName($to)->station_name; - + //转换三字码为中文 + $FromCode = $this->ctrip_model->ReplaceCodeToName($from); + $ToCode = $this->ctrip_model->ReplaceCodeToName($to); + + + if(!$FromCode || !$ToCode){ + header("HTTP/1.1 404 Not Found"); + exit('{"httpstatus":404,"data":{"seven":false,"cache":false,"result":[],"map":{}}}'); + }else{ + $from = $FromCode->station_name; + $to = $ToCode->station_name; + } + //生成请求链接 $TimeStamp = time(); $Sign = md5($TimeStamp.DATAKEY); @@ -74,8 +84,14 @@ class ctrip_train extends CI_Controller{ $ResponseData = json_decode($ResponseJson); $api_responsive_time = $api_end_time - $api_start_time; + //print_r($ResponseData);die(); + + if(empty($ResponseData->Trains)){ + log_message('error','ctrip_trian|status:trains is empty |相应时间:'.$api_responsive_time); + }else{ + log_message('error','ctrip_trian|status:'.$ResponseData->ResponseStatus->Ack.'|相应时间:'.$api_responsive_time); + } - log_message('error','ctrip_trian|status:'.$ResponseData->ResponseStatus->Ack.'|相应时间:'.$api_responsive_time); //定义返回的json $ReturnData = new stdClass(); From 4e7968e1ee543b127bbcbd1fd90a516b5cb8a8b9 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 8 Nov 2018 13:50:59 +0800 Subject: [PATCH 064/222] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E5=AE=B6?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/order/views/gm/confirm_order.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/third_party/order/views/gm/confirm_order.php b/application/third_party/order/views/gm/confirm_order.php index 1a973471..31578924 100644 --- a/application/third_party/order/views/gm/confirm_order.php +++ b/application/third_party/order/views/gm/confirm_order.php @@ -159,7 +159,6 @@ - @@ -169,7 +168,9 @@ - + From b45373a2cedeab4ef9f38b7fb5227dbad1b52665 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 09:12:38 +0800 Subject: [PATCH 065/222] =?UTF-8?q?=E8=81=8C=E4=BD=8Deditor=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 0593b9af..8eafc869 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -557,7 +557,13 @@ From 857552ae8210f24afddb6c14bff163cf5e263d88 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 09:45:31 +0800 Subject: [PATCH 066/222] =?UTF-8?q?=E8=81=8C=E4=BD=8Deditor=E7=8A=B6?= =?UTF-8?q?=E6=80=81=20v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 8eafc869..cc7a4ce8 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -542,6 +542,7 @@ ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { $PcAmpChecked = 'checked'; + editor.readonly(true); } else { $PcAmpChecked = ''; } From 8cdc3e517f51061732bea1873c0b5223aa48c2a1 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 09:49:44 +0800 Subject: [PATCH 067/222] =?UTF-8?q?=E8=81=8C=E4=BD=8Deditor=E7=8A=B6?= =?UTF-8?q?=E6=80=81=20v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index cc7a4ce8..0c88712b 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -542,7 +542,7 @@ ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { $PcAmpChecked = 'checked'; - editor.readonly(true); + /*editor.readonly(true);*/ } else { $PcAmpChecked = ''; } From 2788d3210c258ed880db9072c3c0696037d4a951 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 09:51:01 +0800 Subject: [PATCH 068/222] =?UTF-8?q?=E8=81=8C=E4=BD=8Deditor=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 0c88712b..2e109674 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -542,7 +542,7 @@ ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { $PcAmpChecked = 'checked'; - /*editor.readonly(true);*/ + echo ""; } else { $PcAmpChecked = ''; } From 6c5d4342c5c84cc76787800b0984ec1f767168ce Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 09:57:39 +0800 Subject: [PATCH 069/222] =?UTF-8?q?=E8=81=8C=E4=BD=8Deditor=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 2e109674..8df08680 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -542,7 +542,7 @@ ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { $PcAmpChecked = 'checked'; - echo ""; + echo ""; } else { $PcAmpChecked = ''; } From 3ac590a9da9537d9c5f1be06e4a7f0823ae5fa8b Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 10:00:59 +0800 Subject: [PATCH 070/222] update editor --- .../views/bootstrap3/information_edit.php | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 8df08680..e86e837e 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -542,7 +542,6 @@ ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { $PcAmpChecked = 'checked'; - echo ""; } else { $PcAmpChecked = ''; } @@ -556,16 +555,21 @@ HTML构建工具 | amp_status === '1') { ?> From 22547084de6dff03d9e245716e640d6f07b15eaf Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 10:04:34 +0800 Subject: [PATCH 071/222] update editor v1 --- .../views/bootstrap3/information_edit.php | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index e86e837e..d2fef1ac 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -465,8 +465,10 @@ } }); }); - - + //是否只使用构建工具 + if ($('#PcAmp input').is(':checked')) { + editor.readonly(true); + } //新闻日历 $(function () { @@ -555,21 +557,16 @@ HTML构建工具 | amp_status === '1') { ?> From bbb9f8e5e0032a53abd6172c00e5c2bbe0836c67 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 10:06:08 +0800 Subject: [PATCH 072/222] update editor v2 --- application/views/bootstrap3/information_edit.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index d2fef1ac..9950aa9a 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -464,12 +464,11 @@ $("iframe.ke-edit-iframe").contents().find(".ke-content").css({"padding-right": "25px", "padding-top": "12px"}); } }); + //是否只使用构建工具 + if ($('#PcAmp input').is(':checked')) { + editor.readonly(true); + } }); - //是否只使用构建工具 - if ($('#PcAmp input').is(':checked')) { - editor.readonly(true); - } - //新闻日历 $(function () { $("#meta_news_createdate").datepicker({ From c54146d1abdb583432d648713146fc832f781e57 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 10:17:44 +0800 Subject: [PATCH 073/222] update editor v3 --- application/views/bootstrap3/information_edit.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 9950aa9a..102192dc 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -450,6 +450,9 @@ height: '560px', //fileManagerJson:'/js/kcfinder/browse.php', //allowFileManager:true, + afterCreate: function() { + editor.readonly(ic_id, 'AMP_BODY_PC_STATUS') === 'yes' ? 'true' : 'false'); ?>); + }, filterMode: false, allowImageUpload: false, items: [ @@ -464,10 +467,6 @@ $("iframe.ke-edit-iframe").contents().find(".ke-content").css({"padding-right": "25px", "padding-top": "12px"}); } }); - //是否只使用构建工具 - if ($('#PcAmp input').is(':checked')) { - editor.readonly(true); - } }); //新闻日历 $(function () { From 0525d8dfb511413348ca516b378dd09dbe995a2c Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 9 Nov 2018 10:55:23 +0800 Subject: [PATCH 074/222] =?UTF-8?q?=E4=BF=AE=E6=94=B9addhtis=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/htmlcompressor/views/amp-template/ah.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/ah.php b/application/third_party/htmlcompressor/views/amp-template/ah.php index a025b3d2..bf0ee52f 100644 --- a/application/third_party/htmlcompressor/views/amp-template/ah.php +++ b/application/third_party/htmlcompressor/views/amp-template/ah.php @@ -96,7 +96,6 @@
-
@@ -105,7 +104,7 @@
Copyright © 2018 Asia Highlights
-
+
@AMP-GOOGLE-ANALYTICS@ From 07950d41de425267719b70bf4493b649369764a7 Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 9 Nov 2018 11:15:53 +0800 Subject: [PATCH 075/222] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=BA=E7=A8=8B?= =?UTF-8?q?=E5=9B=9E=E8=B0=83=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctrip/controllers/ctrip_train.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index ee7b6dbb..3fef195f 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -244,5 +244,20 @@ class ctrip_train extends CI_Controller{ } } - + //获取回调信息 + public function receiveinfo(){ + echo ' + + + + hainatravel123 + + + + '; + $back_xml = file_get_contents('php://input'); + $xml = simplexml_load_string($back_xml); + $json = json_encode($xml); + log_message('error','携程回调信息：'.$json); + } } \ No newline at end of file From 6c1de801d30c0be062a0501286d2f6ef2e68f09b Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 12:17:53 +0800 Subject: [PATCH 076/222] update editor v3 --- application/views/bootstrap3/information_edit.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 102192dc..a4a8871b 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1293,10 +1293,12 @@ ; //保存增加AMP判断 - lmr ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') { ?> + if (!$('#PcAmp input').is(':checked')) { var amp_confirm = window.confirm('\n检测到页面存在AMP版本，是否需要打开AMP编辑界面？\n\r注意：如果修改了PC端版本，那么同时也需要修改AMP版本。\n'); if (amp_confirm) { window.open('', '_blank'); } + } if (information_check() != false) { submitForm('form_information_edit'); From 7c1b5626b2209ab26288d804ece4517959214009 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 12:44:53 +0800 Subject: [PATCH 077/222] update editor v3 --- application/views/bootstrap3/information_edit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index a4a8871b..22815b13 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -559,6 +559,7 @@ var checked = $(this).is(':checked'); if(checked) { meta('save', 'ic_id; ?>', 'AMP_BODY_PC_STATUS', 'yes'); + meta('save', 'ic_id; ?>', 'meta_use_list_picture', 'no'); editor.readonly(true); } else { meta('save', 'ic_id; ?>', 'AMP_BODY_PC_STATUS', 'no'); From de269a487e43e1674155dd369aa8e403417b9fe0 Mon Sep 17 00:00:00 2001 From: lmrwork <59361885@qq.com> Date: Fri, 9 Nov 2018 15:26:27 +0800 Subject: [PATCH 078/222] update editor v4 --- application/views/bootstrap/header.php | 1 + application/views/bootstrap3/header.php | 1 + 2 files changed, 2 insertions(+) diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index 9f70c5c4..feb5f103 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -84,6 +84,7 @@
  • Html基础知识
  • AMP知识
  • AMP操作SOP
    • +
  • HTML构建工具V3
  • PS基础课件
  • 系统设置
    • diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index c9b57531..c5a0b78a 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -91,6 +91,7 @@
  • Html基础知识
  • AMP知识
  • AMP操作SOP
    • +
  • HTML构建工具V3
  • PS基础课件
  • 系统设置
    • From 878a5b5efcd202e9a18fd6344bfbba89b92e9035 Mon Sep 17 00:00:00 2001 From: cyc Date: Sun, 11 Nov 2018 12:45:29 +0800 Subject: [PATCH 079/222] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=81=AB=E8=BD=A6?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/ctrip/controllers/ctrip_train.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index 3fef195f..52afb2c0 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -187,9 +187,10 @@ class ctrip_train extends CI_Controller{ $ydzNum = isset($ydzNum) ? ticket_exchange($ydzNum,$iseven) : ''; $swzNum = isset($swzNum) ? ticket_exchange($swzNum,$iseven) : ''; $dwNum = isset($dwNum) ? ticket_exchange($dwNum,$iseven) : ''; - //$runTime = $TrainInfo->DurationMinutes % 60; + $runMin = $TrainInfo->DurationMinutes % 60; + $runHour = ($TrainInfo->DurationMinutes - $runMin) / 60; - $ReturnData->data->result[$i] = '|预定|'.$TrainInfo->Train12306No.'|'.$TrainInfo->TrainNo.'|'.$TrainInfo->FromStationName.'|'.$TrainInfo->ToStationName.'|'.$TrainInfo->FromTelcode.'|'.$TrainInfo->ToTelcode.'|'.$TrainInfo->StartTime.'|'.$TrainInfo->ArriveTime.'|'.$TrainInfo->DurationMinutes.'|'.$TrainInfo->CanWebBuy.'||'.date('Ymd',strtotime($date)).'||||||||'.$gjrwNum.'||'.$rwNum.'|'.$rzNum.'|'.$tdzNum.'|'.$wzNum.'||'.$ywNum.'|'.$yzNum.'|'.$edzNum.'|'.$ydzNum.'|'.$swzNum.'|'.$dwNum.'||'; + $ReturnData->data->result[$i] = '|预定|'.$TrainInfo->Train12306No.'|'.$TrainInfo->TrainNo.'|'.$TrainInfo->FromStationName.'|'.$TrainInfo->ToStationName.'|'.$TrainInfo->FromTelcode.'|'.$TrainInfo->ToTelcode.'|'.$TrainInfo->StartTime.'|'.$TrainInfo->ArriveTime.'|'.$runHour.':'.$runMin.'|'.$TrainInfo->CanWebBuy.'||'.date('Ymd',strtotime($date)).'||||||||'.$gjrwNum.'||'.$rwNum.'|'.$rzNum.'|'.$tdzNum.'|'.$wzNum.'||'.$ywNum.'|'.$yzNum.'|'.$edzNum.'|'.$ydzNum.'|'.$swzNum.'|'.$dwNum.'||'; $data = '{"validateMessagesShowId":"_validatorMessage","status":true,"httpstatus":200,"data":{'.$PriceStr.'},"messages":[],"validateMessages":{}}'; $ReturnData->data->price[$i] = $data; From c7fd39087c054721ed9d26fea824bcd6269267da Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 12 Nov 2018 16:05:00 +0800 Subject: [PATCH 080/222] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BE=B7=E8=AF=AD?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/application/config/config.php b/application/config/config.php index 1b38166b..cb72137c 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -911,16 +911,7 @@ $config['templates'] = array( //德语信息模板 $config['templates_gm'] = array( '通用内容模板' => 'guide_info_detail', - '城市-列表模板' => 'city_info_list', - '城市-首页模板' => 'city_info_index', '城市-首页模板(GM)' => 'city_info_index_new', - '城市-首页模板[简]' => 'city_info_s_index', - '城市-景点列表模板' => 'city_info_attractions_list', - '城市-景点列表模板[简]' => 'city_info_s_attractions_list', - '城市-特色产品模板' => 'city_info_diytour', - '城市-一线城市首页' => 'city_info_index_one', - '省份-首页' => "area_info_index", - '文化模板 [列表式]' => "culture_info_detail_just_list", '文化模板 [单页式]' => 'culture_info_detail_one_page', '文化模板 [导航式]' => 'culture_info_detail_with_category', '信息专题模板' => 'guide_top_series', From 912033bf50216f7ded61aeb62cc7c631e30f26a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Tue, 13 Nov 2018 11:07:55 +0800 Subject: [PATCH 081/222] =?UTF-8?q?Akamai=E7=9A=84=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sureroute-test-object.html | 105 +++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 sureroute-test-object.html diff --git a/sureroute-test-object.html b/sureroute-test-object.html new file mode 100644 index 00000000..bb0fb2ad --- /dev/null +++ b/sureroute-test-object.html @@ -0,0 +1,105 @@ + + + + + + Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit + + + + + + +

    Lorem Ipsum

    + +

    Ipsum, Lorem

    + +
    +

    +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam massa enim, tincidunt non hendrerit eget, malesuada et nisi. In hac habitasse platea dictumst. Praesent nec laoreet ante. Aenean tempus nisi in erat tempus tempus. Vestibulum imperdiet lobortis sapien eu tempus. Vivamus volutpat quam sed eros molestie vitae dignissim nulla ultricies. Vivamus dictum elit velit. Pellentesque pellentesque ornare ornare. Mauris vel gravida sapien. Praesent eleifend tristique ipsum nec tempor. Vestibulum cursus eleifend tellus, a egestas lectus euismod sed. +

    +

    +Duis nec massa quam. Nulla porta, enim ut consequat tincidunt, quam tortor consequat enim, eu interdum eros lorem eu turpis. Cras vestibulum orci quis felis tristique quis semper sem imperdiet. Sed mattis tincidunt risus scelerisque scelerisque. Aliquam nisl quam, bibendum quis luctus eu, sodales ut felis. Integer id turpis nisi. Phasellus mattis nulla eu odio faucibus a auctor orci tristique. Nulla ullamcorper, risus nec semper accumsan, libero lacus aliquet elit, quis lacinia metus nunc vestibulum turpis. Suspendisse vel sapien vel magna auctor aliquam. Aenean fringilla fringilla metus non imperdiet. Aliquam nisl lacus, tempus vitae commodo non, accumsan ut lectus. Nam in urna eu neque pretium aliquam. Maecenas sit amet urna lectus. Donec vitae metus enim. +

    +

    +Sed lacus nulla, faucibus eget ullamcorper ut, mollis at metus. Vivamus tortor felis, tincidunt at tristique ut, tincidunt feugiat velit. Ut euismod felis non urna luctus luctus. Integer nec urna massa. Mauris vestibulum hendrerit auctor. Morbi at tellus nec arcu scelerisque rhoncus. Phasellus facilisis interdum lorem vulputate posuere. Nullam quis felis est. Aenean metus augue, tempus non ultricies et, dapibus vel felis. Pellentesque at augue velit. Nulla erat nisi, posuere eu pellentesque id, pretium ac libero. Phasellus tincidunt sollicitudin sapien at mollis. Nullam et libero velit, nec tincidunt eros. Aliquam et sem elit. Quisque suscipit orci enim, vel aliquam nisi. Suspendisse in enim a ligula blandit volutpat in id velit. +

    +

    +Nam tempor neque nec ligula sollicitudin rhoncus. Etiam et lorem vel odio pharetra interdum. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In imperdiet nisi sed diam rutrum gravida in vel massa. Nam ullamcorper ultrices diam, vitae consequat lacus consequat consequat. Curabitur laoreet leo sed tortor fringilla nec euismod libero lobortis. Donec non enim lectus. Suspendisse potenti. In hac habitasse platea dictumst. Fusce semper auctor neque nec lobortis. Praesent vitae mauris turpis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sed pharetra odio. Suspendisse potenti. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis eget odio purus, quis dapibus massa. +

    +

    +Curabitur ut dapibus eros. Donec tempor, felis ac facilisis bibendum, nisi purus pellentesque sem, sollicitudin tempor lectus nulla at mi. Maecenas quis urna ut ante pulvinar pellentesque. Duis auctor imperdiet suscipit. Pellentesque dui nulla, volutpat quis posuere a, gravida ornare augue. Proin nec felis pharetra magna pellentesque facilisis. Curabitur lacus libero, malesuada sed tincidunt ac, aliquet ut tortor. Etiam gravida lorem nulla, consectetur eleifend risus. Donec facilisis, turpis laoreet imperdiet laoreet, purus justo egestas nulla, et hendrerit leo eros at orci. Nunc vulputate mauris sit amet sapien accumsan nec euismod orci volutpat. Sed ultricies velit ut lorem venenatis in convallis tellus imperdiet. Aenean auctor ultrices est ultricies rhoncus. Phasellus non magna a leo luctus fermentum nec fermentum erat. +

    +

    + +Sed faucibus nisl quis diam mollis quis varius tortor tincidunt. Phasellus in turpis in tellus consectetur mollis. Donec a neque id metus condimentum dignissim. In hac habitasse platea dictumst. Pellentesque sem nisi, pulvinar nec sagittis vitae, lacinia non tellus. Aliquam dignissim dignissim volutpat. Pellentesque ut quam et mi tincidunt varius id vel quam. Duis consectetur elit ac ligula fringilla elementum. In elementum tellus viverra mi vehicula vitae tempus lectus laoreet. Nullam diam nibh, tincidunt vitae imperdiet a, luctus a felis. In posuere pulvinar volutpat. Pellentesque eget viverra justo. +

    +

    +Nullam nec sapien at felis molestie auctor. Sed dignissim erat eu nulla ullamcorper mattis. Curabitur felis sem, feugiat non semper ut, sollicitudin sed ipsum. Quisque cursus laoreet turpis, sit amet molestie neque consequat at. Vestibulum eu ligula quis nisl pulvinar rhoncus. Praesent faucibus, dolor in elementum ullamcorper, tellus ante mattis risus, ac imperdiet eros eros quis risus. Praesent luctus libero a diam pharetra eget placerat risus pulvinar. Donec sollicitudin pulvinar velit vel pellentesque. Quisque sagittis leo ac mauris congue adipiscing. In tempus facilisis facilisis. Aliquam erat volutpat. Suspendisse sagittis libero ipsum. +

    +

    +Aliquam at cursus ipsum. Vivamus purus mi, pretium at molestie id, dictum in quam. Proin egestas auctor iaculis. Maecenas sodales facilisis tellus eu bibendum. Vestibulum varius vehicula scelerisque. Praesent condimentum varius commodo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sem nisl, sagittis eu euismod non, tempor nec magna. Fusce sed auctor nisl. Phasellus porttitor sagittis est, sit amet eleifend elit dignissim et. Nam consectetur elementum elit non egestas. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum a ultricies neque. Integer hendrerit nisi id dolor porta quis venenatis lacus dignissim. In vitae fringilla magna. +

    +

    +Fusce ultrices scelerisque felis, id semper quam posuere a. Sed nec erat eget velit euismod condimentum a in enim. Maecenas bibendum aliquam tincidunt. Mauris vestibulum neque at nulla sagittis id lacinia enim fermentum. Quisque adipiscing risus nec massa auctor condimentum. Mauris venenatis lacus justo, eu varius odio. Fusce commodo luctus felis, vitae lobortis lectus facilisis id. Nunc faucibus vestibulum urna et lacinia. Cras ornare quam neque, non gravida sapien. Cras porta, diam sit amet laoreet rutrum, massa erat commodo diam, eu rhoncus nisl massa ac metus. In sem mauris, venenatis nec euismod ac, suscipit condimentum neque. Quisque pretium blandit lectus, ut aliquet neque rhoncus eu. Vivamus ultrices porttitor tincidunt. Curabitur ut ipsum non ipsum ultrices tincidunt. Integer scelerisque augue nec nisl varius tristique. Morbi condimentum rutrum sodales. Pellentesque odio mauris, porttitor ac sollicitudin in, ultrices ut diam. +

    +

    +Sed congue adipiscing orci a pellentesque. Etiam quis neque eu nulla viverra egestas. Ut ultricies dui non enim rhoncus laoreet. Nulla molestie nibh non erat venenatis gravida. Pellentesque faucibus sem sit amet risus tincidunt non ultrices diam auctor. Praesent quis libero et tellus tempor molestie. Mauris ullamcorper feugiat libero sed elementum. Donec eget nunc eget diam hendrerit pulvinar. Ut ut imperdiet enim. Vestibulum sed quam lorem. Nunc ipsum massa, venenatis eget condimentum at, ornare id ante. Vestibulum ornare volutpat tincidunt. Etiam a eros erat. Curabitur lobortis, nisi a malesuada tincidunt, nisi enim congue eros, in dictum elit odio at nunc. Nam hendrerit porta velit a viverra. +

    +

    +Etiam vel velit urna. Donec commodo aliquet magna rhoncus pretium. Donec fermentum orci in diam dictum non pulvinar mi tristique. Morbi urna libero, sagittis vel facilisis nec, ornare vitae nunc. Pellentesque laoreet mi a mi condimentum sagittis. Donec eleifend, nisi sit amet tincidunt sollicitudin, leo magna accumsan elit, at adipiscing velit lacus id purus. Aenean nunc sapien, egestas vitae pretium viverra, bibendum vel tellus. Maecenas mattis dui ac justo facilisis sollicitudin. Proin in mi ac lacus hendrerit congue ac vitae elit. Aliquam erat volutpat. In hac habitasse platea dictumst. Phasellus dapibus diam vel velit consectetur tempor. Maecenas viverra suscipit bibendum. Sed non enim neque. +

    + +

    +Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Phasellus at odio et odio volutpat egestas. Fusce non pellentesque felis. Nunc fermentum posuere sem quis egestas. Integer nec orci vel eros fringilla bibendum. Praesent placerat molestie elit at mattis. Nunc rutrum faucibus arcu non bibendum. Vestibulum at sapien sit amet sem iaculis congue. Morbi tempus, libero vitae interdum suscipit, lacus ipsum suscipit quam, non pretium nulla orci eget dui. Praesent et nisl turpis, ultricies convallis quam. In tempor urna et eros aliquet accumsan. Phasellus lobortis bibendum libero sit amet viverra. Aenean consectetur, neque eu cursus posuere, est leo molestie dui, sit amet vulputate mi erat eu tortor. Suspendisse arcu velit, porta sit amet adipiscing sed, ultrices id urna. In hendrerit iaculis massa in pretium. Vivamus eros augue, venenatis non hendrerit a, bibendum in tortor. Fusce et mauris lorem, vitae semper ligula. Nam iaculis, eros eu varius varius, orci sapien rhoncus arcu, et luctus urna lectus non quam. Donec gravida convallis justo at bibendum. Quisque non est velit, sed laoreet augue. +

    +
    + + + From 338b52105cada0289dda38cfc92e8a147f073be8 Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 13 Nov 2018 15:18:17 +0800 Subject: [PATCH 082/222] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=B7=E8=AF=ADAMP?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/htmlcompressor/views/amp-template/gm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/gm.php b/application/third_party/htmlcompressor/views/amp-template/gm.php index a58870fc..242f5514 100644 --- a/application/third_party/htmlcompressor/views/amp-template/gm.php +++ b/application/third_party/htmlcompressor/views/amp-template/gm.php @@ -99,7 +99,7 @@
    From b03637a00fca7054bd25a3cbe0da6f032cc91eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Wed, 14 Nov 2018 15:13:52 +0800 Subject: [PATCH 083/222] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=AE=BE=E7=BD=AEcac?= =?UTF-8?q?he=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 29969e4b..cfead29f 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -127,8 +127,6 @@ class Information extends CI_Controller { } public function edit($is_id) { - header("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0"); - header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); set_time_limit(30); //$this->output->enable_profiler(true); //查询结构信息 From f40160ad65d83260ed19c50edfd68e80bd98d76b Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Tue, 20 Nov 2018 15:00:36 +0800 Subject: [PATCH 084/222] =?UTF-8?q?=E4=BA=A7=E5=93=81config=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + application/config/config.php | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9429a9fb..6d4da9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +.phpintel .svn/* */logs/log* /web.config diff --git a/application/config/config.php b/application/config/config.php index cb72137c..45048d90 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -572,8 +572,8 @@ $config['templates_i'] = array( '[城市]C景点列表模板' => 'city_info_attractions_list', '[城市]C景点详细模板' => 'city_attractions', '[专题]T0空白' => 'r_tpl_empty', - '[专题]T0空白（H1+面包屑）' => 'r_empty2', '[专题]T0空白（仅容器）' => 'r_empty_container', + '[专题]T0空白（H1+面包屑）' => 'r_empty2', '----------二级目录----------' => '------2------', '[专题]T2首页' => 'r_t2_index', '[专题]T2详细' => 'r_t2_detail', @@ -872,7 +872,7 @@ $config['templates'] = array( '通用内容模板' => 'guide_info_detail', '城市-列表模板' => 'city_info_list', '城市-首页模板' => 'city_info_index', - '城市-首页模板(GM)' => 'city_info_index_new', + '城市-首页模板(GM)' => 'city_info_index_new', '城市-首页模板[简]' => 'city_info_s_index', '城市-景点列表模板' => 'city_info_attractions_list', '城市-景点列表模板[简]' => 'city_info_s_attractions_list', @@ -911,7 +911,7 @@ $config['templates'] = array( //德语信息模板 $config['templates_gm'] = array( '通用内容模板' => 'guide_info_detail', - '城市-首页模板(GM)' => 'city_info_index_new', + '城市-首页模板(GM)' => 'city_info_index_new', '文化模板 [单页式]' => 'culture_info_detail_one_page', '文化模板 [导航式]' => 'culture_info_detail_with_category', '信息专题模板' => 'guide_top_series', @@ -956,6 +956,7 @@ $config['templates_product'] = array( //产品管理板块模板（国际站使用） $config['templates_product_i'] = array( + '空白模板（仅容器）' => 'r_empty_container', '空白模板（新）' => 'r_tpl_empty_2017', '空白模板（旧）' => 'r_tpl_empty', ); From e7ad7c1b692a994c028f9a4e1aed05576ae13c65 Mon Sep 17 00:00:00 2001 From: cyc Date: Wed, 21 Nov 2018 11:44:15 +0800 Subject: [PATCH 085/222] =?UTF-8?q?=E4=BF=AE=E6=94=B9AMP=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htmlcompressor/views/amp-template/gm.php | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/gm.php b/application/third_party/htmlcompressor/views/amp-template/gm.php index 242f5514..b8531369 100644 --- a/application/third_party/htmlcompressor/views/amp-template/gm.php +++ b/application/third_party/htmlcompressor/views/amp-template/gm.php @@ -16,7 +16,7 @@ - @@ -24,17 +24,20 @@ -
    -
    - - -
    - - - -
    -
    - Anfragen
    +
    +
    +
    + + +
    + + + +
    +
    + Anfragen +
    +
    @@ -91,10 +94,6 @@ - -
    - -