gfwleak/nms-nmsserver
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

国际化

Browse Source
This commit is contained in:
wangwenrui
2018-11-19 09:59:05 +08:00
parent d94384184b
commit f39f23aced
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
linuxinstall/install.sh
View File

@@ -223,7 +223,7 @@ then
fi
#-----------db url
db_url="jdbc:mysql://"${db_host}":"${db_port}"/nms?useUnicode=true&characterEncoding=utf-8&useOldAliasMetadataBehavior=true&rewriteBatchedStatements=true"
db_url="jdbc:mysql://"${db_host}":"${db_port}"/nms?useUnicode=true\&characterEncoding=utf-8\&useOldAliasMetadataBehavior=true\&rewriteBatchedStatements=true"
#-------------db username
echo -n "enter database username: "

15
src/com/nms/server/service/CommonService.java
View File

@@ -1478,7 +1478,7 @@ public class CommonService {
" on para.mission_id=t.mission_id" +
" where t.mission_type = 6" +
// " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>"+timeStandard;
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<"+timeStandard;
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>"+timeStandard;
task6SucSql = "select info.ip,info.mission_id as taskIds" +
" from (" +
" select distinct node.node_ip as ip,rlt.mission_id as mission_id" +
@@ -1493,7 +1493,7 @@ public class CommonService {
" on para.mission_id=t.mission_id" +
" where t.mission_type = 6" +
// " and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))*24*3600>" + timeStandard +
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))<" + timeStandard +
" and (sysdate-greatest(t.create_time,nvl(para.start_time,t.create_time)))>" + timeStandard +
" )" +
" )info " ;
}
@@ -4082,7 +4082,8 @@ public class CommonService {
String ifAdminStatus = detailsArr0[9];//showNum=7,1:up,2:down
if("2".equals(ifAdminStatus)) {
state = 0;//监测公共信息的状态
dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)";
// dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)";
dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i18n_server.CommonService.dsinfo1.exception_n81i";
detailDetectionState = "0";//当前端口的状态
pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级
}
@@ -4093,7 +4094,8 @@ public class CommonService {
logger.info("test:port:inOctetsSpeed="+inOctetsSpeed+";outOctetsSpeed="+outOctetsSpeed);
if((inOctetsSpeed+outOctetsSpeed)<=0) {
state = 0;//监测公共信息的状态
dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed);
// dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed);
dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i18n_server.CommonService.dsinfo2.exception_n81i,inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed);
detailDetectionState = "0";//当前端口的状态
pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级
}
@@ -4156,9 +4158,10 @@ public class CommonService {
filedComments = tm==null?"":tm.getFiledComments();
}
cpInfo += " "+(StringUtils.isEmpty(elem.getFiledCommonts())?filedName:elem.getFiledCommonts());
cpInfo += " 为："+detail.get(filedName);
cpInfo += " i18n_server.CommonService.for_n81i："+detail.get(filedName);
cpInfo += (elem.getPoliceUnit()==null ? "" : "null".equals(elem.getPoliceUnit()) ? "" : elem.getPoliceUnit());
cpInfo += " 报警级别："+pLevel;
// cpInfo += " 报警级别："+pLevel;
cpInfo += " i18n_server.CommonService.policyLevel_n81i："+pLevel;
cpInfo += " \n";
}
}

11
src/com/nms/server/thread/detectDataHandler/DataResolveThread.java
View File

@@ -1019,7 +1019,8 @@ public class DataResolveThread implements Runnable{
String ifAdminStatus = detailsArr0[9];//showNum=7,1:up,2:down
if("2".equals(ifAdminStatus)) {
state = 0;//监测公共信息的状态
dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)";
// dsinfo += "$@$端口"+ifDescr+"异常(配置状态与实际状态不符)";
dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i18n_server.CommonService.dsinfo1.exception_n81i";
detailDetectionState = "0";//当前端口的状态
pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级
}
@@ -1030,7 +1031,8 @@ public class DataResolveThread implements Runnable{
logger.info("test:port:inOctetsSpeed="+inOctetsSpeed+";outOctetsSpeed="+outOctetsSpeed);
if((inOctetsSpeed+outOctetsSpeed)<=0) {
state = 0;//监测公共信息的状态
dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed);
// dsinfo += "$@$端口"+ifDescr+"异常(流量为0),inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed);
dsinfo += "i18n_server.CommonService.dsinfo1_n81i"+ifDescr+"i1n8_server.CommonService.dsinfo1.exception_n81i,inOctetsSpeed="+inOctetsSpeed+",outOctetsSpeed="+outOctetsSpeed+",sum="+(inOctetsSpeed+outOctetsSpeed);
detailDetectionState = "0";//当前端口的状态
pLevel = Constants.PORT_ALARM_LEVEL;//非界面设置，默认为5级
}
@@ -1093,9 +1095,10 @@ public class DataResolveThread implements Runnable{
filedComments = tm==null?"":tm.getFiledComments();
}
cpInfo += " "+(StringUtils.isEmpty(elem.getFiledCommonts())?filedName:elem.getFiledCommonts());
cpInfo += " 为："+detail.get(filedName);
cpInfo += " i18n_server.CommonService.for_n81i："+detail.get(filedName);
cpInfo += (elem.getPoliceUnit()==null ? "" : "null".equals(elem.getPoliceUnit()) ? "" : elem.getPoliceUnit());
cpInfo += " 报警级别："+pLevel;
// cpInfo += " 报警级别："+pLevel;
cpInfo += " i18n_server.CommonService.policyLevel_n81i："+pLevel;
cpInfo += " \n";
}
}