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/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/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/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/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); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index c5734dab5..09886961e 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1120,5 +1120,6 @@ certificate_subject=Certificate Subject not_Before_Time=Certificate Start Time not_After_Time=Certificate End Time certificate_validity=Certificate Validity Period +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 2c4a5e81b..a6d4e1d24 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1118,3 +1118,5 @@ certificate_subject=\u8BC1\u4E66\u62E5\u6709\u8005 not_before_time=\u8BC1\u4E66\u8D77\u59CB\u65F6\u95F4 not_after_time=\u8BC1\u4E66\u7EC8\u6B62\u65F6\u95F4 certificate_validity=\u8BC1\u4E66\u6709\u6548\u671F +header=\u5173\u952E\u5B57 +layer=\u5339\u914D\u533A\u57DF diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 00420a5a3..136dd7a50 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -332,7 +332,7 @@ ssl_ca_region=ssl_ca ssl_ip_region=ssl_ip bgp_ip_region=bgp_ip behav_id_region=BEHAV_ID -rate_limit_region=RATE_LIMIT +rate_limit_region=Droprate #\u5b58\u5728\u4e0e\u8868\u8fbe\u5f0f\u7684\u5173\u952e\u5b57\u7279\u6b8a\u5206\u9694\u7b26 keyword_expr=***and*** #\u65f6\u533a @@ -343,7 +343,7 @@ service_ip_mulitiplex=768 service_ip_ratelimit=1057 service_domain_ratelimit=1058 #\u7528\u6237\u81ea\u5b9a\u4e49\u57df -userregion_rate_limit=RATE_LIMIT +userregion_rate_limit=Droprate userregion_ir_strategy=IR_STRATEGY userregion_ir_type=IR_TYPE userregion_domain_id=DOMAIN_ID diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp index 94791fe3b..884b2ee2d 100644 --- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp @@ -6,6 +6,8 @@ + +
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(){
+
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp index 62e1df904..7e6354a81 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp @@ -149,18 +149,19 @@ $(function(){
- + <%-- --%>
- @@ -168,7 +169,7 @@ $(function(){
- + <%-- --%> -
+
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/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp index a90aa07f4..4e13ef004 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp @@ -146,7 +146,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp index f3ec43b48..954cf7777 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp @@ -399,7 +399,7 @@ $(function(){
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 22eb2d8e0..4ddf65ec1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -15,6 +15,7 @@ + <%-- --%> @@ -186,12 +187,10 @@
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp index ba1967947..8443ea3c1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp @@ -147,8 +147,8 @@ var switchKeyringType=function(){
- checked="checked"> - checked="checked"> + checked="checked"> + checked="checked">
@@ -242,39 +242,35 @@ var switchKeyringType=function(){
- -
+
hidden">
- +
- +
-
- +
- -
+ +
hidden">
- +
- -
+
+
- + - +
-
-