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

1、修改serviceTable.properties中service为16的action;

Browse Source 
2、调用凯歌接口时添加异常捕捉处理；
This commit is contained in:
zhangdongxu
2018-06-11 15:06:47 +08:00
parent 2984ad926e
commit c60ea96d31
3 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java
View File

@@ -338,8 +338,12 @@ public class ConfigSourcesController extends BaseRestController {
// 验证配置编译数据
validateConfigSource(thread, start, configSource);
Long benginTime = System.currentTimeMillis();
configSourcesService.saveMaatConfig(thread, start, configSource.getConfigCompileList(), sb);
String msg = configSourcesService.saveMaatConfig(thread, start, configSource.getConfigCompileList(), sb);
if ("error".equals(msg)) {
Exception exception = ConfigSourcesService.getMsgList().get(0);
throw new RestServiceException(thread, System.currentTimeMillis() - start,
"存储编译配置时出现异常" + exception.getMessage(), RestBusinessCode.unknow_error.getValue());
}
Long endSaveTime = System.currentTimeMillis();
Long time = (endSaveTime - benginTime) / 1000;
System.out.println("插入数据成功总共需要" + time + "秒");
@@ -553,8 +557,12 @@ public class ConfigSourcesController extends BaseRestController {
null);
StringBuffer sb = new StringBuffer();
configSourcesService.saveCommonSources(thread, start, jsonString, sb);
String msg = configSourcesService.saveCommonSources(thread, start, jsonString, sb);
if (msg.equals("error")) {
Exception exception = ConfigSourcesService.getMsgList().get(0);
throw new RestServiceException(thread, System.currentTimeMillis() - start,
"存储回调配置时出现异常" + exception.getMessage(), RestBusinessCode.unknow_error.getValue());
}
return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "配置数据插入成功",
Constants.IS_DEBUG ? jsonString : null);
}
@@ -570,8 +578,12 @@ public class ConfigSourcesController extends BaseRestController {
jsonString);
StringBuffer sb = new StringBuffer();
configSourcesService.updateCommonSources(thread, start, jsonString, new Date(), sb);
String msg = configSourcesService.updateCommonSources(thread, start, jsonString, new Date(), sb);
if (msg.equals("error")) {
Exception exception = ConfigSourcesService.getMsgList().get(0);
throw new RestServiceException(thread, System.currentTimeMillis() - start,
"修改回调配置状态时出现异常" + exception.getMessage(), RestBusinessCode.unknow_error.getValue());
}
return compileServiceResponse(thread, System.currentTimeMillis() - start, request, response, "配置状态修改成功",
Constants.IS_DEBUG ? jsonString : null);
}

26
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -1298,9 +1298,15 @@ public class ConfigSourcesService extends BaseService {
return "error";
}
}
configRedisService.saveMaatConfig(configMap);
try {
logger1.info("---------------调用maat配置新增接口---------------------");
configRedisService.saveMaatConfig(configMap);
} catch (Exception e) {
// TODO: handle exception
logger1.error(e.getMessage());
msgList.add(e);
return "error";
}
return "ok";
}
private Map<String, String> convertObjectToMap(Object obj,Class clazz){
@@ -2599,8 +2605,14 @@ public class ConfigSourcesService extends BaseService {
}
}
try {
configRedisService.saveUnMaatConfig(configMap);
} catch (Exception e) {
// TODO: handle exception
logger1.error(e.getMessage());
msgList.add(e);
return "error";
}
return "ok";
}
@@ -2659,8 +2671,14 @@ public class ConfigSourcesService extends BaseService {
return "error";
}
}
try {
configRedisService.delUnMaatConfig(restMap);
} catch (Exception e) {
// TODO: handle exception
logger1.error(e.getMessage());
msgList.add(e);
return "error";
}
return "ok";
}
private String checkOptForUpdate(Map<String, Object> srcMap) {

6
src/main/resources/serviceTable.properties
View File

@@ -5,7 +5,7 @@
####3:例如:80=10:MM_COMPILE;11:MM_GROUP;12:AV_CONT_IP_PORT
####4:type中10代表是编译配置,11代表是分组配置,12代表是ip类域配置,13代表是数值类配置,14代表是字符串类域配置,15代表是增强字符串类域配置,16代表是文件摘要类域配置,17代表是文本相似性域配置,18代表是生效范围IP段配置
#################################################################################
service=1:128;2:128;16:48;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;143:1;144:1;256:16;257:16;258:16;259:16;260:16;384:1;385:1;386:1;387:1;388:1;512:1;513:1;528:48;529:48;544:2;545:2;560:80;561:80;768:96;1024:1;1040:16;1041:16;1056:64;1057:64;1058:64;
service=1:128;2:128;16:16;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;27:16;30:16;31:16;32:16;128:1;129:1;130:1;131:1;132:1;133:1;134:1;135:1;136:1;137:1;138:1;139:1;140:1;141:1;143:1;144:1;256:16;257:16;258:16;259:16;260:16;384:1;385:1;386:1;387:1;388:1;512:1;513:1;528:48;529:48;544:2;545:2;560:80;561:80;768:96;1024:1;1040:16;1041:16;1056:64;1057:64;1058:64;
#1024:16,不知道表名怎么写
#30有问题:14:NTC_XMPP_REGION,NTC_XMPP_CONT不确定表是不是字符串类
@@ -14,10 +14,10 @@ service=1:128;2:128;16:48;17:16;18:16;19:16;20:16;21:16;22:16;23:16;24:16;26:16;
1=10:WHITE_LIST_COMPILE;11:WHITE_LIST_GROUP;12:WHITE_LIST_IP;18:NTC_IP_RANGE
2=10:WHITE_LIST_COMPILE;11:WHITE_LIST_GROUP;14:WHITE_LIST_DOMAIN;18:NTC_IP_RANGE
16=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_IP;18:NTC_IP_RANGE;18:NTC_IP_RANGE
16=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_IP;18:NTC_IP_RANGE
17=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_UNIVERSAL_IP;13:NTC_UNIVERSAL_PROTO_TYPE;14:NTC_HTTP_URL,NTC_HTTP_REQ_BODY,NTC_HTTP_RES_BODY;15:NTC_HTTP_REQ_HDR,NTC_HTTP_RES_HDR;18:NTC_IP_RANGE
18=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_UNIVERSAL_IP;13:NTC_UNIVERSAL_PROTO_TYPE;15:NTC_DNS_REGION;18:NTC_IP_RANGE
19=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_UNIVERSAL_IP;13:NTC_UNIVERSAL_PROTO_TYPE;14:NTC_SSL_SNI,NTC_SSL_SAN,NTC_SSL_CN;18:NTC_IP_RANGE
19=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_UNIVERSAL_IP;13:NTC_UNIVERSAL_PROTO_TYPE;14:NTC_SSL_SNI,NTC_SSL_SAN,NTC_SSL_CA;18:NTC_IP_RANGE
20=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_UNIVERSAL_IP;13:NTC_UNIVERSAL_PROTO_TYPE;15:NTC_MAIL_HDR,NTC_MAIL_BODY;16:NTC_FILE_DIGEST;18:NTC_IP_RANGE
21=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_UNIVERSAL_IP;13:NTC_UNIVERSAL_PROTO_TYPE;14:NTC_FTP_URL,NTC_FTP_CONTENT;18:NTC_IP_RANGE
22=10:NTC_COMPILE;11:NTC_GROUP;12:NTC_UNIVERSAL_IP;13:NTC_UNIVERSAL_PROTO_TYPE;18:NTC_IP_RANGE