From 2ebe43e198140ee524951a604b46d1d5d4040470 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Wed, 8 Aug 2018 17:45:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddomain=20white=20list?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/service/configuration/DomainService.java   | 2 +-
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java
index b76607fbc..372401e20 100644
--- a/src/main/java/com/nis/web/service/configuration/DomainService.java
+++ b/src/main/java/com/nis/web/service/configuration/DomainService.java
@@ -104,7 +104,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 			}
 			this.saveIpBatch(cfg.getAreaCfg());
 		}
-		if(cfg instanceof HttpUrlCfg){
+		if(cfg instanceof HttpUrlCfg && cfg.getCfgId() == null){
 			domainDao.insert((HttpUrlCfg)cfg);
 		}else{
 			stringCfgDao.update(cfg);
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 a0a9cf1e2..f5160759d 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
@@ -52,7 +52,9 @@ $(function(){
 			}
 			if(flag){
 				var maxTtl=$("[name=maxTtl]").val();
+				maxTtl = parseInt(maxTtl);
 				var minTtl=$("[name=minTtl]").val();
+				minTtl = parseInt(minTtl);
 				if(minTtl>maxTtl){
 					message="<spring:message code='max_shouldnot_less_than_min'/>";
 					$("div[for=maxTtl]").html("<label for=\"maxTtl\" class=\"error\" id=\"maxTtl-error\">"+message+"</label>");