From 7732a5b895b9a8409427e1cf886263e8e6d3a1d1 Mon Sep 17 00:00:00 2001 From: zhangdongxu Date: Thu, 29 Mar 2018 10:34:23 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0tabName=E5=92=8Cser?= =?UTF-8?q?vice=E7=9A=84=E6=98=A0=E5=B0=84=E5=85=B3=E7=B3=BB=EF=BC=9B=202?= =?UTF-8?q?=E3=80=81MATT=5FCONFIG=5FCOMPILE=E6=94=B9=E4=B8=BAMAAT=5FCONFIG?= =?UTF-8?q?=5FCOMPILE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/web/service/restful/ConfigSourcesService.java | 8 ++++++++ src/main/resources/matt.properties | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) 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 3d0afa9..5202b07 100644 --- a/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java +++ b/src/main/java/com/nis/web/service/restful/ConfigSourcesService.java @@ -85,6 +85,7 @@ public class ConfigSourcesService extends BaseService { typeMap.put("HID_CONTENT", "ip"); typeMap.put("GSB_PZ_IP", "ip"); typeMap.put("FAKE_REGION_EXTEND", "str"); + typeMap.put("KEYWORD_RANDOM_REGION", "str"); typeMap.put("CTRL_URL_REGION", "str"); typeMap.put("CTRL_VOIP_BLACKACCOUNT_REGION", "str"); typeMap.put("CTRL_MEDIA_FILE_FP", "digest"); @@ -93,6 +94,7 @@ public class ConfigSourcesService extends BaseService { typeMap = new HashMap(); typeMap.put("DF_IP_PORT", "ip"); typeMap.put("GSB_PZ_IP", "ip");//IP复用 + typeMap.put("CTRL_MEDIA_FILE_FP", "digest"); tableMap.put(1, typeMap); typeMap = new HashMap(); @@ -101,6 +103,11 @@ public class ConfigSourcesService extends BaseService { typeMap.put("GSB_PZ_IP", "ip");//网站伪造 tableMap.put(2, typeMap); + + typeMap = new HashMap(); + typeMap.put("CTRL_VOIP_BLACKACCOUNT_REGION", "str"); + tableMap.put(118, typeMap); + typeMap = new HashMap(); typeMap.put("UNIVERSAL_PROTO_TYPE", "num"); typeMap.put("UNIVERSAL_IP", "ip"); @@ -114,6 +121,7 @@ public class ConfigSourcesService extends BaseService { typeMap.put("UNIVERSAL_IP", "ip"); typeMap.put("DF_HTTP_RES_HDR", "str"); typeMap.put("GSB_PZ_IP", "ip");//随机丢包 + typeMap.put("CTRL_URL_REGION", "str"); tableMap.put(4, typeMap); typeMap = new HashMap(); diff --git a/src/main/resources/matt.properties b/src/main/resources/matt.properties index c0eb8e0..7536959 100644 --- a/src/main/resources/matt.properties +++ b/src/main/resources/matt.properties @@ -1,5 +1,5 @@ #编译表表名 -compileTabName=MATT_CONFIG_COMPILE +compileTabName=MAAT_CONFIG_COMPILE #编译表 新增配置时添加的字段 英文逗号分隔 compileFieldName=COMPILE_ID ,SERVICE ,ACTION , CONT_TYPE, ATTR_TYPE, CONT_LABEL, Task_id, Guarantee_ID, AFFAIR_ID, TOPIC_ID, DO_BLACKLIST ,DO_LOG ,EFFECTIVE_RANGE , ACTIVE_SYS, CONFIG_PERCENT ,CONFIG_OPTION ,START_TIME ,END_TIME , USER_REGION, IS_VALID,GROUP_NUM,FATHER_CFG_ID ,OP_TIME #编译表 配置状态更新的条件