From b03637a00fca7054bd25a3cbe0da6f032cc91eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Wed, 14 Nov 2018 15:13:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=AE=BE=E7=BD=AEcache?=
 =?UTF-8?q?=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 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81config=E6=9B=B4=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',
 );