diff --git a/lib/guava-18.0.jar b/lib/guava-18.0.jar new file mode 100644 index 000000000..8f89e4901 Binary files /dev/null and b/lib/guava-18.0.jar differ diff --git a/pom.xml b/pom.xml index 2f1ece719..ab1909b37 100644 --- a/pom.xml +++ b/pom.xml @@ -193,6 +193,12 @@ com.mangofactory swagger-springmvc 1.0.2 + + + guava + com.google.guava + + @@ -380,6 +386,12 @@ com.jolbox bonecp 0.8.0.RELEASE + + + guava + com.google.guava + + @@ -613,6 +625,10 @@ asm-commons asm + + guava + com.google.guava + @@ -638,6 +654,12 @@ cglib 3.1 + + com.google.guava + guava + 18.0 + + com.google.code.gson gson diff --git a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java index 1a1093f00..e46f0a39d 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -33,6 +33,7 @@ public class DnsIpCfgService extends CrudService{ Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); //组织要发送的json + List toMaatData = new ArrayList(); ToMaatDnsIpBean toMaatBean = new ToMaatDnsIpBean(); List ipCfgList = new ArrayList(); MaatDnsIpCfg ipCfg = new MaatDnsIpCfg(); @@ -47,7 +48,9 @@ public class DnsIpCfgService extends CrudService{ toMaatBean.setIsValid(1); toMaatBean.setRequestId(dnsIpCfg.getRequest().getId()); - String sendJson = gson.toJson(toMaatBean); + toMaatData.add(toMaatBean); + + String sendJson = gson.toJson(toMaatData); logger.info("准备下发配置:" + sendJson); //下发配置、接收结果 diff --git a/src/main/java/com/nis/web/test/DnsIpTest.java b/src/main/java/com/nis/web/test/DnsIpTest.java index 4df96eef9..9857daa9b 100644 --- a/src/main/java/com/nis/web/test/DnsIpTest.java +++ b/src/main/java/com/nis/web/test/DnsIpTest.java @@ -1,10 +1,12 @@ package com.nis.web.test; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; import com.nis.domain.configuration.DnsIpCfg; import com.nis.domain.maat.DnsIpRecvData; import com.nis.domain.maat.FromMaatBean; @@ -19,8 +21,9 @@ public class DnsIpTest { */ public static String examine(String recv) { Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create(); - ToMaatDnsIpBean fromJson = gson.fromJson(recv, ToMaatDnsIpBean.class); - List serviceCfg = fromJson.getServiceCfg(); + Type type = new TypeToken>(){}.getType(); + List fromJson = gson.fromJson(recv, type); + List serviceCfg = fromJson.get(0).getServiceCfg(); FromMaatBean fBean = new FromMaatBean(); List data = new ArrayList(); diff --git a/src/main/webapp/WEB-INF/views/systemService/form.jsp b/src/main/webapp/WEB-INF/views/systemService/form.jsp index 32bfde444..db5676d9f 100644 --- a/src/main/webapp/WEB-INF/views/systemService/form.jsp +++ b/src/main/webapp/WEB-INF/views/systemService/form.jsp @@ -14,7 +14,6 @@ } $("#inputForm").validate({ - ignore: [], rules: { 'serviceId':{ remote:"${ctx}/systemService/serviceIdValidate?id=" + encodeURIComponent($("#id").val()) @@ -305,7 +304,7 @@
- +