From b30e88c3b82ee76c33f9b25c5249142bff49b828 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 29 Jun 2018 12:44:33 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89BaseStringCfg=20=E7=B1=BB?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BABaseStringCfg,=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E6=B3=9B=E5=9E=8B=E3=80=82=E6=89=80=E6=9C=89=E7=BB=A7=E6=89=BF?= =?UTF-8?q?BaseStringCfg=E7=9A=84=E7=B1=BB=E5=9D=87=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=9B=E5=9E=8B=E3=80=82=20=EF=BC=882?= =?UTF-8?q?=EF=BC=89HttpUrlCfg=E6=96=B0=E5=A2=9Eratelimit=E4=B8=80?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E7=94=A8=E4=BA=8E=E5=9F=9F=E5=90=8D=E9=99=90?= =?UTF-8?q?=E9=80=9F=E3=80=82=20=EF=BC=883=EF=BC=89=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E9=99=90=E9=80=9F=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=90=E9=80=9F=E6=AF=94=E4=BE=8B=E4=B8=80?= =?UTF-8?q?=E5=88=97=EF=BC=8C=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=99=90=E9=80=9F=E6=AF=94=E4=BE=8B=E4=B8=80=E5=88=97?= =?UTF-8?q?=E3=80=82=20=EF=BC=884=EF=BC=89=E5=AE=A1=E6=A0=B8=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9F=9F=E5=9F=9F=E5=90=8D=E6=8B=A6=E6=88=AA?= =?UTF-8?q?=E4=B8=8E=E5=9F=9F=E5=90=8D=E9=99=90=E9=80=9F=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82=20=EF=BC=885=EF=BC=89=E5=88=A0?= =?UTF-8?q?=E9=99=A4MultipleCfg=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E7=9A=84dao=EF=BC=8Cservice=20=EF=BC=886StringCfgService?= =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E4=B8=BADomainService,=E5=85=B6?= =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=A4=87=E5=AD=97=E7=AC=A6=E4=B8=B2=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=83=BD=E8=83=BD=E8=B0=83=E7=94=A8=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/configuration/AppStringCfg.java | 2 +- .../domain/configuration/AvContUrlCfg.java | 2 +- .../nis/domain/configuration/AvPicUrlCfg.java | 2 +- .../configuration/AvVoipAccountCfg.java | 2 +- .../domain/configuration/BaseStringCfg.java | 6 +- .../domain/configuration/ByteFeaturesCfg.java | 2 +- .../domain/configuration/FtpKeywordCfg.java | 2 +- .../nis/domain/configuration/HttpBodyCfg.java | 2 +- .../domain/configuration/HttpDomainCfg.java | 2 +- .../nis/domain/configuration/HttpUrlCfg.java | 19 +- .../configuration/HttpsContentReplaceCfg.java | 2 +- .../nis/domain/configuration/HttpsUrlCfg.java | 2 +- .../nis/domain/configuration/L2tpUrlCfg.java | 2 +- .../nis/domain/configuration/MmsUrlCfg.java | 2 +- .../nis/domain/configuration/MultipleCfg.java | 186 ------- .../configuration/MultipleCfgRelation.java | 74 --- .../configuration/MultipleSearchCfg.java | 214 -------- .../nis/domain/configuration/PptpUrlCfg.java | 2 +- .../nis/domain/configuration/RtmpUrlCfg.java | 2 +- .../nis/domain/configuration/RtspUrlCfg.java | 2 +- .../domain/configuration/SslKeywordCfg.java | 2 +- .../java/com/nis/domain/maat/AppMaatCfg.java | 4 - .../java/com/nis/domain/maat/MaatCfg.java | 4 - src/main/java/com/nis/util/Constants.java | 6 +- .../nis/web/controller/BaseController.java | 4 +- .../configuration/CommonController.java | 34 +- .../maintenance/DnsResStrategyController.java | 23 - .../manipulation/RatelimitController.java | 3 +- .../ntc/WhiteListController.java | 34 +- .../proxy/ControlController.java | 3 +- .../proxy/InterceptController.java | 3 +- .../nis/web/dao/configuration/DomainDao.java | 43 ++ .../nis/web/dao/configuration/DomainDao.xml | 470 ++++++++++++++++++ .../web/dao/configuration/MultipleCfgDao.java | 25 - .../web/dao/configuration/MultipleCfgDao.xml | 4 - .../web/dao/configuration/StringCfgDao.java | 2 +- .../web/dao/configuration/StringCfgDao.xml | 18 +- .../java/com/nis/web/service/BaseService.java | 5 - .../java/com/nis/web/service/CrudService.java | 1 - .../configuration/AvContentCfgService.java | 4 +- .../service/configuration/BgpCfgService.java | 14 +- .../configuration/ControlPolicyService.java | 12 +- .../configuration/DnsIpCfgService.java | 21 - ...ringCfgService.java => DomainService.java} | 140 +++--- .../configuration/MultipleCfgService.java | 349 ------------- src/main/resources/nis.properties | 1 + .../WEB-INF/views/cfg/common/domainForm.jsp | 25 +- .../WEB-INF/views/cfg/common/domainList.jsp | 16 +- 48 files changed, 715 insertions(+), 1084 deletions(-) delete mode 100644 src/main/java/com/nis/domain/configuration/MultipleCfg.java delete mode 100644 src/main/java/com/nis/domain/configuration/MultipleCfgRelation.java delete mode 100644 src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java create mode 100644 src/main/java/com/nis/web/dao/configuration/DomainDao.java create mode 100644 src/main/java/com/nis/web/dao/configuration/DomainDao.xml delete mode 100644 src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.java delete mode 100644 src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.xml rename src/main/java/com/nis/web/service/configuration/{StringCfgService.java => DomainService.java} (76%) delete mode 100644 src/main/java/com/nis/web/service/configuration/MultipleCfgService.java diff --git a/src/main/java/com/nis/domain/configuration/AppStringCfg.java b/src/main/java/com/nis/domain/configuration/AppStringCfg.java index d6d10f607..f61ef011e 100644 --- a/src/main/java/com/nis/domain/configuration/AppStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/AppStringCfg.java @@ -18,7 +18,7 @@ import com.google.gson.annotations.SerializedName; * @date 2018年2月5日 下午5:26:02 * @version V1.0 */ -public class AppStringCfg extends BaseStringCfg { +public class AppStringCfg extends BaseStringCfg { private static final String tableName="app_string_cfg"; /** diff --git a/src/main/java/com/nis/domain/configuration/AvContUrlCfg.java b/src/main/java/com/nis/domain/configuration/AvContUrlCfg.java index 74eeb5ebb..0640e2b73 100644 --- a/src/main/java/com/nis/domain/configuration/AvContUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvContUrlCfg.java @@ -7,7 +7,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:29:26 * @version V1.0 */ -public class AvContUrlCfg extends BaseStringCfg { +public class AvContUrlCfg extends BaseStringCfg { /** * diff --git a/src/main/java/com/nis/domain/configuration/AvPicUrlCfg.java b/src/main/java/com/nis/domain/configuration/AvPicUrlCfg.java index dbdf80fbf..aeb6d50db 100644 --- a/src/main/java/com/nis/domain/configuration/AvPicUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvPicUrlCfg.java @@ -7,7 +7,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:29:26 * @version V1.0 */ -public class AvPicUrlCfg extends BaseStringCfg { +public class AvPicUrlCfg extends BaseStringCfg { /** * diff --git a/src/main/java/com/nis/domain/configuration/AvVoipAccountCfg.java b/src/main/java/com/nis/domain/configuration/AvVoipAccountCfg.java index 77c368f0b..49698b0c5 100644 --- a/src/main/java/com/nis/domain/configuration/AvVoipAccountCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvVoipAccountCfg.java @@ -8,7 +8,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:18:55 * @version V1.0 */ -public class AvVoipAccountCfg extends BaseStringCfg{ +public class AvVoipAccountCfg extends BaseStringCfg{ private static final long serialVersionUID = -7398698517584394431L; diff --git a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java index d61e0ed19..71ee9b13f 100644 --- a/src/main/java/com/nis/domain/configuration/BaseStringCfg.java +++ b/src/main/java/com/nis/domain/configuration/BaseStringCfg.java @@ -8,8 +8,6 @@ */ package com.nis.domain.configuration; -import org.apache.commons.lang3.StringEscapeUtils; - import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.util.excel.ExcelField; @@ -21,7 +19,7 @@ import com.nis.util.excel.ExcelField; * @date 2018年2月5日 下午5:26:02 * @version V1.0 */ -public class BaseStringCfg extends BaseCfg { +public class BaseStringCfg extends BaseCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） @@ -37,8 +35,8 @@ public class BaseStringCfg extends BaseCfg { @SerializedName("keywords") @ExcelField(title="key_word") protected String cfgKeywords; - protected String cfgKeywordsShowName; + /** * @param cfgKeywords the cfgKeywords to set */ diff --git a/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java b/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java index 9c7031a57..4ba1e5fa0 100644 --- a/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java +++ b/src/main/java/com/nis/domain/configuration/ByteFeaturesCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午10:36:22 * @version V1.0 */ -public class ByteFeaturesCfg extends BaseStringCfg { +public class ByteFeaturesCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/FtpKeywordCfg.java b/src/main/java/com/nis/domain/configuration/FtpKeywordCfg.java index cfc16cae8..88318c0bc 100644 --- a/src/main/java/com/nis/domain/configuration/FtpKeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/FtpKeywordCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:18:55 * @version V1.0 */ -public class FtpKeywordCfg extends BaseStringCfg{ +public class FtpKeywordCfg extends BaseStringCfg{ private static final String tableName="ftp_keyword_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） diff --git a/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java b/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java index 504811ca2..076d9d1ea 100644 --- a/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpBodyCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月5日 下午5:33:05 * @version V1.0 */ -public class HttpBodyCfg extends BaseStringCfg { +public class HttpBodyCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java b/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java index f1bddbf86..110c1906b 100644 --- a/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpDomainCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月5日 下午5:33:05 * @version V1.0 */ -public class HttpDomainCfg extends BaseStringCfg { +public class HttpDomainCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java index fc936f9fa..17564f535 100644 --- a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java @@ -8,6 +8,7 @@ */ package com.nis.domain.configuration; +import com.nis.domain.Page; import com.nis.util.Constants; /** @@ -17,8 +18,23 @@ import com.nis.util.Constants; * @date 2018年2月5日 下午5:33:05 * @version V1.0 */ -public class HttpUrlCfg extends BaseStringCfg { +public class HttpUrlCfg extends BaseStringCfg { private static final String tableName="http_url_cfg"; + private Integer ratelimit; + /** + * ratelimit + * @return ratelimit + */ + + public Integer getRatelimit() { + return ratelimit; + } + /** + * @param ratelimit the ratelimit to set + */ + public void setRatelimit(Integer ratelimit) { + this.ratelimit = ratelimit; + } /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * @@ -44,5 +60,4 @@ public class HttpUrlCfg extends BaseStringCfg { public static String getTablename() { return tableName; } - } diff --git a/src/main/java/com/nis/domain/configuration/HttpsContentReplaceCfg.java b/src/main/java/com/nis/domain/configuration/HttpsContentReplaceCfg.java index ae7d81028..050c7179d 100644 --- a/src/main/java/com/nis/domain/configuration/HttpsContentReplaceCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpsContentReplaceCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午10:30:46 * @version V1.0 */ -public class HttpsContentReplaceCfg extends BaseStringCfg { +public class HttpsContentReplaceCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） diff --git a/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java index b8c7f54f0..f8ef4665b 100644 --- a/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/HttpsUrlCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午10:28:42 * @version V1.0 */ -public class HttpsUrlCfg extends BaseStringCfg { +public class HttpsUrlCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java b/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java index 2138d32de..a56100e48 100644 --- a/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/L2tpUrlCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:42:42 * @version V1.0 */ -public class L2tpUrlCfg extends BaseStringCfg { +public class L2tpUrlCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java b/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java index 2c5838a34..8a4c2b390 100644 --- a/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/MmsUrlCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午9:48:36 * @version V1.0 */ -public class MmsUrlCfg extends BaseStringCfg{ +public class MmsUrlCfg extends BaseStringCfg{ /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/MultipleCfg.java b/src/main/java/com/nis/domain/configuration/MultipleCfg.java deleted file mode 100644 index bc97318fe..000000000 --- a/src/main/java/com/nis/domain/configuration/MultipleCfg.java +++ /dev/null @@ -1,186 +0,0 @@ -/** - *@Title: MultipleCfg.java - *@Package com.nis.domain.configuration - *@Description TODO - *@author dell - *@date 2018年3月13日 上午8:59:32 - *@version 版本号 - */ -package com.nis.domain.configuration; - -import java.util.List; -import java.util.Map; - -/** - * @ClassName: MultipleCfg.java - * @Description: TODO - * @author (dell) - * @date 2018年3月13日 上午8:59:32 - * @version V1.0 - */ -public class MultipleCfg extends BaseCfg { - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - private static final long serialVersionUID = -8369567908781421920L; - /** - * 配置关系表，一个compileId 中有哪些表存了数据 - */ - private MultipleCfgRelation relation; - private String mainTable; - private String mainTableType; - private String mainTableDesc; - private List otherTables;//key 表名，value 类型 - //ip配置 - private Map ipCfg; - //字符串配置 - private Map stringCfg; - //数值类配置 - private Map numCfg; - //增强字符串配置 - private Map complexCfg; - //地域配置 - private AreaIpCfg areaIpCfg; - /** - * mainTable - * @return mainTable - */ - - public String getMainTable() { - return mainTable; - } - /** - * @param mainTable the mainTable to set - */ - public void setMainTable(String mainTable) { - this.mainTable = mainTable; - } - /** - * areaIpCfg - * @return areaIpCfg - */ - - public AreaIpCfg getAreaIpCfg() { - return areaIpCfg; - } - /** - * @param areaIpCfg the areaIpCfg to set - */ - public void setAreaIpCfg(AreaIpCfg areaIpCfg) { - this.areaIpCfg = areaIpCfg; - } - /** - * ipCfg - * @return ipCfg - */ - - public Map getIpCfg() { - return ipCfg; - } - /** - * @param ipCfg the ipCfg to set - */ - public void setIpCfg(Map ipCfg) { - this.ipCfg = ipCfg; - } - /** - * stringCfg - * @return stringCfg - */ - - public Map getStringCfg() { - return stringCfg; - } - /** - * @param stringCfg the stringCfg to set - */ - public void setStringCfg(Map stringCfg) { - this.stringCfg = stringCfg; - } - /** - * numCfg - * @return numCfg - */ - - public Map getNumCfg() { - return numCfg; - } - /** - * @param numCfg the numCfg to set - */ - public void setNumCfg(Map numCfg) { - this.numCfg = numCfg; - } - /** - * complexCfg - * @return complexCfg - */ - - public Map getComplexCfg() { - return complexCfg; - } - /** - * @param complexCfg the complexCfg to set - */ - public void setComplexCfg(Map complexCfg) { - this.complexCfg = complexCfg; - } - /** - * mainTableType - * @return mainTableType - */ - - public String getMainTableType() { - return mainTableType; - } - /** - * @param mainTableType the mainTableType to set - */ - public void setMainTableType(String mainTableType) { - this.mainTableType = mainTableType; - } - /** - * otherTables - * @return otherTables - */ - - public List getOtherTables() { - return otherTables; - } - /** - * @param otherTables the otherTables to set - */ - public void setOtherTables(List otherTables) { - this.otherTables = otherTables; - } - /** - * mainTableDesc - * @return mainTableDesc - */ - - public String getMainTableDesc() { - return mainTableDesc; - } - /** - * @param mainTableDesc the mainTableDesc to set - */ - public void setMainTableDesc(String mainTableDesc) { - this.mainTableDesc = mainTableDesc; - } - /** - * relation - * @return relation - */ - - public MultipleCfgRelation getRelation() { - return relation; - } - /** - * @param relation the relation to set - */ - public void setRelation(MultipleCfgRelation relation) { - this.relation = relation; - } -} diff --git a/src/main/java/com/nis/domain/configuration/MultipleCfgRelation.java b/src/main/java/com/nis/domain/configuration/MultipleCfgRelation.java deleted file mode 100644 index ece553838..000000000 --- a/src/main/java/com/nis/domain/configuration/MultipleCfgRelation.java +++ /dev/null @@ -1,74 +0,0 @@ -/** - *@Title: MultipleCfgRelation.java - *@Package com.nis.domain.configuration - *@Description TODO - *@author dell - *@date 2018年4月10日 上午11:11:53 - *@version 版本号 - */ -package com.nis.domain.configuration; - -import java.io.Serializable; - -/** - * @ClassName: MultipleCfgRelation.java - * @Description: TODO - * @author (dell) - * @date 2018年4月10日 上午11:11:53 - * @version V1.0 - */ -public class MultipleCfgRelation implements Serializable{ - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -615924510840736781L; - private int compileId; - private String tableName; - private int isValid; - /** - * compileId - * @return compileId - */ - - public int getCompileId() { - return compileId; - } - /** - * @param compileId the compileId to set - */ - public void setCompileId(int compileId) { - this.compileId = compileId; - } - /** - * tableName - * @return tableName - */ - - public String getTableName() { - return tableName; - } - /** - * @param tableName the tableName to set - */ - public void setTableName(String tableName) { - this.tableName = tableName; - } - /** - * isValid - * @return isValid - */ - - public int getIsValid() { - return isValid; - } - /** - * @param isValid the isValid to set - */ - public void setIsValid(int isValid) { - this.isValid = isValid; - } -} diff --git a/src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java b/src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java deleted file mode 100644 index 88c32f330..000000000 --- a/src/main/java/com/nis/domain/configuration/MultipleSearchCfg.java +++ /dev/null @@ -1,214 +0,0 @@ -/** - *@Title: MultipleCfg.java - *@Package com.nis.domain.configuration - *@Description TODO - *@author dell - *@date 2018年3月13日 上午8:59:32 - *@version 版本号 - */ -package com.nis.domain.configuration; - -import java.util.List; - -/** - * @ClassName: MultipleCfg.java - * @Description: TODO - * @author (dell) - * @date 2018年3月13日 上午8:59:32 - * @version V1.0 - */ -public class MultipleSearchCfg extends BaseCfg { - - /** - * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） - * - * @since 1.0.0 - */ - - private static final long serialVersionUID = -8369567908781421920L; - private String mainTable;//主表名 - private String mainTableType;//主表类型 - private String mainTableDesc;//主表类型 - private String ipTable;//查询条件IP表名，界面限制查询条件除了共用属性之外只能查一个条件 - private String stringTable;//查询条件字符串表名，界面限制查询条件除了共用属性之外只能查一个条件 - private String complexTable;//查询条件增强字符串串表名，界面限制查询条件除了共用属性之外只能查一个条件 - private List otherTables;//key 表名，value 类型 - //ip配置 - private BaseIpCfg ipCfg; - //字符串配置 - private BaseStringCfg stringCfg; - //数值类配置 - private NumBoundaryCfg numCfg; - //增强字符串配置 - private ComplexkeywordCfg complexCfg; - //地域配置 - private AreaIpCfg areaIpCfg; - /** - * mainTable - * @return mainTable - */ - - public String getMainTable() { - return mainTable; - } - /** - * @param mainTable the mainTable to set - */ - public void setMainTable(String mainTable) { - this.mainTable = mainTable; - } - /** - * ipCfg - * @return ipCfg - */ - - public BaseIpCfg getIpCfg() { - return ipCfg; - } - /** - * @param ipCfg the ipCfg to set - */ - public void setIpCfg(BaseIpCfg ipCfg) { - this.ipCfg = ipCfg; - } - /** - * stringCfg - * @return stringCfg - */ - - public BaseStringCfg getStringCfg() { - return stringCfg; - } - /** - * @param stringCfg the stringCfg to set - */ - public void setStringCfg(BaseStringCfg stringCfg) { - this.stringCfg = stringCfg; - } - /** - * numCfg - * @return numCfg - */ - - public NumBoundaryCfg getNumCfg() { - return numCfg; - } - /** - * @param numCfg the numCfg to set - */ - public void setNumCfg(NumBoundaryCfg numCfg) { - this.numCfg = numCfg; - } - /** - * complexCfg - * @return complexCfg - */ - - public ComplexkeywordCfg getComplexCfg() { - return complexCfg; - } - /** - * @param complexCfg the complexCfg to set - */ - public void setComplexCfg(ComplexkeywordCfg complexCfg) { - this.complexCfg = complexCfg; - } - /** - * areaIpCfg - * @return areaIpCfg - */ - - public AreaIpCfg getAreaIpCfg() { - return areaIpCfg; - } - /** - * @param areaIpCfg the areaIpCfg to set - */ - public void setAreaIpCfg(AreaIpCfg areaIpCfg) { - this.areaIpCfg = areaIpCfg; - } - /** - * mainTableType - * @return mainTableType - */ - - public String getMainTableType() { - return mainTableType; - } - /** - * @param mainTableType the mainTableType to set - */ - public void setMainTableType(String mainTableType) { - this.mainTableType = mainTableType; - } - /** - * otherTables - * @return otherTables - */ - - public List getOtherTables() { - return otherTables; - } - /** - * @param otherTables the otherTables to set - */ - public void setOtherTables(List otherTables) { - this.otherTables = otherTables; - } - /** - * ipTable - * @return ipTable - */ - - public String getIpTable() { - return ipTable; - } - /** - * @param ipTable the ipTable to set - */ - public void setIpTable(String ipTable) { - this.ipTable = ipTable; - } - /** - * stringTable - * @return stringTable - */ - - public String getStringTable() { - return stringTable; - } - /** - * @param stringTable the stringTable to set - */ - public void setStringTable(String stringTable) { - this.stringTable = stringTable; - } - /** - * complexTable - * @return complexTable - */ - - public String getComplexTable() { - return complexTable; - } - /** - * @param complexTable the complexTable to set - */ - public void setComplexTable(String complexTable) { - this.complexTable = complexTable; - } - /** - * mainTableDesc - * @return mainTableDesc - */ - - public String getMainTableDesc() { - return mainTableDesc; - } - /** - * @param mainTableDesc the mainTableDesc to set - */ - public void setMainTableDesc(String mainTableDesc) { - this.mainTableDesc = mainTableDesc; - } -} diff --git a/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java b/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java index abd80f1f4..259f13414 100644 --- a/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/PptpUrlCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:46:52 * @version V1.0 */ -public class PptpUrlCfg extends BaseStringCfg { +public class PptpUrlCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java b/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java index da83069ca..cf93a3fa4 100644 --- a/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/RtmpUrlCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午10:27:18 * @version V1.0 */ -public class RtmpUrlCfg extends BaseStringCfg{ +public class RtmpUrlCfg extends BaseStringCfg{ /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java b/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java index 079ee960d..489e6b408 100644 --- a/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java +++ b/src/main/java/com/nis/domain/configuration/RtspUrlCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午10:24:55 * @version V1.0 */ -public class RtspUrlCfg extends BaseStringCfg { +public class RtspUrlCfg extends BaseStringCfg { /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） * diff --git a/src/main/java/com/nis/domain/configuration/SslKeywordCfg.java b/src/main/java/com/nis/domain/configuration/SslKeywordCfg.java index 98c2acc6a..03642cf99 100644 --- a/src/main/java/com/nis/domain/configuration/SslKeywordCfg.java +++ b/src/main/java/com/nis/domain/configuration/SslKeywordCfg.java @@ -15,7 +15,7 @@ package com.nis.domain.configuration; * @date 2018年2月6日 上午8:59:51 * @version V1.0 */ -public class SslKeywordCfg extends BaseStringCfg{ +public class SslKeywordCfg extends BaseStringCfg{ public static final String tableName="ssl_keyword_cfg"; /** * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么） diff --git a/src/main/java/com/nis/domain/maat/AppMaatCfg.java b/src/main/java/com/nis/domain/maat/AppMaatCfg.java index a4c47484b..2edafe6ac 100644 --- a/src/main/java/com/nis/domain/maat/AppMaatCfg.java +++ b/src/main/java/com/nis/domain/maat/AppMaatCfg.java @@ -15,11 +15,7 @@ import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; import com.nis.domain.configuration.AppComplexKeywordCfg; import com.nis.domain.configuration.AppStringCfg; -import com.nis.domain.configuration.AreaIpCfg; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; -import com.nis.domain.configuration.ComplexkeywordCfg; -import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.domain.specific.SpecificServiceHostCfg; /** diff --git a/src/main/java/com/nis/domain/maat/MaatCfg.java b/src/main/java/com/nis/domain/maat/MaatCfg.java index e3badf8ac..011bd4dca 100644 --- a/src/main/java/com/nis/domain/maat/MaatCfg.java +++ b/src/main/java/com/nis/domain/maat/MaatCfg.java @@ -16,10 +16,6 @@ import org.apache.commons.lang3.StringUtils; import com.google.gson.annotations.Expose; import com.google.gson.annotations.SerializedName; -import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; -import com.nis.domain.configuration.ComplexkeywordCfg; -import com.nis.domain.configuration.NumBoundaryCfg; import com.nis.util.Constants; import com.nis.util.DateUtils; diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index 0fdbf5a47..22a0c8999 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -29,9 +29,13 @@ public final class Constants { */ public static final String USERREGION_DOMIAN_STR=Configurations.getStringProperty("userregion_domian_str", "DOMIAN_STR"); /** - * IP复用业务类型 + * IP限速业务类型 */ public static final int SERVICE_IP_RATELIMIT = Configurations.getIntProperty("service_ip_ratelimit", 0x421); + /** + * 域名限速业务类型 + */ + public static final int SERVICE_DOMAIN_RATELIMIT = Configurations.getIntProperty("service_domain_ratelimit", 0x421); /** * IP复用业务类型 */ diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 4278db7e4..fa51090b7 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -68,7 +68,7 @@ import com.nis.web.service.configuration.IpCfgService; import com.nis.web.service.configuration.MailCfgService; import com.nis.web.service.configuration.NumCfgService; import com.nis.web.service.configuration.RequestInfoService; -import com.nis.web.service.configuration.StringCfgService; +import com.nis.web.service.configuration.DomainService; import com.nis.web.service.configuration.WebsiteCfgService; import com.nis.web.service.configuration.XmppCfgService; import com.nis.web.service.specific.SpecificServiceCfgService; @@ -136,7 +136,7 @@ public class BaseController { @Autowired protected RequestInfoService requestInfoService; @Autowired - protected StringCfgService stringCfgService; + protected DomainService domainService; @Autowired protected NumCfgService numCfgService; @Autowired diff --git a/src/main/java/com/nis/web/controller/configuration/CommonController.java b/src/main/java/com/nis/web/controller/configuration/CommonController.java index 8c781c1df..5b0519213 100644 --- a/src/main/java/com/nis/web/controller/configuration/CommonController.java +++ b/src/main/java/com/nis/web/controller/configuration/CommonController.java @@ -15,12 +15,12 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.ui.Model; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.exceptions.MaatConvertException; @@ -46,8 +46,8 @@ public class CommonController extends BaseController { public void _domainList(String cfgName,Model model,HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { model.addAttribute("cfgName", cfgName); cfg.setTableName(HttpUrlCfg.getTablename()); - Page searchPage=new Page(request,response,"r"); - Page page = stringCfgService.findPage(searchPage, cfg); + Page searchPage=new Page(request,response,"r"); + Page page = domainService.findPage(searchPage, cfg); model.addAttribute("page", page); initPageCondition(model,cfg); } @@ -68,10 +68,10 @@ public class CommonController extends BaseController { initFormCondition(model,entity); } } - public void _domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) { + public void _domainForm(String cfgName,Model model,String ids,Integer functionId,HttpUrlCfg entity) { model.addAttribute("cfgName", cfgName); if(StringUtils.isNotBlank(ids)){ - entity = stringCfgService.getStringCfgById(HttpUrlCfg.getTablename(),Long.parseLong(ids)); + entity = domainService.getStringCfgById(Long.parseLong(ids)); } if(entity.getCfgId()!=null){ model.addAttribute("_cfg", entity); @@ -118,11 +118,11 @@ public class CommonController extends BaseController { if(cfg.getCfgId()==null){//新增 cfg.setCreatorId(cfg.getCurrentUser().getId()); cfg.setCreateTime(date); - stringCfgService.addStringCfg((BaseStringCfg)cfg); + domainService.addStringCfg(cfg); }else{//修改 cfg.setEditorId(cfg.getCurrentUser().getId()); cfg.setEditTime(new Date()); - stringCfgService.updateStringCfg((BaseStringCfg)cfg); + domainService.updateStringCfg(cfg); } addMessage(model,"save_success"); }catch(Exception e){ @@ -143,7 +143,7 @@ public class CommonController extends BaseController { public void _deleteDomain(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) { model.addAttribute("cfgName", cfgName); try{ - stringCfgService.deleteDomain(ids,compileIds,functionId.intValue()); + domainService.deleteDomain(ids,compileIds,functionId.intValue()); addMessage(model,"delete_success"); }catch(Exception e){ logger.error("删除失败", e); @@ -180,15 +180,17 @@ public class CommonController extends BaseController { for(String id:ids.split(",")){ Long.parseLong(id); } - List beans=stringCfgService.getListByCfgId(HttpUrlCfg.getTablename(),ids); + List beans=domainService.getListByCfgId(ids); Date date=new Date(); - for(BaseStringCfg bean:beans){ - bean.setTableName(HttpUrlCfg.getTablename()); - bean.setAuditorId(bean.getCurrentUser().getId()); - bean.setAuditTime(date); - bean.setIsAudit(cfg.getIsAudit()); - bean.setIsValid(cfg.getIsValid()); - stringCfgService.auditDomain(bean); + for(HttpUrlCfg bean:beans){ + HttpUrlCfg domain=new HttpUrlCfg(); + BeanUtils.copyProperties(bean, domain); + domain.setTableName(HttpUrlCfg.getTablename()); + domain.setAuditorId(bean.getCurrentUser().getId()); + domain.setAuditTime(date); + domain.setIsAudit(cfg.getIsAudit()); + domain.setIsValid(cfg.getIsValid()); + domainService.auditDomain(domain); } addMessage(redirectAttributes,"audit_success"); }catch(MaatConvertException e){ diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java index fc019d312..97e28a191 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsResStrategyController.java @@ -1,19 +1,12 @@ package com.nis.web.controller.configuration.maintenance; -import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; -import java.util.Properties; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -22,27 +15,11 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; -import com.nis.domain.SysUser; import com.nis.domain.basics.PolicyGroupInfo; -import com.nis.domain.basics.ServiceDictInfo; -import com.nis.domain.basics.SysDictInfo; -import com.nis.domain.configuration.AreaBean; -import com.nis.domain.configuration.AreaIpCfg; -import com.nis.domain.configuration.AvContIpCfg; -import com.nis.domain.configuration.AvVoipAccountCfg; -import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.DnsResStrategy; import com.nis.exceptions.MaatConvertException; -import com.nis.domain.configuration.AvVoipIpCfg; -import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; -import com.nis.util.Configurations; -import com.nis.util.Constants; -import com.nis.util.DateUtils; import com.nis.util.StringUtil; -import com.nis.util.excel.ExportExcel; import com.nis.web.controller.BaseController; -import com.nis.web.security.UserUtils; /** * dns响应策略 diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java index 561e9d7bd..5d061f83c 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.web.controller.configuration.CommonController; @@ -61,7 +60,7 @@ public class RatelimitController extends CommonController { } @RequestMapping(value = {"/domain/form"}) @RequiresPermissions(value={"domain:ratelimit:config"}) - public String domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) { + public String domainForm(String cfgName,Model model,String ids,Integer functionId,HttpUrlCfg entity) { this._domainForm(cfgName, model, ids, functionId, entity); model.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); model.addAttribute("requiresPermissionPrefix","domain:ratelimit"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index 3c887eb94..967354351 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ModelAttribute; @@ -17,7 +18,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.exceptions.MaatConvertException; @@ -47,8 +47,8 @@ public class WhiteListController extends BaseController{ @RequiresPermissions(value={"whitelist:config","whitelist:audit"},logical=Logical.OR) public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { cfg.setTableName(HttpUrlCfg.getTablename()); - Page searchPage=new Page(request,response,"r"); - Page page = stringCfgService.findPage(searchPage, cfg); + Page searchPage=new Page(request,response,"r"); + Page page = domainService.findPage(searchPage, cfg); model.addAttribute("page", page); initPageCondition(model,cfg); return "/cfg/whitelist/domainList"; @@ -74,9 +74,9 @@ public class WhiteListController extends BaseController{ } @RequestMapping(value = {"domainForm"}) @RequiresPermissions(value={"whitelist:config"}) - public String domainForm(Model model,String ids,BaseStringCfg entity) { + public String domainForm(Model model,String ids,HttpUrlCfg entity) { if(StringUtils.isNotBlank(ids)){ - entity = stringCfgService.getStringCfgById(HttpUrlCfg.getTablename(),Long.parseLong(ids)); + entity = domainService.getStringCfgById(Long.parseLong(ids)); } initFormCondition(model,entity); if(entity.getCfgId()!=null){ @@ -125,11 +125,11 @@ public class WhiteListController extends BaseController{ if(cfg.getCfgId()==null){//新增 cfg.setCreatorId(cfg.getCurrentUser().getId()); cfg.setCreateTime(date); - stringCfgService.addStringCfg((BaseStringCfg)cfg,null); + domainService.addStringCfg(cfg); }else{//修改 cfg.setEditorId(cfg.getCurrentUser().getId()); cfg.setEditTime(new Date()); - stringCfgService.updateStringCfg((BaseStringCfg)cfg); + domainService.updateStringCfg(cfg); } addMessage(model,"save_success"); }catch(Exception e){ @@ -155,7 +155,7 @@ public class WhiteListController extends BaseController{ @RequiresPermissions("whitelist:config") public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) { try{ - stringCfgService.deleteWhiteDomain(ids); + domainService.deleteWhiteDomain(ids); addMessage(model,"delete_success"); }catch(Exception e){ logger.error("删除失败", e); @@ -194,15 +194,17 @@ public class WhiteListController extends BaseController{ // @RequiresPermissions("whitelist:aduit") public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) { try{ - List beans=stringCfgService.getListByCfgId(HttpUrlCfg.getTablename(),ids); + List beans=domainService.getListByCfgId(ids); Date date=new Date(); - for(BaseStringCfg bean:beans){ - bean.setTableName(HttpUrlCfg.getTablename()); - bean.setAuditorId(bean.getCurrentUser().getId()); - bean.setAuditTime(date); - bean.setIsAudit(cfg.getIsAudit()); - bean.setIsValid(cfg.getIsValid()); - stringCfgService.auditWhiteDomain(bean); + for(HttpUrlCfg bean:beans){ + HttpUrlCfg domain=new HttpUrlCfg(); + BeanUtils.copyProperties(bean, domain); + domain.setTableName(HttpUrlCfg.getTablename()); + domain.setAuditorId(bean.getCurrentUser().getId()); + domain.setAuditTime(date); + domain.setIsAudit(cfg.getIsAudit()); + domain.setIsValid(cfg.getIsValid()); + domainService.auditWhiteDomain(domain); } addMessage(redirectAttributes,"audit_success"); }catch(MaatConvertException e){ diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java index 5c18abe25..21dd7f335 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.web.controller.configuration.CommonController; @@ -61,7 +60,7 @@ public class ControlController extends CommonController { } @RequestMapping(value = {"/domain/form"}) @RequiresPermissions(value={"control:domain:config"}) - public String domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) { + public String domainForm(String cfgName,Model model,String ids,Integer functionId,HttpUrlCfg entity) { this._domainForm(cfgName, model, ids, functionId, entity); model.addAttribute("urlPrefix","/proxy/control/domain"); model.addAttribute("requiresPermissionPrefix","control:domain"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 3e4b9b939..e2c4596e0 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.configuration.BaseIpCfg; -import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.web.controller.configuration.CommonController; @@ -51,7 +50,7 @@ public class InterceptController extends CommonController{ } @RequestMapping(value = {"/domain/form"}) @RequiresPermissions(value={"intercept:domain:config"}) - public String domainForm(String cfgName,Model model,String ids,Integer functionId,BaseStringCfg entity) { + public String domainForm(String cfgName,Model model,String ids,Integer functionId,HttpUrlCfg entity) { this._domainForm(cfgName, model, ids, functionId, entity); model.addAttribute("urlPrefix","/proxy/intercept/domain"); model.addAttribute("requiresPermissionPrefix","intercept:domain"); diff --git a/src/main/java/com/nis/web/dao/configuration/DomainDao.java b/src/main/java/com/nis/web/dao/configuration/DomainDao.java new file mode 100644 index 000000000..5688d4fa5 --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/DomainDao.java @@ -0,0 +1,43 @@ +package com.nis.web.dao.configuration; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +import com.nis.domain.configuration.HttpUrlCfg; +import com.nis.web.dao.CrudDao; +import com.nis.web.dao.MyBatisDao; + +/** + * 字符串相关配置数据处理类 + * @author dell + * + */ +@MyBatisDao +public interface DomainDao extends CrudDao{ + public HttpUrlCfg getById(@Param("cfgId")Long id) ; + public HttpUrlCfg get(HttpUrlCfg entity) ; + public List findList(HttpUrlCfg entity) ; + public int insert(HttpUrlCfg entity) ; + public int update(HttpUrlCfg entity) ; + public int updateValid(HttpUrlCfg entity) ; + public int audit(HttpUrlCfg entity) ; + public int getIsValid(@Param("cfgId")Long id); + public int getIsValid(HttpUrlCfg entity); + public int getIsAudit(@Param("cfgId")Long id); + public int getIsAudit(HttpUrlCfg entity); + public int deleteByCompileId(HttpUrlCfg entity); + public List getListByCfgId(@Param("ids")String ids); + public List getListByCompileId(@Param("ids")String ids); + /** + * deleteByCompileIds(这里用一句话描述这个方法的作用) + * (这里描述这个方法适用条件 – 可选) + * @param id + * @param tablename + * @param compileIds + *void + * @exception + * @since 1.0.0 + */ + public void deleteByCompileIds(@Param("user")long user,@Param("compileIds")String compileIds); +} diff --git a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml new file mode 100644 index 000000000..e63f8a5ee --- /dev/null +++ b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml @@ -0,0 +1,470 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CFG_ID, CFG_DESC, CFG_KEYWORDS,CFG_TYPE,ACTION,IS_VALID,IS_AUDIT, + CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, + SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,FUNCTION_ID,CFG_REGION_CODE,RATELIMIT + + + + + ${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc, ${page.alias}.CFG_KEYWORDS as cfgKeywords,${page.alias}.CFG_TYPE as cfgType,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit, + ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime, + ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify, + ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin,${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds,${page.alias}.FUNCTION_ID AS functionId,${page.alias}.CFG_REGION_CODE as cfgRegionCode + ,${page.alias}.RATELIMIT as ratelimit + + + r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords,r.CFG_TYPE as cfgType, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit, + r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime, + r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify, + r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin, + r.AREA_EFFECTIVE_IDS AS areaEffectiveIds,r.FUNCTION_ID AS functionId,r.CFG_REGION_CODE as cfgRegionCode + ,r.RATELIMIT as ratelimit + + + + + CFG_DESC, CFG_KEYWORDS,CFG_TYPE, ACTION,IS_VALID,IS_AUDIT, + CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, + SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, + ATTRIBUTE,LABLE,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,AREA_EFFECTIVE_IDS,FUNCTION_ID,CFG_REGION_CODE, + RATELIMIT + + + #{cfgDesc,jdbcType=VARCHAR},#{cfgKeywords,jdbcType=VARCHAR},#{cfgType,jdbcType=VARCHAR},#{action,jdbcType=INTEGER}, + #{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{creatorId,jdbcType=INTEGER}, + #{createTime,jdbcType=TIMESTAMP},#{editorId,jdbcType=INTEGER},#{editTime,jdbcType=TIMESTAMP}, + #{auditorId,jdbcType=INTEGER},#{auditTime,jdbcType=TIMESTAMP},#{serviceId,jdbcType=INTEGER}, + #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER}, + #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR}, + #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER}, + #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},#{cfgRegionCode,jdbcType=INTEGER} + ,#{ratelimit,jdbcType=INTEGER} + + + + + + + + + + + SELECT LAST_INSERT_ID() + + insert into HTTP_URL_CFG ( + + )values ( + + ) + + + update HTTP_URL_CFG + + + + cfg_desc = #{cfgDesc,jdbcType=VARCHAR}, + + + cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR}, + + + CFG_TYPE=#{cfgType,jdbcType=VARCHAR}, + + + action = #{action,jdbcType=INTEGER}, + + + is_valid = #{isValid,jdbcType=INTEGER}, + + + is_audit = #{isAudit,jdbcType=INTEGER}, + + + creator_id = #{creatorId,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + editor_id = #{editorId,jdbcType=INTEGER}, + + + edit_time = #{editTime,jdbcType=TIMESTAMP}, + + + auditor_id = #{auditorId,jdbcType=INTEGER}, + + + audit_time = #{auditTime,jdbcType=TIMESTAMP}, + + + service_id = #{serviceId,jdbcType=INTEGER}, + + + request_id = #{requestId,jdbcType=INTEGER}, + + + compile_id = #{compileId,jdbcType=INTEGER}, + + + is_area_effective = #{isAreaEffective,jdbcType=INTEGER}, + + + classify = #{classify,jdbcType=VARCHAR}, + + + attribute = #{attribute,jdbcType=VARCHAR}, + + + lable = #{lable,jdbcType=VARCHAR}, + + + expr_type=#{exprType,jdbcType=INTEGER}, + + + match_method=#{matchMethod,jdbcType=INTEGER}, + + + is_hexbin=#{isHexbin,jdbcType=INTEGER}, + + + area_effective_ids = #{areaEffectiveIds,jdbcType=VARCHAR}, + + + function_id = #{functionId,jdbcType=INTEGER}, + + + cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER}, + + + ratelimit = #{ratelimit,jdbcType=INTEGER}, + + + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + update HTTP_URL_CFG set is_valid = #{isValid,jdbcType=INTEGER}, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where cfg_id = #{cfgId,jdbcType=BIGINT} + + + update HTTP_URL_CFG set is_audit = #{isAudit,jdbcType=INTEGER}, auditor_id = #{auditorId,jdbcType=INTEGER}, audit_time = #{auditTime,jdbcType=TIMESTAMP} + + ,is_valid = #{isValid,jdbcType=INTEGER} + + where cfg_id = #{cfgId,jdbcType=BIGINT} + + + + + update HTTP_URL_CFG set is_valid = -1, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} where compile_id = #{compileId,jdbcType=INTEGER} + + + update HTTP_URL_CFG set is_valid = -1, editor_id = #{editorId,jdbcType=INTEGER} , edit_time = #{editTime,jdbcType=TIMESTAMP} + + + AND cfg_id = #{cfgId,jdbcType=BIGINT} + + + AND compile_id = #{compileId,jdbcType=INTEGER} + + + + + update HTTP_URL_CFG set is_valid = -1, editor_id = #{user,jdbcType=INTEGER} , edit_time = NOW() where compile_id in (${compileIds}) + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.java b/src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.java deleted file mode 100644 index 0f5fa9c2e..000000000 --- a/src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.nis.web.dao.configuration; - -import java.util.List; - -import org.apache.ibatis.annotations.Param; - -import com.nis.domain.configuration.MultipleSearchCfg; -import com.nis.web.dao.CrudDao; -import com.nis.web.dao.MyBatisDao; - -/** - * 多域配置数据处理类 - * @author dell - * - */ -@MyBatisDao -public interface MultipleCfgDao extends CrudDao{ - public MultipleSearchCfg getById(@Param("tableName")String tableName,@Param("cfgId")Long id) ; - public MultipleSearchCfg get(MultipleSearchCfg entity) ; - public List findList(MultipleSearchCfg entity) ; - public int insert(MultipleSearchCfg entity) ; - public int updateByPrimaryKeySelective(MultipleSearchCfg entity) ; - public int updateValid(MultipleSearchCfg entity) ; - public int audit(MultipleSearchCfg entity) ; -} diff --git a/src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.xml deleted file mode 100644 index 567b6438e..000000000 --- a/src/main/java/com/nis/web/dao/configuration/MultipleCfgDao.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java index 4c49d13e8..4e156fda3 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.java @@ -9,7 +9,7 @@ import com.nis.web.dao.CrudDao; import com.nis.web.dao.MyBatisDao; /** - * IP相关配置数据处理类 + * 字符串相关配置数据处理类 * @author dell * */ diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml index c859de8d5..0aa3f3b62 100644 --- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml @@ -28,6 +28,7 @@ + @@ -39,7 +40,7 @@ CFG_ID, CFG_DESC, CFG_KEYWORDS,CFG_TYPE,ACTION,IS_VALID,IS_AUDIT, CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME, SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY, - ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,FUNCTION_ID,CFG_REGION_CODE + ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,FUNCTION_ID,CFG_REGION_CODE,RATELIMIT
@@ -146,7 +150,7 @@ -
+
@@ -190,7 +194,7 @@
-
+
+
+
+
+
+
+
<%@include file="/WEB-INF/include/form/areaInfo.jsp"%> <%@include file="/WEB-INF/include/form/basicInfo.jsp"%> diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index 959dcb50a..4b7eb9eb3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -49,7 +49,11 @@ - + + + + +