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

1、删除无用测试类；

Browse Source 
2、修改maat与非maat配置下发接口，支持多service同时下发；
3、新增摘要获取接口
This commit is contained in:
zhangdongxu
2018-06-01 10:23:18 +08:00
parent bc600c12a4
commit cdc72ca655
27 changed files with 436 additions and 2492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/com/nis/util/CompileVal.java
View File

@@ -358,7 +358,7 @@ public class CompileVal {
* @param tableName
* @return
*/
public static boolean type2TableNameIsOk(Long serviceType, String tableName) {
public static boolean type2TableNameIsOk(Integer serviceType, String tableName) {
if (null != serviceType && null != tableName && !tableName.equals("")) {
Map<Integer, Map<String, String>> tableRelation = ConfigSourcesService.getTableRelation();
Map<String, String> map = tableRelation.get(serviceType.intValue());
@@ -432,12 +432,6 @@ public class CompileVal {
if (null == configCompile.getEffectiveRange() || configCompile.getEffectiveRange().equals("")) {
return "id为" + compileId + "的编译配置中effectiveRange不能为空";
}
if (null == configCompile.getConfigPercent()) {
return "id为" + compileId + "的编译配置中configPercent不能为空";
}
if (null == configCompile.getConfigOption()) {
return "id为" + compileId + "的编译配置中configOption不能为空";
}
if (null == configCompile.getStartTime()) {
return "id为" + compileId + "的编译配置中startTime不能为空";
}
@@ -459,9 +453,6 @@ public class CompileVal {
if (null == configCompile.getOpTime()) {
return "id为" + compileId + "的编译配置中opTime不能为空";
}
if (null == configCompile.getActiveSys()) {
return "id为" + compileId + "的编译配置中activeSys不能为空";
}
return "ok";
}
@@ -645,18 +636,19 @@ public class CompileVal {
+ "的域配置direction的值不正确,只能是0或1";
}
if (ipRegion.getTableName().toLowerCase().equals("dj_ip_port")) {
if (ipRegion.getProtocol() < 0 || ipRegion.getProtocol() > 255) {
return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId()
+ "的域配置tableName为dj_ip_port时,protocol的取值范围只能是0-255";
}
} else {
if (ipRegion.getProtocol() != 0) {
return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + "的域配置tableName为"
+ ipRegion.getTableName() + "时,protocol的值只能是0";
}
}
//zdx protocol验证？
// if (ipRegion.getTableName().toLowerCase().equals("dj_ip_port")) {
// if (ipRegion.getProtocol() < 0 || ipRegion.getProtocol() > 255) {
// return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId()
// + "的域配置tableName为dj_ip_port时,protocol的取值范围只能是0-255";
// }
// } else {
// if (ipRegion.getProtocol() != 0) {
// return "编译配置id为" + compileId + "的配置中ipRegionList中regionId为" + ipRegion.getRegionId() + "的域配置tableName为"
// + ipRegion.getTableName() + "时,protocol的值只能是0";
// }
//
// }
return "ok";
}
@@ -694,14 +686,6 @@ public class CompileVal {
return "编译配置id为" + compileId + "的配置中doLog的值只能是0(不需要),1(需要),2(只记录结构化日志，不记录非结构化日志)";
}
if (configCompile.getActiveSys() < 1 || configCompile.getActiveSys() > 7) {
return "编译配置id为" + compileId + "的配置中activeSys的值范围只能是1-7";
}
if (configCompile.getConfigOption() != 1 && configCompile.getConfigOption() != 2) {
return "编译配置id为" + compileId + "的配置中configOption的值只能是1或2";
}
if (configCompile.getFatherCfgId() != 0) {
return "编译配置id为" + compileId + "的配置中fatherCfgId的值只能是0";
}