From 9f76db073c7670d71bbda484b964056c66502a1f Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 6 Aug 2018 13:49:01 +0800 Subject: [PATCH] =?UTF-8?q?app=E7=AD=96=E7=95=A5=EF=BC=8C=E5=9F=BA?= =?UTF-8?q?=E7=A1=80=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=8A=A0=E5=AF=86=E9=9A=A7?= =?UTF-8?q?=E9=81=93=E8=A1=8C=E4=B8=BA=E5=AE=A1=E6=A0=B8userregion?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20(1)proto=5Fid=E4=BF=AE=E6=94=B9=E4=B8=BAap?= =?UTF-8?q?p=5Fid,=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=E4=B8=BAapp=5Fid=5Fregion=20(2)?= =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=8F=98=E9=87=8Fapp=5Fcfg=5Fuserregion=5Fsp?= =?UTF-8?q?litor=EF=BC=8C=E5=80=BC=E4=B8=BA&=E5=88=B0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8Capp=E7=AD=96=E7=95=A5=EF=BC=8C?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=EF=BC=8C=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E9=9A=A7=E9=81=93=E8=A1=8C=E4=B8=BA=E5=88=86=E9=9A=94userregio?= =?UTF-8?q?n=E7=9A=84=E5=88=86=E9=9A=94=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/Constants.java | 3 ++- .../nis/web/service/configuration/AppCfgService.java | 12 ++++++------ src/main/resources/nis.properties | 6 ++++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index b1c33827c..aa9a253a4 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -7,6 +7,7 @@ import java.util.Map; import com.google.gson.GsonBuilder; public final class Constants { + public static String APP_CFG_USERREGION_SPLITOR=Configurations.getStringProperty("app_cfg_userregion_splitor", "&"); /** * MaatConfig 默认值 */ @@ -430,7 +431,7 @@ public final class Constants { public static final Integer CLIENT_CONNECT_TIMEOUT = Configurations.getIntProperty("client_connect_timeout",1000); public static final Integer CLIENT_READ_TIMEOUT = Configurations.getIntProperty("client_read_timeout",1000); public static final Integer CLIENT_SOCKET_TIMEOUT = Configurations.getIntProperty("client_socket_timeout",1000); - public static final String PROTO_ID_REGION = Configurations.getStringProperty("proto_id_region","PROTO_ID"); + public static final String APP_ID_REGION = Configurations.getStringProperty("app_id_region","APP_ID"); public static final String BEHAV_ID_REGION = Configurations.getStringProperty("behav_id_region","BEHAV_ID"); public static final String RATE_LIMIT_REGION = Configurations.getStringProperty("rate_limit_region","RATE_LIMIT"); public static final String AREA_REGION = Configurations.getStringProperty("area_region","area_ip"); diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index 1bfc35dc5..eef85a512 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -471,25 +471,25 @@ public class AppCfgService extends BaseService { maatCfg.setIsValid(entity.getIsValid()); if(Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equalsIgnoreCase(configType)) { //设置APP自定义域 - String userRegion = "APP_ID="+entity.getAppCode(); + String userRegion = Constants.APP_ID_REGION+"="+entity.getAppCode(); //限速业务需要设置 String actionCode = DictUtils.getDictCode("SERVICE_ACTION", "action_ratelimit"); if(!actionCode.equals("默认")){ if(entity.getAction().equals(Integer.parseInt(actionCode))){ - userRegion += Constants.USER_REGION_SPLIT+Constants.RATE_LIMIT_REGION+"="+entity.getRatelimit(); + userRegion += Constants.APP_CFG_USERREGION_SPLITOR+Constants.RATE_LIMIT_REGION+"="+entity.getRatelimit(); } } if(entity.getBehavCode()!=null) { - userRegion += Constants.USER_REGION_SPLIT+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode(); + userRegion += Constants.APP_CFG_USERREGION_SPLITOR+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode(); } maatCfg.setUserRegion(userRegion); }else if(Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equalsIgnoreCase(configType)) { - String userRegion = Constants.PROTO_ID_REGION+"="+entity.getAppCode(); + String userRegion = Constants.APP_ID_REGION+"="+entity.getAppCode(); maatCfg.setUserRegion(userRegion); }else if(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equalsIgnoreCase(configType)) { - String userRegion = Constants.PROTO_ID_REGION+"="+entity.getAppCode(); + String userRegion = Constants.APP_ID_REGION+"="+entity.getAppCode(); if(entity.getBehavCode()!=null) { - userRegion += Constants.USER_REGION_SPLIT+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode(); + userRegion += Constants.APP_CFG_USERREGION_SPLITOR+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode(); } maatCfg.setUserRegion(userRegion); } diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 4a2ed7d31..4ea1f0477 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -431,7 +431,7 @@ specific_service_cfg_type_app=social_app specific_service_cfg_type_encrypted_tunnel_behavior=encrypted_tunnel_behavior specific_service_cfg_type_basic_protocol=basic_protocol #基础协议自定义域 -proto_id_region=PROTO_ID +app_id_region=APP_ID #IP默认值 ipv4_default_ip_value=\:\: ipv4_default_ip_subnet_value=0.0.0.0/32 @@ -445,4 +445,6 @@ port_mask_default=0/65535 maat_cfg_dolog_default=1 maat_cfg_dolog_doblacklist_default=1 maat_cfg_dolog_configpercent_default=100 -maat_cfg_dolog_configoption_default=1 \ No newline at end of file +maat_cfg_dolog_configoption_default=1 +#app，基础协议，特定服务的userregion分隔符 +app_cfg_userregion_splitor=& \ No newline at end of file