From 935f70fa4f981539ca3751baacfe89a7fcdbd292 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Tue, 28 May 2019 18:19:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Proxy=E9=98=BB=E6=96=AD?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=92=8C?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91=E7=9A=84userRegion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/SchedulerTaskUtil.java    | 11 +++++++++++
 .../configuration/ConfigSynchronizationService.java  | 12 ++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/main/java/com/nis/util/SchedulerTaskUtil.java b/src/main/java/com/nis/util/SchedulerTaskUtil.java
index 317b85ffa..fd465a32e 100644
--- a/src/main/java/com/nis/util/SchedulerTaskUtil.java
+++ b/src/main/java/com/nis/util/SchedulerTaskUtil.java
@@ -8,6 +8,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.apache.shiro.config.IniSecurityManagerFactory;
@@ -39,6 +40,7 @@ import com.nis.domain.configuration.PxyObjSpoofingIpPool;
 import com.nis.domain.configuration.PxyObjTrustedCaCert;
 import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.maat.MaatCfg;
+import com.nis.domain.maat.ManipulatActionParam;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.domain.maat.ToUpdateMaatBeanStatus;
@@ -238,6 +240,15 @@ public class SchedulerTaskUtil {
 										userRegion = userRegion.substring(0, userRegion.length()-1);
 									}
 								}
+								// Proxy Block --xml无法描述的user_region
+								if(entity.getServiceId().equals(576)) {
+									ManipulatActionParam actionParam = new ManipulatActionParam();
+									actionParam.setMethod("block");
+									actionParam.setCode(Integer.valueOf(cfg.getUserRegion1()));
+									actionParam.setMessage(!StringUtil.isBlank(cfg.getUserRegion2()) ? cfg.getUserRegion2():"");
+									actionParam.setHtml_profile(Integer.valueOf(!StringUtil.isBlank(cfg.getUserRegion3()) ? cfg.getUserRegion3():"0"));
+									userRegion = StringEscapeUtils.unescapeJson(BaseService.gsonToJson(actionParam));
+								}
 								
 								// Proxy Manipulate
 								if(entity.getServiceId().equals(656)) {
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 7c7321aae..f556e24cb 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import net.sf.json.JSONObject;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.poi.ss.formula.functions.T;
 import org.dom4j.Node;
 import org.springframework.beans.BeanUtils;
@@ -55,6 +56,7 @@ import com.nis.domain.maat.MaatCfg.GroupCfg;
 import com.nis.domain.maat.MaatCfg.IpCfg;
 import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
 import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.domain.maat.ManipulatActionParam;
 import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.util.ConfigServiceUtil;
@@ -461,6 +463,16 @@ public class ConfigSynchronizationService  extends BaseService{
 					userRegion = userRegion.substring(0, userRegion.length()-1);
 				}
 			}
+			// Proxy Block --xml无法描述的user_region
+			if(entity.getServiceId().equals(576)) {
+				ManipulatActionParam actionParam = new ManipulatActionParam();
+				actionParam.setMethod("block");
+				actionParam.setCode(Integer.valueOf(cfg.getUserRegion1()));
+				actionParam.setMessage(!StringUtil.isBlank(cfg.getUserRegion2()) ? cfg.getUserRegion2():"");
+				actionParam.setHtml_profile(Integer.valueOf(!StringUtil.isBlank(cfg.getUserRegion3()) ? cfg.getUserRegion3():"0"));
+				userRegion = StringEscapeUtils.unescapeJson(gsonToJson(actionParam));
+			}
+						
 			// Proxy Manipulation
 			if(entity.getServiceId().equals(656)) {
 				userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);