From 1736858c4e19f4f3389e835e14ee8bb1a6860938 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Mon, 26 Mar 2018 16:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=B3=BB=E7=BB=9F=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=81=E6=AC=BA=E9=AA=97id=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=9A=84=E6=93=8D=E4=BD=9C=E6=8F=90=E7=A4=BA=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E5=9B=BD=E9=99=85=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/configuration/DnsIpCfgController.java   | 10 +++++-----
 .../systemService/SystemServiceController.java         |  8 ++++----
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java
index fe0c5e014..2c25787a5 100644
--- a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java
@@ -66,10 +66,10 @@ public class DnsIpCfgController extends BaseController {
 		
 		try {
 			dnsIpCfgService.save(dnsIpCfg);
-			addMessage(redirectAttributes, "保存成功");
+			addMessage(redirectAttributes, "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
-			addMessage(redirectAttributes, "保存失败:" + e.getMessage());
+			addMessage(redirectAttributes, "save_failed");
 		}
 		
 		return "redirect:" + adminPath + "/cfg/dnsIp/list";
@@ -82,13 +82,13 @@ public class DnsIpCfgController extends BaseController {
 		if (!StringUtils.isEmpty(cfgIds)) {
 			try {
 				dnsIpCfgService.delete(cfgIds);
-				addMessage(model, "删除成功");
+				addMessage(model, "delete_success");
 			} catch (Exception e) {
 				logger.error("删除失败", e);
-				addMessage(model, "删除失败");
+				addMessage(model, "delete_failed");
 			}
 		} else {
-			addMessage(model, "删除失败");
+			addMessage(model, "delete_failed");
 		}
 		
 		Page<DnsIpCfg> page = dnsIpCfgService.findPage(new Page<DnsIpCfg>(request, response, 30), dnsIpCfg);
diff --git a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java
index ca35ef6fb..0bf3d1000 100644
--- a/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java
+++ b/src/main/java/com/nis/web/controller/systemService/SystemServiceController.java
@@ -105,9 +105,9 @@ public class SystemServiceController extends BaseController {
 		
 		try {
 			systemServiceService.save(systemServiceInfo, insertServiceConfigInfoList, updateServiceConfigInfoList);
-			addMessage(redirectAttributes, "保存成功");
+			addMessage(redirectAttributes, "save_success");
 		} catch (Exception e) {
-			addMessage(redirectAttributes, "保存失败：" + e.getMessage());
+			addMessage(redirectAttributes, "save_failed");
 			e.printStackTrace();
 		}
 		
@@ -122,9 +122,9 @@ public class SystemServiceController extends BaseController {
 			systemServiceInfo.setIsValid(1);
 			Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo);
 			model.addAttribute("page", page);
-			addMessage(model, "删除成功");
+			addMessage(model, "delete_success");
 		} catch (Exception e) {
-			addMessage(model, "删除失败：" + e.getMessage());
+			addMessage(model, "delete_failed");
 			e.printStackTrace();
 		}
 		return "/systemService/list";
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index 9f263cbbb..dfc121724 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -121,7 +121,7 @@
 								<div class="pull-left">
 									<button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
 									<button type="button" class="btn btn-default resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                            	<button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+	                            	<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>