From 4c5bc5b6e9fbfa1ca912a95ad46053e7c4220dd3 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Fri, 22 Feb 2019 17:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAppSession=E7=BB=84=E4=BB=B6'?=
 =?UTF-8?q?S2C'=E9=A1=B9=E5=85=B3=E9=94=AE=E5=AD=97=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/AppMultiFeatureCfgService.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
index d6037d8f1..1561190ca 100644
--- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
@@ -328,7 +328,7 @@ public class AppMultiFeatureCfgService extends BaseService {
 				keyword += "CR=2" + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
 			}
 			if(StringUtils.isNotBlank(cfg.getFlags())) { // Tcp包发送特性
-				keyword += "C2S_SEQ=C2S_P" + Constants.KEYWORD_EXPR;
+				keyword += "C2S_SEQ=C2S_P" + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
 			}
 			if(StringUtils.isNotBlank(cfg.getFragmentOffset())) { // 域名初筛标识
 				keyword += "IPD_ID=" + cfg.getAppCode() + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
@@ -341,13 +341,13 @@ public class AppMultiFeatureCfgService extends BaseService {
 			cfg.setUserRegion5(null);
 		}else {
 			if(StringUtils.isNotBlank(cfg.getUserRegion3())) {
-				keyword += "SSL_RES" + Constants.KEYWORD_EXPR;
+				keyword += "SSL_RES" + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
 			}
 			if(StringUtils.isNotBlank(cfg.getUserRegion4())) {
-				keyword += "SINGLE_CERT" + Constants.KEYWORD_EXPR;
+				keyword += "SINGLE_CERT" + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
 			}
 			if(StringUtils.isNotBlank(cfg.getUserRegion5())) {
-				keyword += "SELF_ISSUED" + Constants.KEYWORD_EXPR;
+				keyword += "SELF_ISSUED" + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
 			}
 			cfg.setHeaderType(null);
 			cfg.setVer(null);
@@ -530,7 +530,7 @@ public class AppMultiFeatureCfgService extends BaseService {
 								BeanUtils.copyProperties(cfg, cfg2, new String[]{"cfgId"});
 								
 								if(!StringUtil.isBlank(cfg2.getIcmpIdentifier())) { // C2S
-									keyword += cfg2.getIcmpIdentifier() + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
+									keyword += cfg2.getIcmpIdentifier().replace(";", ";"+Constants.KEYWORD_EXPR) + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
 									flag = true;
 								}
 								if(!StringUtil.isBlank(cfg2.getIcmpCode())) {
@@ -550,7 +550,7 @@ public class AppMultiFeatureCfgService extends BaseService {
 								keyword = "";
 								
 								if(!StringUtil.isBlank(cfg3.getIcmpType())) { // S2C
-									keyword += cfg3.getIcmpType() + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
+									keyword += cfg3.getIcmpType().replace(";", ";"+Constants.KEYWORD_EXPR) + Constants.USER_REGION_SPLIT + Constants.KEYWORD_EXPR;
 									flag = true;
 								}
 								if(!StringUtil.isBlank(cfg3.getProtocol())) {