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

1、修改maat.xml中多媒体配置的service;

Browse Source 
2、修改service与DBIdex的对应关系;
This commit is contained in:
zhangdongxu
2018-06-04 17:52:20 +08:00
parent bac61bf27b
commit 5c221ed548
3 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1282,14 +1282,20 @@ public class ConfigSourcesService extends BaseService {
while (serviceIterator.hasNext()) { while (serviceIterator.hasNext()) {
Integer service =Integer.valueOf(serviceIterator.next().toString()); Integer service =Integer.valueOf(serviceIterator.next().toString());
List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service);
for (Integer dbIndex : dbIndexList) { if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) {
if (configMap.containsKey(dbIndex)) { for (Integer dbIndex : dbIndexList) {
configMap.get(dbIndex).addAll(maatMap.get(service)); if (configMap.containsKey(dbIndex)) {
}else{ configMap.get(dbIndex).addAll(maatMap.get(service));
List<MaatConfig> list = new ArrayList<MaatConfig>(); }else{
list.addAll(maatMap.get(service)); List<MaatConfig> list = new ArrayList<MaatConfig>();
configMap.put(dbIndex, list); list.addAll(maatMap.get(service));
configMap.put(dbIndex, list);
}
} }
}else {
RuntimeException e = new RuntimeException("service与写入数据库序号映射关系不存在");
msgList.add(e);
return "error";
} }
} }
@@ -1362,14 +1368,20 @@ public class ConfigSourcesService extends BaseService {
while (serviceIterator.hasNext()) { while (serviceIterator.hasNext()) {
Integer service =Integer.valueOf(serviceIterator.next().toString()); Integer service =Integer.valueOf(serviceIterator.next().toString());
List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service);
for (Integer dbIndex : dbIndexList) { if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) {
if (restMap.containsKey(dbIndex)) { for (Integer dbIndex : dbIndexList) {
restMap.get(dbIndex).put(service, compileMap.get(service)); if (restMap.containsKey(dbIndex)) {
}else{ restMap.get(dbIndex).put(service, compileMap.get(service));
Map<Integer, List<Long>> map = new HashMap<Integer, List<Long>>(); }else{
map.put(service, compileMap.get(service)); Map<Integer, List<Long>> map = new HashMap<Integer, List<Long>>();
restMap.put(dbIndex, map); map.put(service, compileMap.get(service));
restMap.put(dbIndex, map);
}
} }
}else {
RuntimeException e = new RuntimeException("service值为"+service+",与写入数据库序号映射关系不存在");
msgList.add(e);
return "error";
} }
} }
try { try {
@@ -2552,14 +2564,20 @@ public class ConfigSourcesService extends BaseService {
while (serviceIterator.hasNext()) { while (serviceIterator.hasNext()) {
Integer service =Integer.valueOf(serviceIterator.next().toString()); Integer service =Integer.valueOf(serviceIterator.next().toString());
List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service);
for (Integer dbIndex : dbIndexList) { if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) {
if (configMap.containsKey(dbIndex)) { for (Integer dbIndex : dbIndexList) {
configMap.get(dbIndex).addAll(dstMaps.get(service)); if (configMap.containsKey(dbIndex)) {
}else{ configMap.get(dbIndex).addAll(dstMaps.get(service));
List<Map<String, String>> list = new ArrayList<Map<String, String>>(); }else{
list.addAll(dstMaps.get(service)); List<Map<String, String>> list = new ArrayList<Map<String, String>>();
configMap.put(dbIndex, list); list.addAll(dstMaps.get(service));
configMap.put(dbIndex, list);
}
} }
}else {
RuntimeException e = new RuntimeException("service与写入数据库序号映射关系不存在");
msgList.add(e);
return "error";
} }
} }
@@ -2607,14 +2625,20 @@ public class ConfigSourcesService extends BaseService {
while (serviceIterator.hasNext()) { while (serviceIterator.hasNext()) {
Integer service =Integer.valueOf(serviceIterator.next().toString()); Integer service =Integer.valueOf(serviceIterator.next().toString());
List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service); List<Integer> dbIndexList = ServiceAndRDBIndexReal.getRedisDBByService(service);
for (Integer dbIndex : dbIndexList) { if (!StringUtil.isEmpty(dbIndexList)&&dbIndexList.size()>0) {
if (restMap.containsKey(dbIndex)) { for (Integer dbIndex : dbIndexList) {
restMap.get(dbIndex).put(service, cfgMap.get(service)); if (restMap.containsKey(dbIndex)) {
}else{ restMap.get(dbIndex).put(service, cfgMap.get(service));
Map<Integer, List<Long>> map = new HashMap<Integer, List<Long>>(); }else{
map.put(service, cfgMap.get(service)); Map<Integer, List<Long>> map = new HashMap<Integer, List<Long>>();
restMap.put(dbIndex, map); map.put(service, cfgMap.get(service));
restMap.put(dbIndex, map);
}
} }
}else {
RuntimeException e = new RuntimeException("service与写入数据库序号映射关系不存在");
msgList.add(e);
return "error";
} }
} }
configRedisService.delUnMaatConfig(restMap); configRedisService.delUnMaatConfig(restMap);

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

@@ -45,7 +45,7 @@
</p:expressions> </p:expressions>
</p:maatType> </p:maatType>
<p:maatType service="17;1;80;82;84;144;146;148"> <p:maatType service="17;1;256;258;260;384;386;388">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_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_cfg_id];\t;[op_time]</p:valueExpression> <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_cfg_id];\t;[op_time]</p:valueExpression>
@@ -84,7 +84,7 @@
<p:maatType service="81;145"> <p:maatType service="257;385">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_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_cfg_id];\t;[op_time]</p:valueExpression> <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_cfg_id];\t;[op_time]</p:valueExpression>
@@ -126,7 +126,7 @@
<p:maatType service="83;85;147;149"> <p:maatType service="259;387">
<p:expressions> <p:expressions>
<p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_id]</p:keyExpression> <p:keyExpression>EFFECTIVE_RULE;:;{compile_table_name};,;[compile_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_cfg_id];\t;[op_time]</p:valueExpression> <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_cfg_id];\t;[op_time]</p:valueExpression>

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

