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、证书表名改为NTC_SSL_CN；
3、删除之前域表类型设置改从applicationConfig-rule.properties获取；
This commit is contained in:
zhangdongxu
2018-07-18 13:15:29 +08:00
parent 4015d8e858
commit b55bad8343
7 changed files with 138 additions and 1985 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,10 +146,6 @@ public class CompileVal {
}
}
}
// else {
// return "编译配置id为" + configCompile.getCompileId() + "的配置中"
// + CompileJudgeCode.GroupListEQZero.getErrorReason();
// }
List<Long> regionGroupIdList = new ArrayList<Long>();// 所有域配置中groupId的集合,不重复
List<NumRegion> numRegionList = configCompile.getNumRegionList();
@@ -244,14 +240,14 @@ public class CompileVal {
if (!isUpdate && Constants.BASE_VALIDATE) {
String valStrRegion = valStrRegion(strRegion, compileId,
ConfigSourcesService.isStrStrongRegion(strRegion.getTableName()));
ConfigSourcesService.isStrStrongRegion(strRegion.getTableName(),configCompile.getService()));
if (!valStrRegion.equals("ok")) {
return valStrRegion;
}
}
if (!isUpdate && Constants.SERVICE_VALIDATE) {
String serviceStrRegionVal = serviceStrRegionVal(strRegion, compileId,
ConfigSourcesService.isStrStrongRegion(strRegion.getTableName()));
ConfigSourcesService.isStrStrongRegion(strRegion.getTableName(),configCompile.getService()));
if (!serviceStrRegionVal.equals("ok")) {
return serviceStrRegionVal;
}