Merge remote-tracking branch 'origin/master'

application/config/config.php

@@ -694,7 +694,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';
 

application/controllers/cache.php

@@ -22,11 +22,13 @@ 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');
-        $this->site_code = $this->input->get('site_code') || $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 +70,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 +160,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;
                 }
             }
         }