From 4adad428beedaaaefd02e1f5abd12df0dc938c69 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@nismail.iie.ac.cn>
Date: Wed, 21 Nov 2018 16:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89=E9=85=8D=E7=BD=AE=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=89=8D=E5=8F=B0=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=EF=BC=882=EF=BC=89ip=20=E4=B8=A2=E5=BC=83?=
 =?UTF-8?q?=EF=BC=8C=E9=99=90=E9=80=9F=E6=97=B6=E9=9A=90=E8=97=8Fasn?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/controller/BaseController.java    |  2 +-
 .../webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp    | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index d6c105e83..0c1855327 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -1788,7 +1788,7 @@ public class BaseController {
 				}
 			}
 			if(e instanceof MaatConvertException||e instanceof ServiceException) {
-				addMessage(redirectAttributes,"error", e.getMessage());
+				addMessage(redirectAttributes,"error", "request_service_failed");
 			}else {
 				addMessage(redirectAttributes,"error",  "import_failed");
 			}
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index d55375188..1a2c8533c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -57,6 +57,13 @@
 							$("[class~='boxSolid'][class~='ipPortList']").find(".glyphicon-remove").click();
 							processAction(isAsn,$(".asn"));
 						}
+						//隐藏显示asn
+						if($("[name='action']:checked").val()==32||$("[name='action']:checked").val()==64){
+							console.log(111);
+							$("h4.form-section.asn").addClass("hidden");
+						}else{
+							$("h4.form-section.asn").removeClass("hidden");
+						}
 						$(".glyphicon-plus").on("click",function(){
 							if($(this).hasClass("ipPortList")){
 								isAsn=0;
@@ -137,6 +144,12 @@
 								}
 								
 							} */
+							//隐藏显示asn
+							if($(this).val()==32||$(this).val()==64){
+								$("h4.form-section.asn").addClass("hidden");
+							}else{
+								$("h4.form-section.asn").removeClass("hidden");
+							}
 						}); 
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -663,7 +676,7 @@ var showHideIPSECProtocol=function(obj){
 														</c:if>
 														<c:if test="${region.regionType eq 7 }">
 																<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-																<h4 class="form-section">
+																<h4 class="form-section asn">
 																		<spring:message code="${region.configRegionValue}" />
 																		<small> <span
 																			class="glyphicon glyphicon-plus asn ${tabName}Add"