From 8682124d04dfb295a9b01f9fe4f295354bac15ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= <duandongmei@zdjizhi.com>
Date: Thu, 28 Feb 2019 10:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=BF=BD=E7=95=A5updatePxyOb?=
 =?UTF-8?q?jTrustedCaCrl=E6=96=B9=E6=B3=95=20=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E4=BF=AE=E6=94=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA=E4=B8=BAsuccess?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E4=BF=AE=E6=94=B9dns=E5=93=8D=E5=BA=94?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E7=95=8C=E9=9D=A2=E7=9A=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interceptor/ScheduleUpdateInterceptor.java            | 1 +
 .../configuration/maintenance/UserManageController.java   | 4 ++--
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java
index 91c28e274..b8b97ce2b 100644
--- a/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java
+++ b/src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java
@@ -69,6 +69,7 @@ public class ScheduleUpdateInterceptor extends BaseInterceptor{
 	static {
 		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.SchedulerDao.updateCfgTableStatus");
 		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.basics.ServiceDictInfoDao");
+		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.PxyObjKeyringDao.updatePxyObjTrustedCaCrl");
 	}
 	/**
 	 * is_valid 字段名
diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
index e64eb3310..0f3672c4c 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
@@ -188,7 +188,7 @@ public class UserManageController  extends BaseController{
 							throw e;
 						}
 					}
-					addMessage(redirectAttributes,"info","add_success");
+					addMessage(redirectAttributes,"success","save_success");
 				}else{
 					entity.setEditTime(createTime);
 					entity.setEditorId(entity.getCurrentUser().getId());
@@ -272,7 +272,7 @@ public class UserManageController  extends BaseController{
 							}
 						}
 					}
-					addMessage(redirectAttributes,"info","update_success");
+					addMessage(redirectAttributes,"success","update_success");
 				}
 			} catch (MaatConvertException e) {
 				if(!StringUtil.isEmpty(e.getMessage())) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
index e98604a07..6624e839f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
@@ -134,9 +134,9 @@ $(function(){
 								            <div class="col-md-2">
 								                <input class="form-control required number"  placeholder="<spring:message code="ttl_unit" />" type="text" name="maxTtl" value="${_cfg.maxTtl}" min="0">
 								            </div>
+									        <div for="minTtl"></div>
+										    <div for="maxTtl"></div>
 								        </div>
-								        <div for="minTtl"></div>
-									    <div for="maxTtl"></div>
 								    </div>
 								    <div class="col-md-6 hidden">
 								        <div class="form-group">
@@ -202,8 +202,8 @@ $(function(){
 							              			</c:forEach>
 								                </select>
 								            </div>
+								        	<div for="resGroup1Id"></div>
 								        </div>
-								        <div for="resGroup1Id"></div>
 								    </div>
 								    <div class="col-md-6">
 								        <div class="form-group">
@@ -211,8 +211,8 @@ $(function(){
 								            <div class="col-md-6">
 								                <input class="form-control number required" range=[1,128] type="text" name="resGroup1Num" value="${_cfg.resGroup1Num}">
 								            </div>
+								        	<div for="resGroup1Num"></div>
 								        </div>
-								        <div for="resGroup1Num"></div>
 								    </div>
 								</div>
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>