From 82b6a4fc7b9d915afa1f7527fdab760b32341f41 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Wed, 26 Sep 2018 16:55:00 +0800
Subject: [PATCH] =?UTF-8?q?intercept=20replace=E4=BF=AE=E6=94=B9BUG=20?=
 =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E4=BF=84=E6=96=87=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/configuration/proxy/InterceptController.java | 1 +
 src/main/resources/messages/message_ru.properties           | 6 +++---
 .../webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp    | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
index 801c3744e..42a3d03d6 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
@@ -79,6 +79,7 @@ public class InterceptController extends CommonController{
 			interceptCfgService.saveInterceptCfg(entity);
 			addMessage(redirectAttributes,"save_success");
 		} catch (Exception e) {
+			logger.error("save_failed", e);
 			addMessage(redirectAttributes,"save_failed");
 		}
 		return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+entity.getFunctionId();
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index d1211320f..b83f21cde 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1172,9 +1172,9 @@ ASN_POLICY_MONIT=ASN Policy Monitoring
 p2p_monit=P2P Monitoring
 av_content_url_whitelist=Multimedia Content Url White List
 av_content_ip_whitelist=Multimedia Content IP White List
-active_port=Active Port TOP10
-visits=visits
-percentage=Percentage
+active_port=\u0410\u043A\u0442\u0438\u0432\u043D\u044B\u0439 \u041F\u043E\u0440\u0442 \u0422\u041E\u041F 10
+visits=\u041F\u043E\u0441\u0435\u0449\u0430\u0435\u043C\u043E\u0441\u0442\u044C
+percentage=\u041F\u0440\u043E\u0446\u0435\u043D\u0442
 APP_SSL=APP SSL Feature
 APP_IP_RANGE=APP IP RANGE
 APP_DK=APP DK Feature
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 2bcbf852f..6a9d20eec 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -247,7 +247,7 @@
 												<select name="userRegion1" class="selectpicker show-tick form-control">
 													<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if> ><spring:message code="selected"/></option>
 													<c:forEach items="${certificateList}" var="certificate">
-														<option value="${certificate.compileId}" <c:if test="${_cfg.userRegion1==certificate.compileId}">selected</c:if>>${certificate.cfgDesc}</option>
+														<option value="${certificate.compileId}" <c:if test="${_cfg.userRegion1 eq fn:trim(certificate.compileId)}">selected</c:if>>${certificate.cfgDesc}</option>
 													</c:forEach>
 								                </select>
 											</div>