From fb77707d607dddeb8990864d78c02a8d701841c6 Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 18:10:16 +0800
Subject: [PATCH 1/4] ok

---
 application/controllers/cache.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index 0f81dbae..101a8e3a 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -26,7 +26,7 @@ class Cache extends CI_Controller
         $this->load->model('Area_model');
         $this->load->model('InfoStructures_model');
         $this->load->model('Information_model');
-        $this->site_code = $this->input->get('site_code') || $this->config->item('site_code');
+        $this->site_code = $this->input->get('site_code') or $this->config->item('site_code');
     }
 
     /**

From 008d0607bb92c3a91a95565fbbcce49c53ec9b3e Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 18:38:09 +0800
Subject: [PATCH 2/4] yes

---
 application/controllers/cache.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index 101a8e3a..e627198d 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -26,7 +26,7 @@ class Cache extends CI_Controller
         $this->load->model('Area_model');
         $this->load->model('InfoStructures_model');
         $this->load->model('Information_model');
-        $this->site_code = $this->input->get('site_code') or $this->config->item('site_code');
+        $this->site_code = $this->input->get('site_code') ? $this->input->get('site_code') : $this->config->item('site_code');
     }
 
     /**
@@ -68,7 +68,10 @@ class Cache extends CI_Controller
         $data['post_para'] = $this->post_para;
 
         if ($returnType === 'json') {
-            echo (json_encode($this->file));
+            //print_r($cache_config[$this->site_code]);
+            //echo('json');
+            //print_r($data['file']);
+            echo (json_encode($data['file']));
         } else {
             //视图
             $this->load->view('cache/update', $data);
@@ -155,7 +158,11 @@ class Cache extends CI_Controller
                     $url_temp = $this->current_domain . $path_temp . '/' . $file_temp;
                     $url_temp = str_replace('index.htm', '', $url_temp);
                     $file_time[$url_temp] = date("F d Y H:i:s", filemtime("$dir/$f"));
-                    $file[] = $url_temp;
+
+                    $encode = mb_detect_encoding($url_temp, array('ASCII', 'GBK', 'ISO-8859-1', 'UTF-8'));
+                    $_url_temp = mb_convert_encoding($url_temp, 'UTF8', $encode);
+
+                    $file[] = $_url_temp;
                 }
             }
         }

From dd8ff037ad60a382450757412c0ec744972789dc Mon Sep 17 00:00:00 2001
From: LMR <59361885@qq.com>
Date: Wed, 27 Jan 2021 21:24:51 +0800
Subject: [PATCH 3/4] check siteCode

---
 application/controllers/cache.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/controllers/cache.php b/application/controllers/cache.php
index e627198d..f6316f10 100644
--- a/application/controllers/cache.php
+++ b/application/controllers/cache.php
@@ -22,7 +22,9 @@ class Cache extends CI_Controller
     function __construct()
     {
         parent::__construct();
-        $this->permission->is_admin();
+        if (!$this->input->get('site_code')) {
+            $this->permission->is_admin();
+        }
         $this->load->model('Area_model');
         $this->load->model('InfoStructures_model');
         $this->load->model('Information_model');

From de21f3e7898715d642bd7024cc1124c4fc815c1e Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 28 Jan 2021 09:37:01 +0800
Subject: [PATCH 4/4] CKERITOR preview css

---
 application/config/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/config.php b/application/config/config.php
index f452e73d..ffea7576 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -687,7 +687,7 @@ $config['access_super_manage'] = array('ycc', 'lmr', 'lyj', 'cyc', 'zp');
 
 //编辑器预览样式路径
 $config['css_source_cht'] = 'https://data.chinahighlights.com/css/min.php?f=/public/css/global.min.css,/css/festival-detail.css';
-$config['css_source_ch'] = 'https://data.chinahighlights.com/css/mobile-first.css';
+$config['css_source_ch'] = 'https://proxy-data.chinahighlights.com/css/mobile-first.css';
 
 $config['css_source_gm'] = 'https://data.chinarundreisen.com/public/pkg/css/baselAlRkXMnl750806T065919409Z.css';