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 @@ - + 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变量保存.