From f2741a00f47ee658d6111d5ffe9fa9d48dc3065d Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Sun, 8 Apr 2018 15:44:57 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=AC=BA=E9=AA=97ip=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E9=A1=B5=E5=8E=BB=E6=8E=89desc=E7=9A=84=E5=BF=85=E5=A1=AB?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=9D=A5=E5=87=BD?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE=E9=99=90=E5=88=B6=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=A4=A7=E6=A0=87?= =?UTF-8?q?=E9=A2=98=E6=96=87=E5=AD=97=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E7=AE=80=E5=8C=96=E5=A2=9E=E5=BC=BA=E7=AE=A1?= =?UTF-8?q?=E6=8E=A7=E8=A1=A8=E5=8D=95=E9=A1=B5=E7=9A=84=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=B9=A6=E5=86=99=EF=BC=88ip=E7=B1=BB=E7=9A=84=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E6=AD=A4=E6=AC=A1=E6=9C=AA=E6=8F=90=E4=BA=A4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/DnsIpCfgService.java | 4 +- .../include/form/multiple/basicInfo.jsp | 8 +- .../include/form/multiple/complexInfo.jsp | 24 +- .../include/form/multiple/stringInfo.jsp | 20 +- .../webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp | 14 +- .../WEB-INF/views/cfg/multipleCfgForm.jsp | 238 ------------------ .../WEB-INF/views/systemService/form.jsp | 27 +- 7 files changed, 34 insertions(+), 301 deletions(-) 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 c4b6b3143..1a1093f00 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -19,6 +19,7 @@ import com.nis.main.ConvertTool; import com.nis.util.Collections3; import com.nis.web.dao.configuration.DnsIpCfgDao; import com.nis.web.service.CrudService; +import com.nis.web.test.DnsIpTest; @Service public class DnsIpCfgService extends CrudService{ @@ -52,7 +53,8 @@ public class DnsIpCfgService extends CrudService{ //下发配置、接收结果 String recvJson = ""; try { - recvJson = new ConvertTool().saveDNSIPConfig(sendJson); + //recvJson = new ConvertTool().saveDNSIPConfig(sendJson); + recvJson = DnsIpTest.examine(sendJson); logger.info("收到结果:" + recvJson); } catch (Throwable e) { logger.error("欺骗ip配置新增下发失败,cfgId=" + dnsIpCfg.getCfgId(), e); diff --git a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp index 6ab3cf775..1c0ac9bd6 100644 --- a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp @@ -9,12 +9,12 @@
@@ -35,8 +35,8 @@
- +