gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改证书提示信息加逗号隔开，流量统计加判断null

Browse Source
This commit is contained in:
zhanghongqing
2018-11-15 12:47:21 +08:00
parent 642c0276ea
commit a4fd1cb181
4 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/messages/message_en.properties
View File

@@ -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)

4
src/main/resources/messages/message_ru.properties
View File

@@ -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)

4
src/main/resources/messages/message_zh_CN.properties
View File

@@ -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)

33
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -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 class='frist rowData select-row-tr' onclick='javascript:osClick(\""+itemObj.osType+"\",this);return false;'>";
tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.osType+"'>"+itemObj.osType+"</td>";
tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.osType+"'>"+os+"</td>";
if(preCount<count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-up' style='color:red'/>"+"</td></tr>";
}else if(preCount>count){
@@ -812,12 +820,20 @@ function browserList() {
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>");
}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 class='frist rowData select-row-tr' onclick='javascript:bsClick(\""+itemObj.bsType+"\",this);return false;'>";
tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.bsType+"'>"+itemObj.bsType.substring(0,18)+"</td>";
tr += "<td class='list_c2' style='color:#fff' title='"+itemObj.bsType+"'>"+bs+"</td>";
if(preCount<count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-up' style='color:red'/>"+"</td></tr>";
}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 class='frist rowData select-row-tr' onclick='javascript:webClick(\""+itemObj.websiteServiceId+"\",this);return false;'>";
tr += "<td class='list_c1' style='color:#fff'>"+n+"</td>";
tr += "<td class='list_c2' style='color:#fff' title="+itemObj.websiteService+">"+itemObj.websiteService.substring(0,18)+"</td>";
tr += "<td class='list_c2' style='color:#fff' title="+itemObj.websiteService+">"+web+"</td>";
if(itemObj.preCount<itemObj.count){
tr += "<td class='list_c3'>"+"<i class='fa fa-arrow-up' style='color:red'/>"+"</td></tr>";
}else if(itemObj.preCount>itemObj.count){