From ab2ca5ecc2fa885f16cd9e745957cb2cd302d069 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 24 Aug 2018 15:59:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E7=BD=91=E7=AB=99?= =?UTF-8?q?=EF=BC=8CVoIP=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=AF=86=E9=9A=A7=E9=81=93=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?action=E5=88=87=E6=8D=A2=E5=A2=9E=E5=8A=A0=E6=96=B9=E6=B3=95=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0doLog=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp | 2 ++ src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp | 4 +++- src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp | 4 +++- src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp | 4 +++- .../webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp | 4 +++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp index 9caae33e5..ae74691a1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp @@ -7,6 +7,8 @@ $(function(){ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); + var action=$("input[name='action']:checked").val(); + switchAction(action); }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#cfgFrom").validate({ diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp index f19b72c92..1dc0c6a4b 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp @@ -19,6 +19,8 @@ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); + var action=$("input[name='action']:checked").val(); + switchAction(action); }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -191,7 +193,7 @@ -
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp index 629e3777b..dd947a2b0 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp @@ -19,6 +19,8 @@ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); + var action=$("input[name='action']:checked").val(); + switchAction(action); }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -193,7 +195,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp index 85e95296d..53e438a70 100644 --- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp @@ -17,6 +17,8 @@ $(function(){ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); + var action=$("input[name='action']:checked").val(); + switchAction(action); if($(".action:checked").val()==64){ $("#ratelimit").show(); }else{ @@ -217,7 +219,7 @@ var delContent = function(contentClassName, addBtnClassName) {
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp index 0e2496d1a..0a7a2674a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp @@ -12,6 +12,8 @@ $(function(){ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); + var action=$("input[name='action']:checked").val(); + switchAction(action); if($(".action:checked").val()==64){ $("#ratelimit").show(); }else{ @@ -252,7 +254,7 @@ var delContent = function(contentClassName, addBtnClassName) {
-
+
From d404305509580665d8dc477f3f68b170e0fceefe Mon Sep 17 00:00:00 2001 From: leijun Date: Fri, 24 Aug 2018 17:47:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E7=8A=B6=E6=80=81=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=8A=B6=E6=80=81=E6=9C=AA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E6=9C=AA=E5=AE=A1=E6=A0=B8=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=B8=94=E6=B2=A1=E6=9C=89=E8=AE=B0=E5=BD=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=BA=E5=91=98=E5=92=8C=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=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/BgpCfgService.java | 4 ++++ .../com/nis/web/service/configuration/XmppCfgService.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java index 43820e5f7..64962d269 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -80,6 +80,8 @@ public class BgpCfgService extends CrudService { public void saveBgpCfg(CfgIndexInfo entity){ //设置区域运营商信息 setAreaEffectiveIds(entity); + entity.setIsValid(0); + entity.setIsAudit(0); if(entity.getCfgId()==null){ Integer compileId = 0; try { @@ -142,6 +144,8 @@ public class BgpCfgService extends CrudService { } }else{ + entity.setEditorId(entity.getCurrentUser().getId()); + entity.setEditTime(new Date()); bgpCfgDao.updateCfgIndex(entity); //无效子配置后，再新增子配置 bgpCfgDao.deleteIpCfg(entity); diff --git a/src/main/java/com/nis/web/service/configuration/XmppCfgService.java b/src/main/java/com/nis/web/service/configuration/XmppCfgService.java index 0c6559524..9be0fc237 100644 --- a/src/main/java/com/nis/web/service/configuration/XmppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/XmppCfgService.java @@ -72,6 +72,8 @@ public class XmppCfgService extends CrudService { public void saveXmppCfg(CfgIndexInfo entity){ //设置区域运营商信息 setAreaEffectiveIds(entity); + entity.setIsValid(0); + entity.setIsAudit(0); if(entity.getCfgId()==null){ Integer compileId = 0; try { @@ -112,6 +114,8 @@ public class XmppCfgService extends CrudService { }else{ + entity.setEditorId(entity.getCurrentUser().getId()); + entity.setEditTime(new Date()); xmppCfgDao.updateCfgIndex(entity); //无效子配置后，再新增子配置 xmppCfgDao.deleteXmppIpCfg(entity); From 5d2d5f2ba66ed27eb595fe194bd7817eca89837d Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 24 Aug 2018 17:52:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E9=9A=A7=E9=81=93=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BD=8D=E7=BD=AE2.=E6=9B=BF=E6=8D=A2=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E4=B8=AD=E4=B8=AD=E6=96=87=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/DictService.java | 2 +- .../views/cfg/encryptedtunnelbehav/form.jsp | 59 ++++++++++--------- .../webapp/WEB-INF/views/sys/dictList.jsp | 6 +- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/nis/web/service/DictService.java b/src/main/java/com/nis/web/service/DictService.java index d7cec3d74..a7439b6ea 100644 --- a/src/main/java/com/nis/web/service/DictService.java +++ b/src/main/java/com/nis/web/service/DictService.java @@ -52,7 +52,7 @@ public class DictService extends BaseService { }else {//修改 //累加修改记录 - String newRevision = "用户"+UserUtils.getUser().getName()+",在"+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"修改！"; + String newRevision = "user:"+UserUtils.getUser().getName()+","+DateUtil.getCurrentDate(DateUtil.YYYY_MM_DD_HH24_MM_SS)+"edit"; StringBuilder revisionBuilder = new StringBuilder(newRevision); String oldRevision = sysDictName.getRevision(); if(!StringUtil.isBlank(oldRevision)){ diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp index 0a7a2674a..f0c173338 100644 --- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp @@ -202,33 +202,7 @@ var delContent = function(contentClassName, addBtnClassName) {
-
-
- - -
- -
-
-
-
-
-
- -
- -
-
-
-
-
-
+
@@ -273,8 +247,37 @@ var delContent = function(contentClassName, addBtnClassName) {
+ +
+
+
+
+ + +
+ +
+
+
+
+
+
+ +
+ +
+
+
-
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp index 1ee5c7f8a..3e27b8900 100644 --- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp +++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp @@ -109,7 +109,7 @@ html+=""; html+=""; html+=""; - html+=""; + html+=""; html+=""; html+=""; for(i=0;i："; + html+=""; html+=""; @@ -281,7 +281,7 @@ - + From e62cace354955d58e0c54a297d0eb9975b4ca0ff Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 24 Aug 2018 18:41:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?ip=E5=A4=8D=E7=94=A8=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E5=8D=95=E7=8B=AC=E6=8F=90=E5=87=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manipulation/IpMultiplexController.java | 2 +- .../cfg/manipulation/ipmulitiplex/form.jsp | 186 ++++++++++++++++++ 2 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index fdbdae7db..04f58a69d 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -67,7 +67,7 @@ public class IpMultiplexController extends CommonController { } model.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); model.addAttribute("requiresPermissionPrefix","ip:mulitiplex"); - return "/cfg/common/ipForm"; + return "/cfg/manipulation/ipmulitiplex/form"; } @RequestMapping(value = {"/saveOrUpdate"}) public String saveOrUpdateIp(String cfgName,RedirectAttributes model, IpPortCfg cfg) { diff --git a/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp new file mode 100644 index 000000000..06464a712 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/form.jsp @@ -0,0 +1,186 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + +
+

+ +

+
+
+
+
+
+ + + +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+ + + +
+
+
+
+ +
+ <%@include file="/WEB-INF/include/form/complexIpInfo.jsp" %> +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ +
+
+
+
+
+ + <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> +
+
+
+
+
+
+ + +
+
+
+
+
+
+ + +
+
+
+
+
+ + \ No newline at end of file From 919c649e4e22d4506dd98d131e125db432f73ca7 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Fri, 24 Aug 2018 19:14:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?APP=E7=AD=96=E7=95=A5ssl=E3=80=81header?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/configuration/WebsiteCfgService.java | 2 +- src/main/resources/messages/message_en.properties | 3 +++ .../resources/messages/message_zh_CN.properties | 5 ++++- .../WEB-INF/views/cfg/app/appHeaderCfgForm.jsp | 4 ++-- .../WEB-INF/views/cfg/app/appSslCfgForm.jsp | 15 ++++++++------- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index af7332b89..79e27c9bd 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -542,7 +542,7 @@ public class WebsiteCfgService extends CrudService { } } } - if(entity.getSslList()!=null){ + if(entity.getNtcSubscribeIdCfgList()!=null){ for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){ if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index f4c220032..639f9207d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1110,3 +1110,6 @@ intercept_file_strategy=Intercept Certificate Strategy root=Root Certificate intermediate=Intermediate Certificate end_entity=End-entity Certificate + +header=Header +layer=Layer \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index db9fd8987..d6cec7415 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1105,4 +1105,7 @@ pxy_intercept_monit_keyring=\u8BC1\u4E66\u7B56\u7565 intercept_file_strategy=\u62E6\u622A\u8BC1\u4E66\u7B56\u7565 root=\u6839\u8BC1\u4E66 intermediate=\u4E2D\u95F4\u8BC1\u4E66 -end_entity=\u5B9E\u4F53\u8BC1\u4E66 +end_entity=\u5B9E\u4F53\u8BC1\u4E66 + +header=\u5173\u952E\u5B57 +layer=\u5339\u914D\u533A\u57DF \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp index c9c845482..dbd704749 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp @@ -154,7 +154,7 @@ $(function(){
+
- - + + + @@ -168,7 +169,7 @@ $(function(){
- + <%-- --%>
："; html+=""+data.remark; html+="