From 2d0ac9f735b7d0ca2cdeb16669dc1d220ffff382 Mon Sep 17 00:00:00 2001 From: RenKaiGe-Office Date: Wed, 22 Aug 2018 16:33:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=B9=89service=E8=A2=AB=E5=88=86?= =?UTF-8?q?=E7=BB=84=E5=A4=8D=E7=94=A8=E7=9A=84set?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nis/util/ServiceAndRDBIndexReal.java | 63 +++++++++++++------ .../applicationConfig-rule.properties | 6 ++ 2 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java index fbafc84..677aecf 100644 --- a/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java +++ b/src/main/java/com/nis/util/ServiceAndRDBIndexReal.java @@ -10,7 +10,6 @@ import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.nis.domain.MaatXmlExpr; import com.nis.restful.RestBusinessCode; import com.nis.restful.ServiceRuntimeException; @@ -25,6 +24,11 @@ import com.nis.restful.ServiceRuntimeException; */ public class ServiceAndRDBIndexReal { private static Logger logger = LoggerFactory.getLogger(ServiceAndRDBIndexReal.class); + /** + * 记录哪些service可以被分组复用(只有maat类配置可以被分组复用) + */ + private static Set serviceRepeatedRealSet = new HashSet(); + /** * 第一个key是业务类型,第二个key是type(编译配置,分组配置,域配置)value是表名 */ @@ -60,21 +64,23 @@ public class ServiceAndRDBIndexReal { if (unMaatService != null && !unMaatService.trim().equals("")) { String[] split = unMaatService.split(";"); for (String str : split) { -//回调类删除action zdx20180821 -// String[] serviceAction = str.split(":"); -// serviceActionMap.put(Integer.valueOf(serviceAction[0]), Integer.valueOf(serviceAction[1])); -// -// String serviceType = Configurations.getStringProperty(serviceAction[0], ""); -// if (serviceType != null && !serviceType.trim().equals("")) { -// String[] typeArrs = serviceType.split(";"); -// for (String typeStr : typeArrs) { -// String[] typeArr = typeStr.split(":"); -// String tableNameArr[] = typeArr[1].split(","); -// for (String tableName : tableNameArr) { -// unMaatSercieNameMap.put(Integer.parseInt(serviceAction[0]), tableName.toUpperCase()); -// } -// } -// } + // 回调类删除action zdx20180821 + // String[] serviceAction = str.split(":"); + // serviceActionMap.put(Integer.valueOf(serviceAction[0]), + // Integer.valueOf(serviceAction[1])); + // + // String serviceType = Configurations.getStringProperty(serviceAction[0], ""); + // if (serviceType != null && !serviceType.trim().equals("")) { + // String[] typeArrs = serviceType.split(";"); + // for (String typeStr : typeArrs) { + // String[] typeArr = typeStr.split(":"); + // String tableNameArr[] = typeArr[1].split(","); + // for (String tableName : tableNameArr) { + // unMaatSercieNameMap.put(Integer.parseInt(serviceAction[0]), + // tableName.toUpperCase()); + // } + // } + // } String serviceType = Configurations.getStringProperty(str, ""); if (serviceType != null && !serviceType.trim().equals("")) { @@ -157,6 +163,17 @@ public class ServiceAndRDBIndexReal { } } } + + String serviceRepeatedReal = Configurations.getStringProperty("serviceRepeatedReal", ""); + if (serviceRepeatedReal != null && !serviceRepeatedReal.trim().equals("")) { + String[] serviceRepeatedRealArr = serviceRepeatedReal.split(","); + for (String ser : serviceRepeatedRealArr) { + if (ser != null && !ser.trim().equals("")) { + serviceRepeatedRealSet.add(Integer.parseInt(ser)); + } + + } + } } public static void main(String[] args) { @@ -237,9 +254,9 @@ public class ServiceAndRDBIndexReal { String[] serviceAction = str.split(":"); Integer ser = Integer.parseInt(serviceAction[0]); String action = serviceAction[1]; - System.out.println("0x" + Integer.toHexString(ser) + "--servie=" + ser + "--table=" - + typeMap.get(ser) + "---redisDB=" + serviceDBIndexmap.get(ser) + "--action=" + action - + "--HexAction=0x" + Integer.toHexString(Integer.parseInt(action))); + System.out.println("0x" + Integer.toHexString(ser) + "--servie=" + ser + "--table=" + typeMap.get(ser) + + "---redisDB=" + serviceDBIndexmap.get(ser) + "--action=" + action + "--HexAction=0x" + + Integer.toHexString(Integer.parseInt(action))); } } } @@ -363,4 +380,12 @@ public class ServiceAndRDBIndexReal { ServiceAndRDBIndexReal.unMaatSercieNameMap = unMaatSercieNameMap; } + public static Set getServiceRepeatedRealSet() { + return serviceRepeatedRealSet; + } + + public static void setServiceRepeatedRealSet(Set serviceRepeatedRealSet) { + ServiceAndRDBIndexReal.serviceRepeatedRealSet = serviceRepeatedRealSet; + } + } diff --git a/src/main/resources/applicationConfig-rule.properties b/src/main/resources/applicationConfig-rule.properties index c9472d8..9b048d0 100644 --- a/src/main/resources/applicationConfig-rule.properties +++ b/src/main/resources/applicationConfig-rule.properties @@ -318,3 +318,9 @@ 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;2 #0x422 域名限流 1058 maat2Valve=33:strRegion@ACTION&SERVICE&USER_REGION;35:strRegion@ACTION&SERVICE&USER_REGION;36:strRegion@ACTION&SERVICE&USER_REGION;145:strRegion@ACTION&SERVICE&USER_REGION;147:strRegion@ACTION&SERVICE&USER_REGION;148:strRegion@ACTION&SERVICE&USER_REGION;512:ipRegion@ACTION&SERVICE;513:strRegion@ACTION&SERVICE&USER_REGION;1024:strRegion|strStrRegion@USER_REGION;1026:strRegion|strStrRegion@USER_REGION;1027:strRegion|strStrRegion@USER_REGION;1028:ipRegion@USER_REGION;1029:strStrRegion@USER_REGION;1030:numRegion@USER_REGION;1031:strStrRegion@USER_REGION;1040:strRegion@ACTION&SERVICE&USER_REGION;1041:strRegion@ACTION&SERVICE&USER_REGION;1042:strRegion@ACTION&SERVICE&USER_REGION;1056:strRegion@ACTION&SERVICE&USER_REGION;1057:ipRegion@ACTION&SERVICE&USER_REGION;1058:strRegion@ACTION&SERVICE&USER_REGION;1059:strRegion@ACTION&SERVICE&USER_REGION;1060:strRegion@ACTION&SERVICE&USER_REGION + + + +##记录哪些service可以被分组复用(只有maat类配置可以被分组复用) +serviceRepeatedReal=256,257,258,259,260,267,384,385,386,387,388,395,512,513,521,528,544,560,576,592,750,768 +