合并Develop分支

# Conflicts:
#	application/controllers/information.php

application/controllers/information.php

@@ -494,12 +494,8 @@ class Information extends CI_Controller {
 
         switch ($this->config->item('site_code')) {
             case 'cht':
-                $url = 'http://192.155.224.195:8080/guide-use.php/travelguide/guide/?static_html_url=' . $url;
-                if (strpos($url, '/festivals/') !== false || strpos($url, '/faq/') !== false) {//ch的部分控制器不是travelguide，所以不能统一更新和生产缓存文件，只能跳过，统一控制器再回头取消这个限制
-                    $url = 'http://www.chinahighlights.com/';
-                }
+                $url = 'http://184.172.113.219:22223' . $url;
                 break;
-
             case 'ah':
                 if ($delete_only === true) {
                     $url = 'https://www.asiahighlights.com/index.php/information/delete_cache_8X913mksJ/?static_html_url=' . $url;
@@ -565,19 +561,6 @@ class Information extends CI_Controller {
         if ($content === false) {
             $data[] = array('name' => 'no', 'value' => sprintf($this->lang->line('update_cache_failed'), $url));
         } else {
-            //todo:如果请求正常，则判断返回的json是否正常
-            //echo json_decode($content);
-            //CHT网站还需要更新前端服务器缓存
-            if ($this->config->item('site_code') == 'cht') {
-                $url = 'http://www.chinahighlights.com/api/community/updatecache.asp?gurl=http://www.chinahighlights.com' . $original_url . '&other=1&site=info';
-                $content = GET_HTTP($url);
-                if ($content === false) {
-                    $data[] = array('name' => 'no', 'value' => sprintf($this->lang->line('update_vps_failed'), $url));
-                    echo json_encode($data);
-                    return false;
-                }
-            }
-
             //手动更新的话，接着更新CDN缓存
             $msg = $this->lang->line('update_cache_success');