diff --git a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java index ad22dbf..3d5dd68 100644 --- a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java +++ b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java @@ -81,13 +81,4 @@ public class ServiceAndRDBIndexReal { } } - - public static void main(String[] args) { - String str = "80:2"; - String[] serviceDBIndex = str.split(":"); - String[] redisDbArr = serviceDBIndex[1].split(","); - for (String redisDBIndex : redisDbArr) { - System.out.println(redisDBIndex); - } - } } diff --git a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java index 43aa93e..d0c48c1 100644 --- a/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java +++ b/src/main/java/com/nis/web/controller/restful/ConfigSourcesController.java @@ -74,7 +74,7 @@ public class ConfigSourcesController extends BaseRestController { Integer service = 98; long id = configRedisService.getIncrId("seq_compileid"); // int id=2; - map.put("compile_id", id + ""); + map.put("cfg_id", id + ""); map.put("is_valid", "1"); map.put("dst_file", "home"); map.put("dst_file_md5", "fasdfdasfsdafdsafadsf"); @@ -92,7 +92,7 @@ public class ConfigSourcesController extends BaseRestController { Map map = new HashMap(); long id = configRedisService.getIncrId("seq_compileid"); // int id=2; - map.put("compile_id", id + ""); + map.put("cfg_id", id + ""); map.put("is_valid", "1"); map.put("service", "100"); map.put("description", "123" + id); @@ -141,7 +141,7 @@ public class ConfigSourcesController extends BaseRestController { long seq_regionid1 = configRedisService.getIncrId("SEQ_REGIONID"); long seq_regionid2 = configRedisService.getIncrId("SEQ_REGIONID"); // int id=2; - configMap.put("compile_id", seq_compileid + ""); + configMap.put("cfg_id", seq_compileid + ""); configMap.put("service", service + ""); configMap.put("action", "0"); configMap.put("do_blacklist", "1"); @@ -150,13 +150,13 @@ public class ConfigSourcesController extends BaseRestController { configMap.put("user_region", "0"); configMap.put("is_valid", "1"); configMap.put("group_num", "1"); - configMap.put("father_compile_id", "0"); + configMap.put("father_cfg_id", "0"); configMap.put("op_time", time); List> groupMapList = new ArrayList>(); Map groupMap = new HashMap(); groupMap.put("group_id", seq_groupid + ""); - groupMap.put("compile_id", seq_compileid + ""); + groupMap.put("cfg_id", seq_compileid + ""); groupMap.put("is_valid", "1"); groupMap.put("op_time", time); groupMap.put("service", service + ""); diff --git a/src/main/resources/maatXml/maat.xml b/src/main/resources/maatXml/maat.xml index f4f7d8b..89a6e50 100644 --- a/src/main/resources/maatXml/maat.xml +++ b/src/main/resources/maatXml/maat.xml @@ -5,8 +5,8 @@ - EFFECTIVE_RULE;:;FILE_INDEX_INFO;,;[compile_id] - [compile_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp]; [level];\t;[file_id];\n + EFFECTIVE_RULE;:;FILE_INDEX_INFO;,;[cfg_id] + [cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp]; [level];\t;[file_id];\n 1 @@ -26,8 +26,8 @@ - EFFECTIVE_RULE;:;mark_sample;,;[compile_id] - [compile_id];\t;[service];\t;[level];\t;[description];\t;[is_valid] + EFFECTIVE_RULE;:;mark_sample;,;[cfg_id] + [cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid] 1 @@ -47,12 +47,12 @@ - EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] - [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_compile_id];\t;[op_time] + EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id] + [cfg_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] EFFECTIVE_RULE;:;{group_table_name};,;[group_id] - [group_id];\t;[compile_id];\t;[is_valid];\t;[op_time] + [group_id];\t;[cfg_id];\t;[is_valid];\t;[op_time] EFFECTIVE_RULE;:;{ip_region_table_name};,;[region_id] @@ -86,12 +86,12 @@ - EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] - [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_compile_id];\t;[op_time] + EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id] + [cfg_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] EFFECTIVE_RULE;:;{group_table_name};,;[group_id] - [group_id];\t;[compile_id];\t;[is_valid];\t;[op_time] + [group_id];\t;[cfg_id];\t;[is_valid];\t;[op_time] @@ -128,12 +128,12 @@ - EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id] - [compile_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_compile_id];\t;[op_time] + EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id] + [cfg_id];\t;[service];\t;[action];\t;[do_blacklist];\t;[do_log];\t;[effective_range];\t;[user_region];\t;[is_valid];\t;[group_num];\t;[father_cfg_id];\t;[op_time] EFFECTIVE_RULE;:;{group_table_name};,;[group_id] - [group_id];\t;[compile_id];\t;[is_valid];\t;[op_time] + [group_id];\t;[cfg_id];\t;[is_valid];\t;[op_time] EFFECTIVE_RULE;:;{num_region_table_name};,;[region_id]