From c1937d0bf5389bfd3d7696d6176e4ed5be931fdc Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 31 Aug 2018 15:49:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.requestinfo=E4=B8=ADrequestTitle=E5=BD=93?= =?UTF-8?q?=E5=81=9A=E5=87=BD=E5=8F=B7=E4=BD=BF=E7=94=A8=EF=BC=8CrequestNu?= =?UTF-8?q?mber=E5=BD=93=E5=81=9A=E6=9D=A5=E5=87=BD=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=202.=E4=BF=AE=E6=94=B9requestInfo=E8=A1=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5requestNumber=E9=95=BF=E5=BA=A6=203.=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=85=8D=E7=BD=AE=E4=B8=AD=E4=B8=BB=E9=A2=98=E7=BD=91?= =?UTF-8?q?=E7=AB=99=E8=A1=A8app=5Ftopic=5Fdomain=5Fcfg=E4=B8=AD=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=9A=84=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sql/add_app_topic_domain_cfg_add_column20180831.sql | 2 ++ src/main/resources/sql/updata_request_info_20180231.sql | 2 ++ src/main/webapp/WEB-INF/views/cfg/requestForm.jsp | 4 ++-- src/main/webapp/WEB-INF/views/cfg/requestList.jsp | 8 ++++---- 4 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql create mode 100644 src/main/resources/sql/updata_request_info_20180231.sql diff --git a/src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql b/src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql new file mode 100644 index 000000000..e1f7a45ae --- /dev/null +++ b/src/main/resources/sql/add_app_topic_domain_cfg_add_column20180831.sql @@ -0,0 +1,2 @@ +alter table app_topic_domain_cfg change topic topic_id bigint(11) not null; +alter table app_topic_domain_cfg change behav_code website_service_id bigint(11); diff --git a/src/main/resources/sql/updata_request_info_20180231.sql b/src/main/resources/sql/updata_request_info_20180231.sql new file mode 100644 index 000000000..204d9c36a --- /dev/null +++ b/src/main/resources/sql/updata_request_info_20180231.sql @@ -0,0 +1,2 @@ +alter table request_info modify column request_title VARCHAR(512) not NULL COMMENT 'request_number字段与request_title互换使用，request_title当来函函号使用'; +alter table request_info modify column request_number VARCHAR(512) COMMENT 'request_number字段与request_title互换使用，request_number当来函标题使用'; diff --git a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp index 94ca96e4a..45d4cf998 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestForm.jsp @@ -25,7 +25,7 @@
- +
@@ -44,7 +44,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index c65292957..712dc5d41 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -74,8 +74,8 @@
- - + +
@@ -221,7 +221,7 @@ ${requestInfo.id } - ${requestInfo.requestNumber } + ${requestInfo.requestTitle } ${requestInfo.requestOrg } @@ -232,7 +232,7 @@ - ${requestInfo.requestTitle } + ${requestInfo.requestNumber } ${requestInfo.requestContent } ${requestInfo.taskName } ${requestInfo.creatorName } From e42fce5cb436c2f0e811e4766cd1d8cb2ce98406 Mon Sep 17 00:00:00 2001 From: duandongmei Date: Fri, 31 Aug 2018 16:08:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E6=9C=89?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=EF=BC=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=EF=BC=8C=E4=BB=85=E5=88=A0=E9=99=A4=E4=B8=80=E6=9D=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/configuration/AppCfgService.java | 18 ++++----- .../service/configuration/AvCfgService.java | 4 +- .../configuration/AvContentCfgService.java | 20 +++++----- .../service/configuration/BgpCfgService.java | 2 +- .../service/configuration/DdosCfgService.java | 2 +- .../configuration/DnsIpCfgService.java | 2 +- .../configuration/DnsResStrategyService.java | 2 +- .../service/configuration/DomainService.java | 2 +- .../configuration/FileTransferCfgService.java | 37 +++++++++++-------- .../configuration/HttpRedirectCfgService.java | 2 +- .../configuration/InterceptCfgService.java | 2 +- .../service/configuration/IpCfgService.java | 2 +- .../IpMultiplexPoolCfgService.java | 2 +- .../service/configuration/MailCfgService.java | 2 +- .../configuration/PxyObjKeyringService.java | 2 +- .../configuration/WebsiteCfgService.java | 6 +-- .../service/configuration/XmppCfgService.java | 2 +- 17 files changed, 57 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java index ad859578c..71852c1fb 100644 --- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java @@ -1431,9 +1431,9 @@ public class AppCfgService extends BaseService { } public void updateAppPolicyCfgValid(Integer isValid, String ids, Integer functionId) { - AppPolicyCfg entity = new AppPolicyCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppPolicyCfg entity = new AppPolicyCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1469,9 +1469,9 @@ public class AppCfgService extends BaseService { } public void updateAppIpCfgValid(Integer isValid, String ids, Integer functionId) { - AppIpCfg entity = new AppIpCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppIpCfg entity = new AppIpCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1492,9 +1492,9 @@ public class AppCfgService extends BaseService { } public void updateAppTcpCfgValid(Integer isValid, String ids, Integer functionId) { - AppTcpCfg entity = new AppTcpCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppTcpCfg entity = new AppTcpCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1515,9 +1515,9 @@ public class AppCfgService extends BaseService { } public void updateAppHttpCfgValid(Integer isValid, String ids, Integer functionId) { - AppHttpCfg entity = new AppHttpCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppHttpCfg entity = new AppHttpCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1538,9 +1538,9 @@ public class AppCfgService extends BaseService { } public void updateAppDomainCfgValid(Integer isValid, String ids, Integer functionId) { - AppDomainCfg entity = new AppDomainCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppDomainCfg entity = new AppDomainCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1562,9 +1562,9 @@ public class AppCfgService extends BaseService { // 主题网站配置删除 public void updateAppTopicDomainCfgValid(Integer isValid, String ids, Integer functionId) { - AppTopicDomainCfg entity = new AppTopicDomainCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppTopicDomainCfg entity = new AppTopicDomainCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1585,9 +1585,9 @@ public class AppCfgService extends BaseService { } public void updateAppByteCfgValid(Integer isValid, String ids, Integer functionId) { - AppByteCfg entity = new AppByteCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppByteCfg entity = new AppByteCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1608,9 +1608,9 @@ public class AppCfgService extends BaseService { } public void updateAppSslCfgValid(Integer isValid, String ids, Integer functionId) { - AppSslCertCfg entity = new AppSslCertCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppSslCertCfg entity = new AppSslCertCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -1631,9 +1631,9 @@ public class AppCfgService extends BaseService { } public void updateAppHeaderCfgValid(Integer isValid, String ids, Integer functionId) { - AppHeaderCfg entity = new AppHeaderCfg(); String[] idArray = ids.split(","); for (String id : idArray) { + AppHeaderCfg entity = new AppHeaderCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index 1bde1abd0..da56e65b6 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -290,9 +290,9 @@ public class AvCfgService extends BaseService{ audioAuditAvSignSample(entity,1); } public void updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids){ - AvFileSampleCfg entity = new AvFileSampleCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + AvFileSampleCfg entity = new AvFileSampleCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsAudit(isAudit); entity.setIsValid(isValid); @@ -332,9 +332,9 @@ public class AvCfgService extends BaseService{ } } public void updateAvSignSampleValid(Integer isAudit,Integer isValid,String ids){ - AvSignSampleCfg entity = new AvSignSampleCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + AvSignSampleCfg entity = new AvSignSampleCfg(); entity.setCfgId(Long.parseLong(id)); entity.setIsAudit(isAudit); entity.setIsValid(isValid); diff --git a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java index dc1b5d1d3..807a9526b 100644 --- a/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvContentCfgService.java @@ -322,9 +322,9 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateAvVoipValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = compileIds.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -347,9 +347,9 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateAvVoipAccountValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = compileIds.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -744,10 +744,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateContIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseIpCfg entity = new BaseIpCfg(); - entity.setTableName("av_cont_ip_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseIpCfg entity = new BaseIpCfg(); + entity.setTableName("av_cont_ip_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -1024,10 +1024,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updatePicIpValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseIpCfg entity = new BaseIpCfg(); - entity.setTableName("av_pic_ip_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseIpCfg entity = new BaseIpCfg(); + entity.setTableName("av_pic_ip_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -1280,10 +1280,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updateContUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseStringCfg entity = new BaseStringCfg(); - entity.setTableName("av_cont_url_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseStringCfg entity = new BaseStringCfg(); + entity.setTableName("av_cont_url_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); @@ -1525,10 +1525,10 @@ public class AvContentCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void updatePicUrlValid(Integer isAudit,Integer isValid,String ids,Integer functionId){ - BaseStringCfg entity = new BaseStringCfg(); - entity.setTableName("av_pic_url_cfg"); String[] idArray = ids.split(","); for(String id :idArray){ + BaseStringCfg entity = new BaseStringCfg(); + entity.setTableName("av_pic_url_cfg"); entity.setCompileId(Integer.parseInt(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); 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 64962d269..5cc472225 100644 --- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java @@ -213,9 +213,9 @@ public class BgpCfgService extends CrudService { * @param functionId */ public void updateBgpCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java index b664160e1..0a6bfe591 100644 --- a/src/main/java/com/nis/web/service/configuration/DdosCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DdosCfgService.java @@ -89,9 +89,9 @@ public class DdosCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - DdosIpCfg entity = new DdosIpCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + DdosIpCfg entity = new DdosIpCfg(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); 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 59c6889b3..657ce65d2 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -89,9 +89,9 @@ public class DnsIpCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - DnsIpCfg entity = new DnsIpCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + DnsIpCfg entity = new DnsIpCfg(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java index 9992bead6..d68664a77 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsResStrategyService.java @@ -103,9 +103,9 @@ public class DnsResStrategyService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - DnsResStrategy entity = new DnsResStrategy(); String[] idArray = ids.split(","); for(String id :idArray){ + DnsResStrategy entity = new DnsResStrategy(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java index eff62180b..11a8bc8ef 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -511,9 +511,9 @@ public class DomainService extends CrudService { } } public void updateDomainCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java index 3e22080c4..5004caeb5 100644 --- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java @@ -197,9 +197,9 @@ public class FileTransferCfgService extends CrudService0){ + IpPortCfg ipport=entity.getIpPortList().get(0); + ipport.setUserRegion1(StringUtil.isEmpty(ipport.getUserRegion1()) ? "":ipport.getUserRegion1()); + userRegion += Constants.P2P_IP_TYPE_USER_REGION_KEY+"="+ipport.getUserRegion1(); + } + //存在hash域 + if(entity != null && entity.getP2pHashList() != null && entity.getP2pHashList().size() >0){ + BaseStringCfg hashCfg=entity.getP2pHashList().get(0); + hashCfg.setUserRegion1(StringUtil.isEmpty(hashCfg.getUserRegion1()) ? "":hashCfg.getUserRegion1()); + if(!StringUtil.isEmpty(userRegion)){ + userRegion =userRegion+Constants.USER_REGION_SPLIT+Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+hashCfg.getUserRegion1(); + }else{ + userRegion += Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+hashCfg.getUserRegion1(); } } - maatCfg.setUserRegion(userRegion); - + if(!StringUtil.isEmpty(userRegion)){ + maatCfg.setUserRegion(userRegion); + } configCompileList.add(maatCfg); maatBean.setConfigCompileList(configCompileList); maatBean.setAuditTime(entity.getAuditTime()); diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java index 5625b6ea8..dec5bac11 100644 --- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java @@ -234,9 +234,9 @@ public class HttpRedirectCfgService extends CrudService * @param functionId */ public void updatInterceptValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java index 9ac778361..ce6b5a896 100644 --- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java @@ -181,9 +181,9 @@ public class IpCfgService extends CrudService { } } public void updateIpCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java index c327ba5d7..2790e6c2c 100644 --- a/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/IpMultiplexPoolCfgService.java @@ -103,9 +103,9 @@ public class IpMultiplexPoolCfgService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - IpMultiplexPoolCfg entity = new IpMultiplexPoolCfg(); String[] idArray = ids.split(","); for(String id :idArray){ + IpMultiplexPoolCfg entity = new IpMultiplexPoolCfg(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java index 6d359fe36..e5dcc8427 100644 --- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java @@ -212,9 +212,9 @@ public class MailCfgService extends CrudService { } } public void updateMailCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); diff --git a/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java b/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java index 0e1a8c394..978be4016 100644 --- a/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java +++ b/src/main/java/com/nis/web/service/configuration/PxyObjKeyringService.java @@ -101,9 +101,9 @@ public class PxyObjKeyringService extends BaseService{ */ @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void delete(Integer isAudit,Integer isValid,String ids,Integer functionId){ - PxyObjKeyring entity = new PxyObjKeyring(); String[] idArray = ids.split(","); for(String id :idArray){ + PxyObjKeyring entity = new PxyObjKeyring(); entity.setCfgId(Long.valueOf(id)); entity.setFunctionId(functionId); entity.setIsAudit(isAudit); 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 79e27c9bd..d5c0e38b4 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -257,9 +257,9 @@ public class WebsiteCfgService extends CrudService { } } public void updateHttpCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -604,9 +604,9 @@ public class WebsiteCfgService extends CrudService { } } public void updateSslCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); @@ -875,9 +875,9 @@ public class WebsiteCfgService extends CrudService { * @param functionId */ public void updateDnsCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); 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 9be0fc237..8676fa3da 100644 --- a/src/main/java/com/nis/web/service/configuration/XmppCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/XmppCfgService.java @@ -151,9 +151,9 @@ public class XmppCfgService extends CrudService { } } public void updateXmppCfgValid(Integer isValid,String ids,Integer functionId){ - CfgIndexInfo entity = new CfgIndexInfo(); String[] idArray = ids.split(","); for(String id :idArray){ + CfgIndexInfo entity = new CfgIndexInfo(); entity.setCfgId(Long.parseLong(id)); entity.setIsValid(isValid); entity.setEditorId(UserUtils.getUser().getId()); From e6ce55b15a339d059dc9e7a7b9de428e5d61d46f Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 31 Aug 2018 16:12:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?input=20textarea=20on=20blur=20=E5=8E=BB?= =?UTF-8?q?=E9=99=A4=E9=A6=96=E5=B0=BE=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/static/global/scripts/common.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index dec0bfd5b..6bda5a5b4 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -433,6 +433,11 @@ $(function(){ return false; }); initCommIpVal(); + //去掉首尾空格 + $("input,textarea").on("blur",function(){ + var val=$(this).val(); + $(this).val(val.trim()); + }); }); window.onload=function(){ // 配置id的搜索下拉框选择切换 From f61b78ee20d50588009e504f59aa917a49fdc85c Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Fri, 31 Aug 2018 16:17:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery-validation/1.11.0/localization/messages_en.js | 3 ++- .../jquery-validation/1.11.0/localization/messages_zh.js | 4 ++-- src/main/webapp/static/pages/scripts/pageLogs.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js index d1a40cbb3..b99987749 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js @@ -66,6 +66,7 @@ hasInvisibleChar:"The tag {0} has invisible character", haveInvisibleChar:"The tags {0} have invisible character", httpCheck:"Please enter a correct url(http[s]://xxx.xx)", - failed:"Failed" + failed:"Failed", + go_back:"Go Back Policies" }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js index d186f7c0a..379192842 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js @@ -66,7 +66,7 @@ hasInvisibleChar:"标签{0}包含不可见字符", haveInvisibleChar:"标签{0}包含不可见字符", httpCheck:"请输入正确的url(http[s]://xxx.xx)", - failed:"获取失败" - + failed:"获取失败", + go_back:"返回配置界面" }); }(jQuery)); diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js index 7c0affadd..183ca4a1e 100644 --- a/src/main/webapp/static/pages/scripts/pageLogs.js +++ b/src/main/webapp/static/pages/scripts/pageLogs.js @@ -52,7 +52,7 @@ $(document).ready(function() { // 添加由配置界面跳转到日志查询界面后的返回按钮 var cfgId = $("#cfgId").val(); if(cfgId != undefined && cfgId != ''){ - $(".theme-panel").html(""); + $(".theme-panel").html(""); } });