diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 3b9fbe83e..2cc5db3b6 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1180,9 +1180,9 @@ intercept_intensity=Intercept Related Domains exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit. file_in_wrong_format=File Format Error select_certificate=Please Select Certificate Type First -root_certificate=der cer crt pem +root_certificate=der, cer, crt, pem intermediate_entity_certificate=p12 -private_certificate=pem key p12 +private_certificate=pem, key, p12 antiddos_protocol=DDOS Protocol bps_threadshold=Traffic Threshold(bps) pps_threadshold=Traffic Threshold(pps) diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 62cdec773..168af7184 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1186,9 +1186,9 @@ intercept_intensity=Intercept Related Domains exceeds_duration_limit=File upload failure,The duration of uploaded files exceeds the limit. file_in_wrong_format=File Format Error select_certificate=Please Select Certificate Type First -root_certificate=der cer crt pem +root_certificate=der, cer, crt, pem intermediate_entity_certificate=p12 -private_certificate=pem key p12 +private_certificate=pem, key, p12 antiddos_protocol=DDOS Protocol bps_threadshold=Traffic Threshold(bps) pps_threadshold=Traffic Threshold(pps) diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index b7ebef955..34ec4dfb1 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1175,9 +1175,9 @@ intercept_intensity=\u62E6\u622A\u5F3A\u5EA6 exceeds_duration_limit=\u6587\u4EF6\u4E0A\u4F20\u5931\u8D25,\u6587\u4EF6\u65F6\u957F\u8D85\u51FA\u9650\u5236. file_in_wrong_format=\u6587\u4EF6\u683C\u5F0F\u9519\u8BEF select_certificate=\u8BF7\u5148\u9009\u62E9\u6587\u4EF6\u8BC1\u4E66\u7C7B\u578B -root_certificate=der cer crt pem +root_certificate=der, cer, crt, pem intermediate_entity_certificate=p12 -private_certificate=pem key p12 +private_certificate=pem, key, p12 antiddos_protocol=DDOS\u534F\u8BAE bps_threadshold=\u6D41\u91CF\u9608\u503C(bps) pps_threadshold=\u6D41\u91CF\u9608\u503C(pps) diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp index 365a4a084..b8507b7ab 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp @@ -704,12 +704,20 @@ function systemList(){ }else{ if(n>0){ - $(rs).each(function(i, itemObj) { + $(rs).each(function(i, itemObj) { + var os=""; + if(itemObj.osType!=null){ + os=(itemObj.osType).toString(); + if(os.length>18){ + os=os.substring(0,18); + } + } + var count= itemObj.count; var preCount = itemObj.preCount; var tr = ""; tr += ""+n+""; - tr += ""+itemObj.osType+""; + tr += ""+os+""; if(preCount"+""; }else if(preCount>count){ @@ -812,12 +820,20 @@ function browserList() { $("#tbodyData1").prepend(""); }else{ if(n>0){ - $(rs).each(function(i, itemObj) { + $(rs).each(function(i, itemObj) { + var bs=""; + if(itemObj.bsType!=null){ + bs=(itemObj.bsType).toString(); + if(bs.length>18){ + bs=bs.substring(0,18); + } + } + var count= itemObj.count; var preCount = itemObj.preCount; var tr = ""; tr += ""+n+""; - tr += ""+itemObj.bsType.substring(0,18)+""; + tr += ""+bs+""; if(preCount"+""; }else if(preCount>count){ @@ -873,9 +889,16 @@ function websiteList() { }else{ if(n>0){ $(rs).each(function(i, itemObj) { + var web=""; + if(itemObj.websiteService!=null){ + web=(itemObj.websiteService).toString(); + if(web.length>18){ + web=web.substring(0,18); + } + } var tr = ""; tr += ""+n+""; - tr += ""+itemObj.websiteService.substring(0,18)+""; + tr += ""+web+""; if(itemObj.preCount"+""; }else if(itemObj.preCount>itemObj.count){