Merge branch 'master' of git.mycht.cn:developers/information-system

application/controllers/information.php

@@ -413,6 +413,7 @@ class Information extends CI_Controller {
                 $this->update_cache($this->input->post('ic_url'), true);
             }
 
+            $meta_amp_status = get_meta($information->ic_id, 'AMP_STATUS');
             //德语站FAQ版块需要删除原来的文件才能更新静态
             $site_code = $this->config->item('site_code');
             $ic_url = $this->input->post('ic_url');
@@ -420,7 +421,11 @@ class Information extends CI_Controller {
             if ($site_code == 'gm' && substr($ic_url, 0, 5) == '/faq/') {
                 $update_info_log = $this->update_cache($ic_url, true);
             } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) {
-                $update_info_log = $this->update_cache($ic_url);
+                $update_url = $ic_url;
+                if ($meta_amp_status) {
+                    $update_url = '/amp'.$ic_url;
+                }
+                $update_info_log = $this->update_cache($update_url);
             } else if (strcasecmp($site_code, "cht") != 0) {//非cht站点
                 $update_info_log = $this->update_cache($ic_url);
             }

application/views/bootstrap3/header.php

@@ -5,7 +5,7 @@
         <meta charset="utf-8">
         <title>信息平台</title>
         <link rel="stylesheet" href="/css/information-system3.css?v=201508112" type="text/css" />
-        <script type="text/javascript" src="/min/?f=/js/information-system3.min.js,/js/common.js"></script>
+        <script type="text/javascript" src="/min/?f=/js/information-system3.min.js,/js/common.js&v=2018022601"></script>
         <script type="text/javascript" src="/js/kindeditor/kindeditor.js?v=20160601"></script>
         <link rel="shortcut icon" href="/bootstrap/img/glyphicons_290_skull.png">
 

js/information-system3.min.js

@@ -300,12 +300,7 @@ function errorfun(responseText, statusText, xhr, form) {
 function successfun(responseText, statusText, xhr, form) {
     for (var key in responseText) {
         if (responseText[key].name == "ok") {
-            if ($("#rule_check_flag").val() == 1 && $("#auto_update_cache_checkbox").attr("checked")) {
-                $.modaldialog.success(responseText[key].value + "n" + "\u9759\u6001\u9875\u9762\u66f4\u65b0\u4e2d...");
-                updateCache($("#auto_update_cache_checkbox").val(), "")
-            } else {
-                $.modaldialog.success(responseText[key].value)
-            }
+            $.modaldialog.success(responseText[key].value)
         } else {
             if (responseText[key].name == "ok_go") {
 				$.modaldialog.success('提交成功，正在跳转到下个页面...');
@@ -518,12 +513,12 @@ function mobile_friendly(refresh){
 var ic_url = $("#ic_url").val();
 var sitecode = $("#is_sitecode").val();
 if(refresh){
-   var url = '/info.php/apps/pagespeed/index/run'; 
+   var url = '/info.php/apps/pagespeed/index/run';
 }else{
     var url = '/info.php/apps/pagespeed/index/show_score';
 }
 $.post(url, {'psd_URL':ic_url, 'psd_SiteCode':sitecode}, function(data){
-    var json = eval('(' + data + ')'); 
+    var json = eval('(' + data + ')');
 if (json.result == 'ok'){
     $("#mobile_friendly_status").html(json.data);
 } else{
@@ -535,16 +530,16 @@ if (json.result == 'ok'){
 
 
 $(document).ready(function() {
-	
+
 	$('.ShowMeTheDatePicker_cn').datepicker({
 			dateFormat: 'yy-mm-dd',
             showButtonPanel: false
      });
-	 
+
 	$('.ShowMeTheDatePicker').datepicker({
             showButtonPanel: true
      });
-     
-    
-	 
-});
+
+
+
+});