diff --git a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java index bba4888..3ae1d03 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -1518,7 +1518,7 @@ public class ConfigSourcesService extends BaseService { newMaatConfig); } catch (Exception e) { // TODO Auto-generated catch block - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); e = new RuntimeException( "未找到域列表，请检查域类型是否正确！"); msgList.add(e); @@ -1542,7 +1542,7 @@ public class ConfigSourcesService extends BaseService { } else { RuntimeException e = new RuntimeException( "service与写入数据库序号映射关系不存在"); - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); msgList.add(e); return "error"; } @@ -1560,7 +1560,7 @@ public class ConfigSourcesService extends BaseService { // TODO: handle exception CompileVal.setBusinessCode(RestBusinessCode.unknow_error.getValue()); if (e.getMessage().startsWith("后台错误:")) { - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); } logger1.error(e.getMessage()); msgList.add(e); @@ -1650,7 +1650,7 @@ public class ConfigSourcesService extends BaseService { } else { RuntimeException e = new RuntimeException("service值为" + service + ",与写入数据库序号映射关系不存在"); - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); msgList.add(e); return "error"; } @@ -1658,7 +1658,7 @@ public class ConfigSourcesService extends BaseService { try { if (!configRedisService.delMaatConfig(restMap)) { RuntimeException e = new RuntimeException("不存在映射关系"); - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); msgList.add(e); return "error"; } @@ -1667,7 +1667,7 @@ public class ConfigSourcesService extends BaseService { logger1.error(e.getMessage()); CompileVal.setBusinessCode(RestBusinessCode.unknow_error.getValue()); if (e.getMessage().startsWith("后台错误:")) { - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); } msgList.add(e); return "error"; @@ -3196,7 +3196,7 @@ public class ConfigSourcesService extends BaseService { } else { RuntimeException e = new RuntimeException( "service与写入数据库序号映射关系不存在"); - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); msgList.add(e); return "error"; } @@ -3209,7 +3209,7 @@ public class ConfigSourcesService extends BaseService { logger1.error(e.getMessage()); CompileVal.setBusinessCode(RestBusinessCode.unknow_error.getValue()); if (e.getMessage().startsWith("后台错误:")) { - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); } msgList.add(e); return "error"; @@ -3227,7 +3227,7 @@ public class ConfigSourcesService extends BaseService { } catch (Exception e) { // TODO: handle exception logger1.error(e.getMessage()); - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); thread.setExceptionInfo(e.getMessage() + sb.toString()); throw new RestServiceException(thread, System.currentTimeMillis() - start, e.getMessage() + sb.toString(), @@ -3278,7 +3278,7 @@ public class ConfigSourcesService extends BaseService { } else { RuntimeException e = new RuntimeException( "service与写入数据库序号映射关系不存在"); - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); msgList.add(e); return "error"; } @@ -3290,7 +3290,7 @@ public class ConfigSourcesService extends BaseService { logger1.error(e.getMessage()); CompileVal.setBusinessCode(RestBusinessCode.unknow_error.getValue()); if (e.getMessage().startsWith("后台错误:")) { - CompileVal.setBusinessCode(30000); + CompileVal.setBusinessCode(RestBusinessCode.service_runtime_error.getValue()); } msgList.add(e); return "error"; diff --git a/src/main/resources/commonSources/commonSources.xml b/src/main/resources/commonSources/commonSources.xml index ac33758..2387be0 100644 --- a/src/main/resources/commonSources/commonSources.xml +++ b/src/main/resources/commonSources/commonSources.xml @@ -7,8 +7,8 @@ #0x04 IP地址丢弃 4=0:INLINE_IP_CB #0x19 IPSec丢弃 25=0:INLINE_IP_CB #0x1C GRE 丢弃 28=0:INLINE_IP_CB - #0x1D IPSEC丢弃 29=0:INLINE_IP_CB - #0x05 DDOS流量丢弃 5=0:DDOS_TARGET_IP_CB + #0x1D IPSEC丢弃 29=0:INLINE_IP_CB + #0x05 DDOS流量丢弃 5=0:DDOS_PROTECT_TARGET_IP_CB --> diff --git a/src/main/resources/serviceTable.properties b/src/main/resources/serviceTable.properties index a7aeb05..dbd6ed2 100644 --- a/src/main/resources/serviceTable.properties +++ b/src/main/resources/serviceTable.properties @@ -171,10 +171,10 @@ unMaatService=3:32;4:96;5:32;25:32;28:32;29:32;64:16;65:16;261:16;262:16;263:16; #0x03 IP地址丢弃 3=0:INLINE_IP_CB -#0x04 IP地址丢弃 +#0x04 IP地址回流 4=0:INLINE_IP_CB #0x05 DDOS流量丢弃 -5=0:DDOS_TARGET_IP_CB +5=0:DDOS_PROTECT_TARGET_IP_CB #0x19 IPSec丢弃 25=0:INLINE_IP_CB #0x1C GRE 丢弃 @@ -222,7 +222,31 @@ unMaatService=3:32;4:96;5:32;25:32;28:32;29:32;64:16;65:16;261:16;262:16;263:16; ##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个 #系统简称对应的redisDBIndex: NTC(1-255):2 MM(256-511):3 PXY(512-767):4 IR(768-1023):5 DK(1024-1279):6 阀门:7 #APP 0x400-0x420 目前配置入到NTC系统对应的库中 -serviceDBIndex=1:2,3,4,6;2:2,3,4,6;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,5,7;34:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2;138:2;139:2;140:2;141:2;143:2;144:2;145:2;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4,7;513:4,2,7;528:4;529:4;544:4;545:4;560:4;561:4;768:4;848:2;1024:2,6,7;1025:2;1026:2,6,7;1027:2;1028:2,6,7;1040:2,6,7;1056:2,6,7;1057:6,7;1058:6,2,7;3:2,7;4:2,7;5:2,7;25:2,7;28:2,7;29:2;64:2;65:2;261:3;262:3;263:3;264:3;265:3;266:3;389:3;390:3;391:3;392:3;393:3;394:3;832:2,3,7 +########## 配置分发 +##MAAT配置 +#0x01 全局IP白名单 1:2,3,4,6,7; +#0x02 全局域名白名单 2:2,3,4,6,7; +#0x89 IPSec监测 137:2,7; +#0x8C GRE监测 140:2,7; +#0x91 APP监测 145:2,6,7; +#0x200 PXY拦截IP 512:4,7; +#0x201 PXY拦截域名 513:4,2,7; +#0x21 APP阻断 33:2,6,7; +#0x400 APP HTTP特征发现 1024:2,6,7; +#0x402 APP DOMAIN特征发现 1026:2,6,7; +#0x404 APP IP特征 1028:2,6,7; +#0x410 APP丢弃 1040:2,6,7; +#0x420 APP限流 1056:2,6,7; +#0x421 IP限流 1057:6,7; +#0x422 域名限流 1058:6,2,7; +##回调类配置 +#0x03 IP地址丢弃 3:2,7; +#0x04 IP地址回流 4:2,7; +#0x19 IPSec丢弃 25:2,7; +#0x1C GRE 丢弃 28:2,7; +#0x340 IP复用地址池配置（回调）832:2,4,7 +########## +serviceDBIndex=1:2,3,4,6,7;2:2,3,4,6,7;16:2;17:2;18:2;19:2;20:2;21:2;22:2;23:2;24:2;26:2;27:2;30:2;31:2;32:2;33:2,6,7;34:2;128:2;129:2;130:2;131:2;132:2;133:2;134:2;135:2;136:2;137:2,7;138:2;139:2;140:2,7;141:2;143:2;144:2;145:2,6,7;256:3;257:3;258:3;259:3;260:3;384:3;385:3;386:3;387:3;388:3;512:4,7;513:4,2,7;528:4;529:4;544:4;545:4;560:4;561:4;768:4;848:2;1024:2,6,7;1025:2;1026:2,6,7;1027:2;1028:2,6,7;1040:2,6,7;1056:2,6,7;1057:6,7;1058:6,2,7;3:2,7;4:2,7;5:2;25:2,7;28:2,7;29:2;64:2;65:2;261:3;262:3;263:3;264:3;265:3;266:3;389:3;390:3;391:3;392:3;393:3;394:3;832:2,4,7 ##maat配置入阀门需要将编译中的部分参数写到域配置中，目前最多包含ACTION，SERVICE，USER_REGION三个属性