@@ -1,6 +1,6 @@
################################################################################# #################################################################################
####maat格式配置各业务类型对应的编译,分组,域配置等的表名 ####maat格式配置各业务类型对应的编译,分组,域配置等的表名
####1:固定需要写service=业务类型1;业务类型2 ####1:固定需要写service=业务类型1:动作;业务类型2:动作
####2:然后每个业务类型:业务类型1=type1:表名1;type2:表名2;type3:表名3 ####2:然后每个业务类型:业务类型1=type1:表名1;type2:表名2;type3:表名3
####3:例如:80=10:MM_COMPILE;11:MM_GROUP;12:AV_CONT_IP_PORT ####3:例如:80=10:MM_COMPILE;11:MM_GROUP;12:AV_CONT_IP_PORT
####4:type中10代表是编译配置,11代表是分组配置,12代表是ip类域配置,13代表是数值类配置,14代表是字符串类域配置,15代表是增强字符串类域配置,16代表是文件摘要类域配置,17代表是文本相似性域配置 ####4:type中10代表是编译配置,11代表是分组配置,12代表是ip类域配置,13代表是数值类配置,14代表是字符串类域配置,15代表是增强字符串类域配置,16代表是文件摘要类域配置,17代表是文本相似性域配置
@@ -92,7 +92,8 @@ unMaatService=3:32;4:96;25:32;28:32;29:32;261:16;262:16;263:16;264:16;265:16;266
394=0:MM_PORN_VIDEO_LEVEL 394=0:MM_PORN_VIDEO_LEVEL
##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个 ##各业务类型对应的redisdb,业务类型:redisdb,多个业务以“;”分隔,多个db以“,”数量不能超过6个
serviceDBIndex=3:2,3;1:2;80:2;81:2;82:2;83:2;84:2;85:2;144:2;145:2;146:2;147:2;148:2;149:2;96:3;97:3;98:3;99:3;160:3,4;161:3;162:3;163:3;100:3;101:3;164:3;165:3 #serviceDBIndex=3:2,3;1:2;80:2;81:2;82:2;83:2;84:2;85:2;144:2;145:2;146:2;147:2;148:2;149:2;96:3;97:3;98:3;99:3;160:3,4;161:3;162:3;163:3;100:3;101:3;164:3;165:3
serviceDBIndex=1:2,3,4;2:2,3,4;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;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;256:2;257:2;258:2;259:2;260:2;384:2;385:2;386:2;387:2;388:2;512:2;513:2;528:2;529:2;544:2;545:2;560:2;561:2;