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

修改compile_id为cfg_id

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-05-31 10:26:05 +08:00
parent 4138ed2672
commit bc64f1972d
3 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/util/ServiceAndRDBIndexReal.java
View File

@@ -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);
}
}
} }

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

@@ -74,7 +74,7 @@ public class ConfigSourcesController extends BaseRestController {
Integer service = 98; Integer service = 98;
long id = configRedisService.getIncrId("seq_compileid"); long id = configRedisService.getIncrId("seq_compileid");
// int id=2; // int id=2;
map.put("compile_id", id + ""); map.put("cfg_id", id + "");
map.put("is_valid", "1"); map.put("is_valid", "1");
map.put("dst_file", "home"); map.put("dst_file", "home");
map.put("dst_file_md5", "fasdfdasfsdafdsafadsf"); map.put("dst_file_md5", "fasdfdasfsdafdsafadsf");
@@ -92,7 +92,7 @@ public class ConfigSourcesController extends BaseRestController {
Map<String, String> map = new HashMap<String, String>(); Map<String, String> map = new HashMap<String, String>();
long id = configRedisService.getIncrId("seq_compileid"); long id = configRedisService.getIncrId("seq_compileid");
// int id=2; // int id=2;
map.put("compile_id", id + ""); map.put("cfg_id", id + "");
map.put("is_valid", "1"); map.put("is_valid", "1");
map.put("service", "100"); map.put("service", "100");
map.put("description", "123" + id); map.put("description", "123" + id);
@@ -141,7 +141,7 @@ public class ConfigSourcesController extends BaseRestController {
long seq_regionid1 = configRedisService.getIncrId("SEQ_REGIONID"); long seq_regionid1 = configRedisService.getIncrId("SEQ_REGIONID");
long seq_regionid2 = configRedisService.getIncrId("SEQ_REGIONID"); long seq_regionid2 = configRedisService.getIncrId("SEQ_REGIONID");
// int id=2; // int id=2;
configMap.put("compile_id", seq_compileid + ""); configMap.put("cfg_id", seq_compileid + "");
configMap.put("service", service + ""); configMap.put("service", service + "");
configMap.put("action", "0"); configMap.put("action", "0");
configMap.put("do_blacklist", "1"); configMap.put("do_blacklist", "1");
@@ -150,13 +150,13 @@ public class ConfigSourcesController extends BaseRestController {
configMap.put("user_region", "0"); configMap.put("user_region", "0");
configMap.put("is_valid", "1"); configMap.put("is_valid", "1");
configMap.put("group_num", "1"); configMap.put("group_num", "1");
configMap.put("father_compile_id", "0"); configMap.put("father_cfg_id", "0");
configMap.put("op_time", time); configMap.put("op_time", time);
List<Map<String, String>> groupMapList = new ArrayList<Map<String, String>>(); List<Map<String, String>> groupMapList = new ArrayList<Map<String, String>>();
Map<String, String> groupMap = new HashMap<String, String>(); Map<String, String> groupMap = new HashMap<String, String>();
groupMap.put("group_id", seq_groupid + ""); 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("is_valid", "1");
groupMap.put("op_time", time); groupMap.put("op_time", time);
groupMap.put("service", service + ""); groupMap.put("service", service + "");

26
src/main/resources/maatXml/maat.xml
View File

@@ -5,8 +5,8 @@
<p:maatType service="96;97;98;99;160;161;162;163"> <p:maatType service="96;97;98;99;160;161;162;163">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;FILE_INDEX_INFO;,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;FILE_INDEX_INFO;,;[cfg_id]</p:keyExpression>
<p:valueExpression>[compile_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression> <p:valueExpression>[cfg_id];\t;[is_valid];\t;[dst_file];\t;[dst_file_md5];\t;[time_stamp];&amp;nbsp;[level];\t;[file_id];\n</p:valueExpression>
</p:expressions> </p:expressions>
<p:sequences> <p:sequences>
<p:operation>1</p:operation> <p:operation>1</p:operation>
@@ -26,8 +26,8 @@
<p:maatType service="100;101;164;165"> <p:maatType service="100;101;164;165">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;mark_sample;,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;mark_sample;,;[cfg_id]</p:keyExpression>
<p:valueExpression>[compile_id];\t;[service];\t;[level];\t;[description];\t;[is_valid]</p:valueExpression> <p:valueExpression>[cfg_id];\t;[service];\t;[level];\t;[description];\t;[is_valid]</p:valueExpression>
</p:expressions> </p:expressions>
<p:sequences> <p:sequences>
<p:operation>1</p:operation> <p:operation>1</p:operation>
@@ -47,12 +47,12 @@
<p:maatType service="80;82;84;144;146;148"> <p:maatType service="80;82;84;144;146;148">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[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]</p:valueExpression> <p:valueExpression>[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]</p:valueExpression>
</p:expressions> </p:expressions>
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression>
<p:valueExpression>[group_id];\t;[compile_id];\t;[is_valid];\t;[op_time]</p:valueExpression> <p:valueExpression>[group_id];\t;[cfg_id];\t;[is_valid];\t;[op_time]</p:valueExpression>
</p:expressions> </p:expressions>
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{ip_region_table_name};,;[region_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{ip_region_table_name};,;[region_id]</p:keyExpression>
@@ -86,12 +86,12 @@
<p:maatType service="81;145"> <p:maatType service="81;145">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[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]</p:valueExpression> <p:valueExpression>[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]</p:valueExpression>
</p:expressions> </p:expressions>
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression>
<p:valueExpression>[group_id];\t;[compile_id];\t;[is_valid];\t;[op_time]</p:valueExpression> <p:valueExpression>[group_id];\t;[cfg_id];\t;[is_valid];\t;[op_time]</p:valueExpression>
</p:expressions> </p:expressions>
@@ -128,12 +128,12 @@
<p:maatType service="83;85;147;149"> <p:maatType service="83;85;147;149">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[cfg_id]</p:keyExpression>
<p:valueExpression>[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]</p:valueExpression> <p:valueExpression>[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]</p:valueExpression>
</p:expressions> </p:expressions>
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{group_table_name};,;[group_id]</p:keyExpression>
<p:valueExpression>[group_id];\t;[compile_id];\t;[is_valid];\t;[op_time]</p:valueExpression> <p:valueExpression>[group_id];\t;[cfg_id];\t;[is_valid];\t;[op_time]</p:valueExpression>
</p:expressions> </p:expressions>
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{num_region_table_name};,;[region_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{num_region_table_name};,;[region_id]</p:keyExpression>