From ca17b49bf84d39aea22b38fb72f0cbf3b4ea031c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Tue, 25 Jun 2019 15:13:41 +0800
Subject: [PATCH] =?UTF-8?q?intercept=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8E=E5=AF=BC=E5=87=BA=E6=9B=BF=E6=8D=A2=E4=B8=BA=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/service/configuration/ObjectGroupService.java | 4 ++--
 src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
index e30091044..e1d887ac4 100644
--- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
+++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
@@ -597,7 +597,7 @@ public class ObjectGroupService extends BaseService {
             }else if(c.getUserRegion1().equalsIgnoreCase("http")){
                 c.setUserRegion1("HTTP");
             }else if(c.getUserRegion1().equalsIgnoreCase("intercept")){
-                c.setUserRegion1("Intercept");
+                c.setUserRegion1(msgProp.getProperty("intercept","intercept"));
             }
         }
         if(StringUtils.isNotBlank(groupIds.toString())){
@@ -666,7 +666,7 @@ public class ObjectGroupService extends BaseService {
             }else if(c.getUserRegion1().equalsIgnoreCase("http")){
                 c.setUserRegion1("HTTP");
             }else if(c.getUserRegion1().equalsIgnoreCase("intercept")){
-                c.setUserRegion1("Intercept");
+                c.setUserRegion1(msgProp.getProperty("intercept","intercept"));
             }
         }
         if(StringUtils.isNotBlank(groupIds.toString())){
diff --git a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
index f92ea8ecc..c85cee046 100644
--- a/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/objgroup/list.jsp
@@ -484,7 +484,7 @@
 									<td>
 										<c:if test="${cfg.userRegion1 eq 'http'}">HTTP</c:if>
 										<c:if test="${cfg.userRegion1 eq 'https'}">HTTPS</c:if>
-										<c:if test="${cfg.userRegion1 eq 'intercept'}">Intercept</c:if>
+										<c:if test="${cfg.userRegion1 eq 'intercept'}"><spring:message code="intercept"/></c:if>
 									</td>
 									<td commonGroupIds='${cfg.commonGroupIds}'>${fn:substring(cfg.userRegion.ipGroup,1,fn:length(cfg.userRegion.ipGroup)-1)}</td>
 									<td subscribeIdGroup>${fn:substring(cfg.userRegion.subscribeIdGroup,1,fn:length(cfg.userRegion.subscribeIdGroup)-1)}</td>