From 7444344ea28836e07ee69c8b2afaa089cca0aaf0 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Tue, 13 Nov 2018 10:18:25 +0800
Subject: [PATCH] =?UTF-8?q?title=20=E5=8E=BB=E6=8E=89=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E7=A9=BA=E6=A0=BC=E8=B7=9F=E6=8D=A2=E8=A1=8C?=
 =?UTF-8?q?=EF=BC=8Cddos=E9=85=8D=E7=BD=AE=E5=9F=9F=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=8F=9C=E5=8D=95=E6=9B=B4=E6=94=B9sql?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/sql/20181112/update_region_service_dict.sql   | 3 +++
 src/main/resources/sql/20181112/update_sys_menu.sql         | 4 ++++
 src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp      | 2 +-
 src/main/webapp/static/global/scripts/common.js             | 6 +++---
 4 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/sql/20181112/update_region_service_dict.sql
 create mode 100644 src/main/resources/sql/20181112/update_sys_menu.sql

diff --git a/src/main/resources/sql/20181112/update_region_service_dict.sql b/src/main/resources/sql/20181112/update_region_service_dict.sql
new file mode 100644
index 000000000..826d14a50
--- /dev/null
+++ b/src/main/resources/sql/20181112/update_region_service_dict.sql
@@ -0,0 +1,3 @@
+#修改ddos动作为回流，配置表为NTC_DDOS_PROTECT_TARGET_IP
+UPDATE function_region_dict SET config_region_value='NTC_DDOS_PROTECT_TARGET_IP' WHERE dict_id=74;
+UPDATE function_service_dict SET `action`=96 , action_code='loop' WHERE dict_id=82;
diff --git a/src/main/resources/sql/20181112/update_sys_menu.sql b/src/main/resources/sql/20181112/update_sys_menu.sql
new file mode 100644
index 000000000..efc34a3a7
--- /dev/null
+++ b/src/main/resources/sql/20181112/update_sys_menu.sql
@@ -0,0 +1,4 @@
+#修改日志ddos 为一个菜单
+UPDATE sys_menu SET href='/log/ntc/ntcDdosLogs/list' WHERE id=1138;
+UPDATE sys_menu SET is_show=0 WHERE id=1139;
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp
index b3a2ed6bd..4586b664f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp
@@ -346,7 +346,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="ignore_query_string"/></th>
 									<th><spring:message code="include_cookie"/></th>
-									<th><spring:message code="no_	revalidate"/></th>
+									<th><spring:message code="no_revalidate"/></th>
 									<th><spring:message code="cache_dyn_url"/></th>
 									<th><spring:message code="cache_cookied_cont"/></th>
 									<th><spring:message code="ignore_req_nocache"/></th>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index eaed09098..45e1bf45b 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -37,11 +37,11 @@ $(function(){
 	     //获取td当前对象的文本,如果长度大于25;  
 	     if($(this).text().trim().length>28){  
 	        //给td设置title属性,并且设置td的完整值.给title属性.
-	    	var strTitle = $(this).text().trim();
+	    	var strTitle = $(this).text().trim().replace(/[\r\n]/g,"").replace(/\s+/g, "");
     		//解决火狐title不能自动换行
-    		var count = Math.floor(strTitle.length/64);
+    		var count = Math.floor(strTitle.length/62);
     		for(var i=1;i<=count;i++){
-    			strTitle=strTitle.substring(0,i*64-1)+"\n"+strTitle.substring(i*64-1);
+    			strTitle=strTitle.substring(0,i*62-1)+"\n"+strTitle.substring(i*62-1);
     		}
 			$(this).attr("title",strTitle);  
             //获取td的值,进行截取。赋值给text变量保存.