From 9c6d43e4eaa726cdf5810812dcefb3d3c524b03e Mon Sep 17 00:00:00 2001 From: wangbing Date: Tue, 9 Feb 2021 17:20:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nginx-admin.db3 | Bin 36864 -> 36864 bytes .../xyz/wbsite/module/admin/ent/Rules.java | 30 +++- .../wbsite/module/admin/mpr/RulesMapper.java | 2 +- .../wbsite/module/admin/mpr/RulesMapper.xml | 16 +- .../module/admin/req/RulesCreateRequest.java | 42 ++++- .../module/admin/req/RulesDeleteRequest.java | 2 +- .../module/admin/req/RulesFindRequest.java | 21 ++- .../module/admin/req/RulesUpdateRequest.java | 42 ++++- .../module/admin/rsp/RulesCreateResponse.java | 2 +- .../module/admin/rsp/RulesDeleteResponse.java | 2 +- .../module/admin/rsp/RulesFindResponse.java | 2 +- .../module/admin/rsp/RulesUpdateResponse.java | 2 +- src/main/resources/nginx-admin.db3 | Bin 36864 -> 36864 bytes .../pt/admin_table/SQLite_ALL_TABLE.sql | 22 +-- .../pt/admin_table/SQLite_CONFIG_DATA.sql | 2 +- .../pt/admin_table/SQLite_LOCATIONS.sql | 2 +- .../resources/pt/admin_table/SQLite_RULES.sql | 16 +- .../pt/admin_table/SQLite_SERVICES.sql | 2 +- src/main/resources/pt/nginx-admin.xml | 54 +++--- src/main/resources/static/css/base.css | 2 + .../templates/screen/admin/rules.ftl | 156 ++++++++++++++---- 21 files changed, 329 insertions(+), 90 deletions(-) diff --git a/nginx-admin.db3 b/nginx-admin.db3 index 91a42916482c9f0d8792c2cfd9b1a8c6ffea6f29..7a7eccd9c23dc8049a8745a6b847aefb0592eb2e 100644 GIT binary patch delta 127 zcmZozz|^pSX+oBe9|P|N{@vUOywf@6aqF}Baini-yu`Zs0$TtRS1TVYySS_@V`u(k zEzW|;)7S+$f<<3l0?CjaM_pS*}uV)6k#!O4d>#liGLD4&r_dh&FjxC)mfh~^A) V^a*v1_jQbzyqaBRvn$u`Rsi8`C+7eF delta 77 zcmZozz|^pSX+oCJ1qR*={JXgmc&BqJaO<;O;CQ)NP#}bDvmaXk6ITllE4#R?EMt52 hUCKqzbPo4>+4{<6_e#fb}*_P{YD*%{Z7#IKm diff --git a/src/main/java/xyz/wbsite/module/admin/ent/Rules.java b/src/main/java/xyz/wbsite/module/admin/ent/Rules.java index c354161..685462c 100644 --- a/src/main/java/xyz/wbsite/module/admin/ent/Rules.java +++ b/src/main/java/xyz/wbsite/module/admin/ent/Rules.java @@ -11,7 +11,7 @@ import xyz.wbsite.frame.base.BaseEntity; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ @ExcelSheet("配置规则") public class Rules extends BaseEntity { @@ -22,6 +22,12 @@ public class Rules extends BaseEntity { @ExcelProperty("规则目标") @ExcelNote("") private String ruleFor; + /** + * RULE_TYPE - 规则类型 + */ + @ExcelProperty("规则类型") + @ExcelNote("") + private String ruleType; /** * RULE_TITLE - 规则标题 */ @@ -52,6 +58,12 @@ public class Rules extends BaseEntity { @ExcelProperty("属值正则") @ExcelNote("") private String valueRegex; + /** + * VALUE_MAX - 最大数量 + */ + @ExcelProperty("最大数量") + @ExcelNote("") + private Integer valueMax; /** * RULE_NOTE - 规则描述 */ @@ -67,6 +79,14 @@ public class Rules extends BaseEntity { this.ruleFor = ruleFor; } + public String getRuleType() { + return this.ruleType; + } + + public void setRuleType(String ruleType) { + this.ruleType = ruleType; + } + public String getRuleTitle() { return this.ruleTitle; } @@ -107,6 +127,14 @@ public class Rules extends BaseEntity { this.valueRegex = valueRegex; } + public Integer getValueMax() { + return this.valueMax; + } + + public void setValueMax(Integer valueMax) { + this.valueMax = valueMax; + } + public String getRuleNote() { return this.ruleNote; } diff --git a/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.java b/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.java index bcd8080..d475fa0 100644 --- a/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.java +++ b/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.java @@ -12,7 +12,7 @@ import java.util.List; * RULES - 配置规则 * * @author wangbing - * @since 2021-02-08 + * @since 2021-02-09 */ @Mapper public interface RulesMapper { diff --git a/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.xml b/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.xml index ff3ad6f..9a52f5f 100644 --- a/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.xml +++ b/src/main/java/xyz/wbsite/module/admin/mpr/RulesMapper.xml @@ -7,17 +7,19 @@ "NA_RULES" - "ID","RULE_FOR","RULE_TITLE","RULE_NAME","RULE_VALUE","VALUE_DEFAULT","VALUE_REGEX","RULE_NOTE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" + "ID","RULE_FOR","RULE_TYPE","RULE_TITLE","RULE_NAME","RULE_VALUE","VALUE_DEFAULT","VALUE_REGEX","VALUE_MAX","RULE_NOTE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" + + @@ -37,11 +39,13 @@ ( #{request.id}, #{request.ruleFor,jdbcType=VARCHAR}, + #{request.ruleType,jdbcType=VARCHAR}, #{request.ruleTitle,jdbcType=VARCHAR}, #{request.ruleName,jdbcType=VARCHAR}, #{request.ruleValue,jdbcType=VARCHAR}, #{request.valueDefault,jdbcType=VARCHAR}, #{request.valueRegex,jdbcType=VARCHAR}, + #{request.valueMax,jdbcType=INTEGER}, #{request.ruleNote,jdbcType=VARCHAR}, 0, 0, @@ -62,11 +66,13 @@ #{item.id}, #{item.ruleFor,jdbcType=VARCHAR}, + #{item.ruleType,jdbcType=VARCHAR}, #{item.ruleTitle,jdbcType=VARCHAR}, #{item.ruleName,jdbcType=VARCHAR}, #{item.ruleValue,jdbcType=VARCHAR}, #{item.valueDefault,jdbcType=VARCHAR}, #{item.valueRegex,jdbcType=VARCHAR}, + #{item.valueMax,jdbcType=INTEGER}, #{item.ruleNote,jdbcType=VARCHAR}, 0, 0, @@ -101,11 +107,13 @@ SET RULE_FOR = #{request.ruleFor,jdbcType=VARCHAR}, + RULE_TYPE = #{request.ruleType,jdbcType=VARCHAR}, RULE_TITLE = #{request.ruleTitle,jdbcType=VARCHAR}, RULE_NAME = #{request.ruleName,jdbcType=VARCHAR}, RULE_VALUE = #{request.ruleValue,jdbcType=VARCHAR}, VALUE_DEFAULT = #{request.valueDefault,jdbcType=VARCHAR}, VALUE_REGEX = #{request.valueRegex,jdbcType=VARCHAR}, + VALUE_MAX = #{request.valueMax,jdbcType=INTEGER}, RULE_NOTE = #{request.ruleNote,jdbcType=VARCHAR}, "ROW_VERSION" = "ROW_VERSION" + 1, "LAST_UPDATE_BY" = #{token.userId}, @@ -124,6 +132,9 @@ AND "RULE_FOR" = #{request.ruleFor} + + AND "RULE_TYPE" = #{request.ruleType} + AND "RULE_TITLE" = #{request.ruleTitle} @@ -150,6 +161,9 @@ AND "RULE_FOR" = #{request.ruleFor} + + AND "RULE_TYPE" = #{request.ruleType} + AND "RULE_TITLE" = #{request.ruleTitle} diff --git a/src/main/java/xyz/wbsite/module/admin/req/RulesCreateRequest.java b/src/main/java/xyz/wbsite/module/admin/req/RulesCreateRequest.java index ce0ecc1..2fd0ce2 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/RulesCreateRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/RulesCreateRequest.java @@ -11,7 +11,7 @@ import xyz.wbsite.frame.validation.Select; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesCreateRequest extends BaseRequest { @@ -21,39 +21,63 @@ public class RulesCreateRequest extends BaseRequest { * 主机:主机 * 路径:路径 */ + @NotNull(message = "[ruleFor]规则目标不能为NULL") @Select({"全局", "主机", "路径"}) private String ruleFor; + /** + * 规则类型. + * 反向代理:反向代理 + * 负载均衡:负载均衡 + * 正向代理:正向代理 + * 文件代理:文件代理 + * 端口转发:端口转发 + */ + @NotNull(message = "[ruleType]规则类型不能为NULL") + @Select({"反向代理", "负载均衡", "正向代理", "文件代理", "端口转发"}) + private String ruleType; + /** * 规则标题. */ + @NotBlank(message = "[ruleTitle]规则标题不能为空") @Length(min = 0, max = 100, message = "[ruleTitle]规则标题长度不合法(0-100)") private String ruleTitle; /** * 规则名称. */ + @NotBlank(message = "[ruleName]规则名称不能为空") @Length(min = 0, max = 100, message = "[ruleName]规则名称长度不合法(0-100)") private String ruleName; /** * 规则属值. */ + @NotBlank(message = "[ruleValue]规则属值不能为空") @Length(min = 0, max = 100, message = "[ruleValue]规则属值长度不合法(0-100)") private String ruleValue; /** * 默认属值. */ + @NotBlank(message = "[valueDefault]默认属值不能为空") @Length(min = 0, max = 100, message = "[valueDefault]默认属值长度不合法(0-100)") private String valueDefault; /** * 属值正则. */ + @NotBlank(message = "[valueRegex]属值正则不能为空") @Length(min = 0, max = 100, message = "[valueRegex]属值正则长度不合法(0-100)") private String valueRegex; + /** + * 最大数量. + */ + @NotNull(message = "[valueMax]最大数量不能为NULL") + private Integer valueMax; + /** * 规则描述. */ @@ -68,6 +92,14 @@ public class RulesCreateRequest extends BaseRequest { this.ruleFor = ruleFor; } + public String getRuleType() { + return this.ruleType; + } + + public void setRuleType(String ruleType) { + this.ruleType = ruleType; + } + public String getRuleTitle() { return this.ruleTitle; } @@ -108,6 +140,14 @@ public class RulesCreateRequest extends BaseRequest { this.valueRegex = valueRegex; } + public Integer getValueMax() { + return this.valueMax; + } + + public void setValueMax(Integer valueMax) { + this.valueMax = valueMax; + } + public String getRuleNote() { return this.ruleNote; } diff --git a/src/main/java/xyz/wbsite/module/admin/req/RulesDeleteRequest.java b/src/main/java/xyz/wbsite/module/admin/req/RulesDeleteRequest.java index fc737a9..743a322 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/RulesDeleteRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/RulesDeleteRequest.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesDeleteRequest extends BaseRequest { diff --git a/src/main/java/xyz/wbsite/module/admin/req/RulesFindRequest.java b/src/main/java/xyz/wbsite/module/admin/req/RulesFindRequest.java index 228749a..8bccb1c 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/RulesFindRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/RulesFindRequest.java @@ -9,7 +9,7 @@ import xyz.wbsite.frame.validation.Select; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesFindRequest extends BaseFindRequest { @@ -22,6 +22,17 @@ public class RulesFindRequest extends BaseFindRequest { @Select({"全局", "主机", "路径"}) private String ruleFor; + /** + * 规则类型. + * 反向代理:反向代理 + * 负载均衡:负载均衡 + * 正向代理:正向代理 + * 文件代理:文件代理 + * 端口转发:端口转发 + */ + @Select({"反向代理", "负载均衡", "正向代理", "文件代理", "端口转发"}) + private String ruleType; + /** * 规则标题. */ @@ -85,6 +96,14 @@ public class RulesFindRequest extends BaseFindRequest { this.ruleFor = ruleFor; } + public String getRuleType() { + return this.ruleType; + } + + public void setRuleType(String ruleType) { + this.ruleType = ruleType; + } + public String getRuleTitle() { return this.ruleTitle; } diff --git a/src/main/java/xyz/wbsite/module/admin/req/RulesUpdateRequest.java b/src/main/java/xyz/wbsite/module/admin/req/RulesUpdateRequest.java index e79737d..6e505db 100644 --- a/src/main/java/xyz/wbsite/module/admin/req/RulesUpdateRequest.java +++ b/src/main/java/xyz/wbsite/module/admin/req/RulesUpdateRequest.java @@ -12,7 +12,7 @@ import xyz.wbsite.frame.validation.Select; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesUpdateRequest extends BaseUpdateRequest { @@ -28,39 +28,63 @@ public class RulesUpdateRequest extends BaseUpdateRequest { * 主机:主机 * 路径:路径 */ + @NotNull(message = "[ruleFor]规则目标不能为NULL") @Select({"全局", "主机", "路径"}) private String ruleFor; + /** + * 规则类型. + * 反向代理:反向代理 + * 负载均衡:负载均衡 + * 正向代理:正向代理 + * 文件代理:文件代理 + * 端口转发:端口转发 + */ + @NotNull(message = "[ruleType]规则类型不能为NULL") + @Select({"反向代理", "负载均衡", "正向代理", "文件代理", "端口转发"}) + private String ruleType; + /** * 规则标题. */ + @NotBlank(message = "[ruleTitle]规则标题不能为空") @Length(min = 0, max = 100, message = "[ruleTitle]规则标题长度不合法(0-100)") private String ruleTitle; /** * 规则名称. */ + @NotBlank(message = "[ruleName]规则名称不能为空") @Length(min = 0, max = 100, message = "[ruleName]规则名称长度不合法(0-100)") private String ruleName; /** * 规则属值. */ + @NotBlank(message = "[ruleValue]规则属值不能为空") @Length(min = 0, max = 100, message = "[ruleValue]规则属值长度不合法(0-100)") private String ruleValue; /** * 默认属值. */ + @NotBlank(message = "[valueDefault]默认属值不能为空") @Length(min = 0, max = 100, message = "[valueDefault]默认属值长度不合法(0-100)") private String valueDefault; /** * 属值正则. */ + @NotBlank(message = "[valueRegex]属值正则不能为空") @Length(min = 0, max = 100, message = "[valueRegex]属值正则长度不合法(0-100)") private String valueRegex; + /** + * 最大数量. + */ + @NotNull(message = "[valueMax]最大数量不能为NULL") + private Integer valueMax; + /** * 规则描述. */ @@ -83,6 +107,14 @@ public class RulesUpdateRequest extends BaseUpdateRequest { this.ruleFor = ruleFor; } + public String getRuleType() { + return this.ruleType; + } + + public void setRuleType(String ruleType) { + this.ruleType = ruleType; + } + public String getRuleTitle() { return this.ruleTitle; } @@ -123,6 +155,14 @@ public class RulesUpdateRequest extends BaseUpdateRequest { this.valueRegex = valueRegex; } + public Integer getValueMax() { + return this.valueMax; + } + + public void setValueMax(Integer valueMax) { + this.valueMax = valueMax; + } + public String getRuleNote() { return this.ruleNote; } diff --git a/src/main/java/xyz/wbsite/module/admin/rsp/RulesCreateResponse.java b/src/main/java/xyz/wbsite/module/admin/rsp/RulesCreateResponse.java index cd5fc2e..75d3d34 100644 --- a/src/main/java/xyz/wbsite/module/admin/rsp/RulesCreateResponse.java +++ b/src/main/java/xyz/wbsite/module/admin/rsp/RulesCreateResponse.java @@ -7,7 +7,7 @@ import xyz.wbsite.frame.base.BaseResponse; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesCreateResponse extends BaseResponse { diff --git a/src/main/java/xyz/wbsite/module/admin/rsp/RulesDeleteResponse.java b/src/main/java/xyz/wbsite/module/admin/rsp/RulesDeleteResponse.java index a2a30bc..3e6e202 100644 --- a/src/main/java/xyz/wbsite/module/admin/rsp/RulesDeleteResponse.java +++ b/src/main/java/xyz/wbsite/module/admin/rsp/RulesDeleteResponse.java @@ -7,7 +7,7 @@ import xyz.wbsite.frame.base.BaseResponse; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesDeleteResponse extends BaseResponse { diff --git a/src/main/java/xyz/wbsite/module/admin/rsp/RulesFindResponse.java b/src/main/java/xyz/wbsite/module/admin/rsp/RulesFindResponse.java index a42374b..e498e7b 100644 --- a/src/main/java/xyz/wbsite/module/admin/rsp/RulesFindResponse.java +++ b/src/main/java/xyz/wbsite/module/admin/rsp/RulesFindResponse.java @@ -8,7 +8,7 @@ import xyz.wbsite.module.admin.ent.Rules; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesFindResponse extends BaseFindResponse { } \ No newline at end of file diff --git a/src/main/java/xyz/wbsite/module/admin/rsp/RulesUpdateResponse.java b/src/main/java/xyz/wbsite/module/admin/rsp/RulesUpdateResponse.java index 220cb33..1ffc664 100644 --- a/src/main/java/xyz/wbsite/module/admin/rsp/RulesUpdateResponse.java +++ b/src/main/java/xyz/wbsite/module/admin/rsp/RulesUpdateResponse.java @@ -7,7 +7,7 @@ import xyz.wbsite.frame.base.BaseResponse; * * @author wangbing * @version 0.0.1 - * @since 2021-02-08 + * @since 2021-02-09 */ public class RulesUpdateResponse extends BaseResponse { diff --git a/src/main/resources/nginx-admin.db3 b/src/main/resources/nginx-admin.db3 index 91a42916482c9f0d8792c2cfd9b1a8c6ffea6f29..7a7eccd9c23dc8049a8745a6b847aefb0592eb2e 100644 GIT binary patch delta 127 zcmZozz|^pSX+oBe9|P|N{@vUOywf@6aqF}Baini-yu`Zs0$TtRS1TVYySS_@V`u(k zEzW|;)7S+$f<<3l0?CjaM_pS*}uV)6k#!O4d>#liGLD4&r_dh&FjxC)mfh~^A) V^a*v1_jQbzyqaBRvn$u`Rsi8`C+7eF delta 77 zcmZozz|^pSX+oCJ1qR*={JXgmc&BqJaO<;O;CQ)NP#}bDvmaXk6ITllE4#R?EMt52 hUCKqzbPo4>+4{<6_e#fb}*_P{YD*%{Z7#IKm diff --git a/src/main/resources/pt/admin_table/SQLite_ALL_TABLE.sql b/src/main/resources/pt/admin_table/SQLite_ALL_TABLE.sql index c10f188..f6a6836 100644 --- a/src/main/resources/pt/admin_table/SQLite_ALL_TABLE.sql +++ b/src/main/resources/pt/admin_table/SQLite_ALL_TABLE.sql @@ -2,7 +2,7 @@ -- Table structure for SERVICES - 虚拟主机 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_SERVICES ( "ID" BIGINT PRIMARY KEY NOT NULL, @@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS NA_SERVICES ( -- Table structure for LOCATIONS - 路径配置 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_LOCATIONS ( "ID" BIGINT PRIMARY KEY NOT NULL, @@ -48,7 +48,7 @@ CREATE TABLE IF NOT EXISTS NA_LOCATIONS ( -- Table structure for CONFIG_DATA - 配置数据 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_CONFIG_DATA ( "ID" BIGINT PRIMARY KEY NOT NULL, @@ -69,16 +69,18 @@ CREATE TABLE IF NOT EXISTS NA_CONFIG_DATA ( -- Table structure for RULES - 配置规则 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_RULES ( "ID" BIGINT PRIMARY KEY NOT NULL, - "RULE_FOR" VARCHAR(20), - "RULE_TITLE" VARCHAR(100), - "RULE_NAME" VARCHAR(100), - "RULE_VALUE" VARCHAR(100), - "VALUE_DEFAULT" VARCHAR(100), - "VALUE_REGEX" VARCHAR(100), + "RULE_FOR" VARCHAR(20) NOT NULL, + "RULE_TYPE" VARCHAR(50) NOT NULL, + "RULE_TITLE" VARCHAR(100) NOT NULL, + "RULE_NAME" VARCHAR(100) NOT NULL, + "RULE_VALUE" VARCHAR(100) NOT NULL, + "VALUE_DEFAULT" VARCHAR(100) NOT NULL, + "VALUE_REGEX" VARCHAR(100) NOT NULL, + "VALUE_MAX" MEDIUMINT NOT NULL, "RULE_NOTE" VARCHAR(500), "ROW_VERSION" BIGINT NOT NULL, "IS_DELETED" BOOLEAN NOT NULL, diff --git a/src/main/resources/pt/admin_table/SQLite_CONFIG_DATA.sql b/src/main/resources/pt/admin_table/SQLite_CONFIG_DATA.sql index edb2703..4016c05 100644 --- a/src/main/resources/pt/admin_table/SQLite_CONFIG_DATA.sql +++ b/src/main/resources/pt/admin_table/SQLite_CONFIG_DATA.sql @@ -2,7 +2,7 @@ -- Table structure for CONFIG_DATA - 配置数据 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_CONFIG_DATA ( "ID" BIGINT PRIMARY KEY NOT NULL, diff --git a/src/main/resources/pt/admin_table/SQLite_LOCATIONS.sql b/src/main/resources/pt/admin_table/SQLite_LOCATIONS.sql index 95ff87e..3deba19 100644 --- a/src/main/resources/pt/admin_table/SQLite_LOCATIONS.sql +++ b/src/main/resources/pt/admin_table/SQLite_LOCATIONS.sql @@ -2,7 +2,7 @@ -- Table structure for LOCATIONS - 路径配置 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_LOCATIONS ( "ID" BIGINT PRIMARY KEY NOT NULL, diff --git a/src/main/resources/pt/admin_table/SQLite_RULES.sql b/src/main/resources/pt/admin_table/SQLite_RULES.sql index f118bd7..aef038c 100644 --- a/src/main/resources/pt/admin_table/SQLite_RULES.sql +++ b/src/main/resources/pt/admin_table/SQLite_RULES.sql @@ -2,16 +2,18 @@ -- Table structure for RULES - 配置规则 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_RULES ( "ID" BIGINT PRIMARY KEY NOT NULL, - "RULE_FOR" VARCHAR(20), - "RULE_TITLE" VARCHAR(100), - "RULE_NAME" VARCHAR(100), - "RULE_VALUE" VARCHAR(100), - "VALUE_DEFAULT" VARCHAR(100), - "VALUE_REGEX" VARCHAR(100), + "RULE_FOR" VARCHAR(20) NOT NULL, + "RULE_TYPE" VARCHAR(50) NOT NULL, + "RULE_TITLE" VARCHAR(100) NOT NULL, + "RULE_NAME" VARCHAR(100) NOT NULL, + "RULE_VALUE" VARCHAR(100) NOT NULL, + "VALUE_DEFAULT" VARCHAR(100) NOT NULL, + "VALUE_REGEX" VARCHAR(100) NOT NULL, + "VALUE_MAX" MEDIUMINT NOT NULL, "RULE_NOTE" VARCHAR(500), "ROW_VERSION" BIGINT NOT NULL, "IS_DELETED" BOOLEAN NOT NULL, diff --git a/src/main/resources/pt/admin_table/SQLite_SERVICES.sql b/src/main/resources/pt/admin_table/SQLite_SERVICES.sql index 5dde404..7649322 100644 --- a/src/main/resources/pt/admin_table/SQLite_SERVICES.sql +++ b/src/main/resources/pt/admin_table/SQLite_SERVICES.sql @@ -2,7 +2,7 @@ -- Table structure for SERVICES - 虚拟主机 -- Target : SQLite -- Author : wangbing --- Date: : 2021-02-08 +-- Date: : 2021-02-09 -- ---------------------------- CREATE TABLE IF NOT EXISTS NA_SERVICES ( "ID" BIGINT PRIMARY KEY NOT NULL, diff --git a/src/main/resources/pt/nginx-admin.xml b/src/main/resources/pt/nginx-admin.xml index 2fb964f..587da97 100644 --- a/src/main/resources/pt/nginx-admin.xml +++ b/src/main/resources/pt/nginx-admin.xml @@ -3,7 +3,7 @@ - + @@ -17,15 +17,15 @@ - - - + + + - +
- + @@ -33,45 +33,53 @@ - - - + + + - +
- + - - - + + + - +
- + - - - - - + + + + + + + + + + + + + - + - +
diff --git a/src/main/resources/static/css/base.css b/src/main/resources/static/css/base.css index c3c9c7e..ea0f42c 100644 --- a/src/main/resources/static/css/base.css +++ b/src/main/resources/static/css/base.css @@ -822,6 +822,8 @@ a[disabled] { color: #ffffff; background: #409EFF; border: 0 solid #DCDFE6 !important; + justify-content: center; + align-items: center; } /* 以上为APP样式 */ \ No newline at end of file diff --git a/src/main/resources/templates/screen/admin/rules.ftl b/src/main/resources/templates/screen/admin/rules.ftl index d8e6bdd..de1e64b 100644 --- a/src/main/resources/templates/screen/admin/rules.ftl +++ b/src/main/resources/templates/screen/admin/rules.ftl @@ -8,43 +8,64 @@ + + + + + + + + + - + + + + - - - - + + + + - - - - + + + + - - - - + - + + + + - - - - + - + 搜索 - 重置 + 重置 + @@ -62,23 +83,23 @@ - <#if token.hasRes("/ajax/admin/rules/template")> + <#if token.hasRes("/ajax/admin/rules/template")> - + - <#if token.hasRes("/ajax/admin/rules/imports")> + <#if token.hasRes("/ajax/admin/rules/imports")> - + - <#if token.hasRes("/ajax/admin/rules/exports")> + <#if token.hasRes("/ajax/admin/rules/exports")> - + @@ -115,6 +136,19 @@ 路径 + + + + + @@ -214,16 +254,27 @@ :label-position="'right'"> - - - + + + - + + + + + + + + + + @@ -267,6 +318,20 @@ show-word-limit placeholder="请输入属值正则"> + + + + +