diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 29f97b81e..fbb757e92 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -20,17 +20,20 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import com.google.gson.annotations.Expose;
 import com.googlecode.ipv6.IPv6Address;
 import com.googlecode.ipv6.IPv6Network;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.domain.callback.InlineIp;
+import com.nis.domain.callback.NtcDnsResStrategy;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.ComplexkeywordCfg;
+import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -254,8 +257,8 @@ public abstract class BaseService {
 					@Override
 					public JsonElement serialize(Date src, Type type,
 							JsonSerializationContext context) {
-						String format = "yyyy-MM-dd'T'HH:mm:ss.SSS";
-						long time= ((Date) src).getTime()-Constants.TIME_ZONE*60*60*1000;
+						String format = "yyyy-MM-dd HH:mm:ss";
+						long time= ((Date) src).getTime();
 						SimpleDateFormat sdf = new SimpleDateFormat(format);
 						return new JsonPrimitive(sdf.format(time));
 					}
@@ -500,6 +503,31 @@ public abstract class BaseService {
 		return dstIp;
 	}
 	//ip转换为callback用ip
+	public NtcDnsResStrategy convertCallBackDnsResStrategy(DnsResStrategy cfg){
+		NtcDnsResStrategy resStrategy=new NtcDnsResStrategy();
+		resStrategy.setId(Long.valueOf(cfg.getCompileId()));
+		resStrategy.setCfgId(cfg.getCompileId());
+		resStrategy.setReqStrateId(cfg.getCfgId());
+		resStrategy.setStrateName(cfg.getCfgDesc());
+		resStrategy.setAction(cfg.getAction());
+		resStrategy.setService(cfg.getServiceId());
+		resStrategy.setResGroup1Id(cfg.getServiceId());
+		resStrategy.setResGroup1Num(cfg.getServiceId());
+		resStrategy.setResGroup2Id(cfg.getServiceId());
+		resStrategy.setResGroup2Num(cfg.getServiceId());
+		resStrategy.setResGroup3Id(cfg.getServiceId());
+		resStrategy.setResGroup3Num(cfg.getServiceId());
+		resStrategy.setResGroup4Id(cfg.getServiceId());
+		resStrategy.setResGroup4Num(cfg.getServiceId());
+		resStrategy.setResGroup5Id(cfg.getServiceId());
+		resStrategy.setResGroup5Num(cfg.getServiceId());
+		resStrategy.setMinTtl(cfg.getServiceId());
+		resStrategy.setMaxTtl(cfg.getServiceId());
+		resStrategy.setIsValid(cfg.getIsValid());
+		resStrategy.setOpTime(cfg.getAuditTime());
+		return resStrategy;
+	}
+	//ip转换为callback用ip
 	public InlineIp convertCallBackIp(BaseIpCfg cfg){
 		IpCfg c=ipConvert(new IpCfg(),cfg);
 		InlineIp ip=new InlineIp();