This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new da78f467d9 [feat] refactor rule reserved keyword fields (#6147)
da78f467d9 is described below
commit da78f467d99d710bd2f4f529f3765e623a511b1c
Author: Wweiei <[email protected]>
AuthorDate: Sat Sep 13 15:51:20 2025 +0800
[feat] refactor rule reserved keyword fields (#6147)
* feat:refactor rule reserved keyword fields.
* feat:refactor rule reserved keyword fields.
---------
Co-authored-by: aias00 <[email protected]>
---
db/init/mysql/schema.sql | 4 +-
db/init/ob/schema.sql | 4 +-
db/init/og/create-table.sql | 8 +--
db/init/oracle/schema.sql | 10 +--
db/init/pg/create-table.sql | 8 +--
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 2 +
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 4 +-
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 2 +
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 4 +-
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 4 +-
.../org/apache/shenyu/admin/mapper/RuleMapper.java | 3 +-
.../apache/shenyu/admin/model/entity/RuleDO.java | 84 +++++++++++-----------
.../model/event/rule/BatchRuleDeletedEvent.java | 2 +-
.../admin/model/event/rule/RuleChangedEvent.java | 12 ++--
.../admin/model/vo/DataPermissionPageVO.java | 2 +-
.../org/apache/shenyu/admin/model/vo/RuleVO.java | 2 +-
.../shenyu/admin/service/impl/RuleServiceImpl.java | 7 +-
.../src/main/resources/mappers/rule-sqlmap.xml | 60 ++++++++--------
.../src/main/resources/sql-script/h2/schema.sql | 4 +-
.../apache/shenyu/admin/mapper/RuleMapperTest.java | 6 +-
20 files changed, 121 insertions(+), 111 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 67847dcc40..6952137b5c 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -2057,12 +2057,12 @@ CREATE TABLE `rule` (
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL
COMMENT 'primary key id',
`selector_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'selector id',
`match_mode` int(0) NOT NULL COMMENT 'matching mode (0 and 1 or)',
- `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT
NULL COMMENT 'rule name',
+ `rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'rule name',
`enabled` tinyint(0) NOT NULL COMMENT 'whether to open (0 close, 1 open) ',
`loged` tinyint(0) NOT NULL COMMENT 'whether to log or not (0 no print, 1
print) ',
`match_restful` tinyint(0) NOT NULL COMMENT 'whether to match restful(0
cache, 1 not cache)',
`namespace_id` varchar(50) NOT NULL COMMENT 'namespace id',
- `sort` int(0) NOT NULL COMMENT 'sort',
+ `sort_code` int(0) NOT NULL COMMENT 'sort',
`handle` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT
NULL COMMENT 'processing logic (here for different plug-ins, there will be
different fields to identify different processes, all data in JSON format is
stored)',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE
CURRENT_TIMESTAMP(3) COMMENT 'update time',
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index b8be57a216..7f4601dc09 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -1985,12 +1985,12 @@ CREATE TABLE `rule` (
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL
COMMENT 'primary key id',
`selector_id` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'selector id',
`match_mode` int(0) NOT NULL COMMENT 'matching mode (0 and 1 or)',
- `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT
NULL COMMENT 'rule name',
+ `rule_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci
NOT NULL COMMENT 'rule name',
`enabled` tinyint(0) NOT NULL COMMENT 'whether to open (0 close, 1 open) ',
`loged` tinyint(0) NOT NULL COMMENT 'whether to log or not (0 no print, 1
print) ',
`match_restful` tinyint(0) NOT NULL COMMENT 'whether to match restful(0
cache, 1 not cache)',
`namespace_id` varchar(50) NOT NULL COMMENT 'namespace id',
- `sort` int(0) NOT NULL COMMENT 'sort',
+ `sort_code` int(0) NOT NULL COMMENT 'sort',
`handle` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT
NULL COMMENT 'processing logic (here for different plug-ins, there will be
different fields to identify different processes, all data in JSON format is
stored)',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
`date_updated` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE
CURRENT_TIMESTAMP(3) COMMENT 'update time',
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index 355ffc22d3..9c2ea23a63 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -1912,12 +1912,12 @@ CREATE TABLE "public"."rule" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"selector_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"match_mode" int4 NOT NULL,
- "name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
+ "rule_name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"enabled" int2 NOT NULL,
"loged" int2 NOT NULL,
"match_restful" int2 NOT NULL,
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
- "sort" int4 NOT NULL,
+ "sort_code" int4 NOT NULL,
"handle" text COLLATE "pg_catalog"."default",
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
@@ -1926,12 +1926,12 @@ CREATE TABLE "public"."rule" (
COMMENT ON COLUMN "public"."rule"."id" IS 'primary key id';
COMMENT ON COLUMN "public"."rule"."selector_id" IS 'selector id';
COMMENT ON COLUMN "public"."rule"."match_mode" IS 'matching mode (0 and 1 or)';
-COMMENT ON COLUMN "public"."rule"."name" IS 'rule name';
+COMMENT ON COLUMN "public"."rule"."rule_name" IS 'rule name';
COMMENT ON COLUMN "public"."rule"."enabled" IS 'whether to open (0 close, 1
open) ';
COMMENT ON COLUMN "public"."rule"."loged" IS 'whether to log or not (0 no
print, 1 print) ';
COMMENT ON COLUMN "public"."rule"."match_restful" IS 'whether to match
restful(0 cache, 1 not cache)';
COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespace id';
-COMMENT ON COLUMN "public"."rule"."sort" IS 'sort';
+COMMENT ON COLUMN "public"."rule"."sort_code" IS 'sort';
COMMENT ON COLUMN "public"."rule"."handle" IS 'processing logic (here for
different plug-ins, there will be different fields to identify different
processes, all data in JSON format is stored)';
COMMENT ON COLUMN "public"."rule"."date_created" IS 'create time';
COMMENT ON COLUMN "public"."rule"."date_updated" IS 'update time';
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index 19d9a251e4..aec581a2b5 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -194,12 +194,12 @@ create table rule
id VARCHAR2(128) not null PRIMARY KEY,
selector_id VARCHAR2(128) not null,
match_mode NUMBER(10) not null,
- name VARCHAR2(128) not null,
+ rule_name VARCHAR2(128) not null,
enabled NUMBER(3) not null,
loged NUMBER(3) not null,
match_restful NUMBER(3) not null,
- namespace_id VARCHAR2(50) not null,
- sort NUMBER(10) not null,
+ namespace_id VARCHAR2(50) not null,
+ sort_code NUMBER(10) not null,
handle CLOB,
date_created timestamp(3) default SYSDATE not null,
date_updated timestamp(3) default SYSDATE not null
@@ -211,7 +211,7 @@ comment on column RULE.selector_id
is 'selector id';
comment on column RULE.match_mode
is 'matching mode (0 and 1 or)';
-comment on column RULE.name
+comment on column RULE.rule_name
is 'rule name';
comment on column RULE.enabled
is 'whether to open (0 not open, 1 open)';
@@ -221,7 +221,7 @@ comment on column RULE.match_restful
is 'whether to match restful(0 cache, 1 not cache)';
comment on column RULE.namespace_id
is 'namespace id';
-comment on column RULE.sort
+comment on column RULE.sort_code
is 'sort';
comment on column RULE.handle
is 'processing logic (here for different plug-ins, there will be different
fields to identify different processes, all data in JSON format is stored)';
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index a6658be2e4..68aafb8c8d 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -2040,12 +2040,12 @@ CREATE TABLE "public"."rule" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"selector_id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"match_mode" int4 NOT NULL,
- "name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
+ "rule_name" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
"enabled" int2 NOT NULL,
"loged" int2 NOT NULL,
"match_restful" int2 NOT NULL,
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
- "sort" int4 NOT NULL,
+ "sort_code" int4 NOT NULL,
"handle" text COLLATE "pg_catalog"."default",
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
"date_updated" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone)
@@ -2054,12 +2054,12 @@ CREATE TABLE "public"."rule" (
COMMENT ON COLUMN "public"."rule"."id" IS 'primary key id';
COMMENT ON COLUMN "public"."rule"."selector_id" IS 'selector id';
COMMENT ON COLUMN "public"."rule"."match_mode" IS 'matching mode (0 and 1 or)';
-COMMENT ON COLUMN "public"."rule"."name" IS 'rule name';
+COMMENT ON COLUMN "public"."rule"."rule_name" IS 'rule name';
COMMENT ON COLUMN "public"."rule"."enabled" IS 'whether to open (0 close, 1
open) ';
COMMENT ON COLUMN "public"."rule"."loged" IS 'whether to log or not (0 no
print, 1 print) ';
COMMENT ON COLUMN "public"."rule"."match_restful" IS 'whether to match
restful(0 cache, 1 not cache)';
COMMENT ON COLUMN "public"."rule"."namespace_id" IS 'namespace id';
-COMMENT ON COLUMN "public"."rule"."sort" IS 'sort';
+COMMENT ON COLUMN "public"."rule"."sort_code" IS 'sort';
COMMENT ON COLUMN "public"."rule"."handle" IS 'processing logic (here for
different plug-ins, there will be different fields to identify different
processes, all data in JSON format is stored)';
COMMENT ON COLUMN "public"."rule"."date_created" IS 'create time';
COMMENT ON COLUMN "public"."rule"."date_updated" IS 'update time';
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
index 343d4fc0f1..cd237d6992 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql
@@ -270,3 +270,5 @@ ALTER TABLE `rule` MODIFY COLUMN `handle` text;
ALTER TABLE `selector` CHANGE COLUMN `type` `selector_type` int(0) NOT NULL
COMMENT 'type (0, full flow, 1 custom flow)';
ALTER TABLE `selector` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL
COMMENT 'sort';
ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector
name';
+ALTER TABLE `rule` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT
'sort';
+ALTER TABLE `rule` CHANGE COLUMN `name` `rule_name` varchar(128) CHARACTER SET
utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name';
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
index 3329bb5da1..e3a6c4004c 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-ob.sql
@@ -262,4 +262,6 @@ INSERT INTO `permission` (`id`, `object_id`, `resource_id`,
`date_created`, `dat
ALTER TABLE `rule` MODIFY COLUMN `handle` text;
ALTER TABLE `selector` CHANGE COLUMN `type` `selector_type` int(0) NOT NULL
COMMENT 'type (0, full flow, 1 custom flow)';
ALTER TABLE `selector` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL
COMMENT 'sort';
-ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector
name';
\ No newline at end of file
+ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name` varchar(64)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'selector
name';
+ALTER TABLE `rule` CHANGE COLUMN `sort` `sort_code` int(0) NOT NULL COMMENT
'sort';
+ALTER TABLE `rule` CHANGE COLUMN `name` `rule_name` varchar(128) CHARACTER SET
utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'rule name';
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
index 00e09fcdaa..161f12a695 100644
--- a/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
@@ -287,3 +287,5 @@ ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
ALTER TABLE "public"."selector" RENAME COLUMN "type" TO "selector_type";
ALTER TABLE "public"."selector" RENAME COLUMN "sort" TO "sort_code";
ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
+ALTER TABLE "public"."rule" RENAME COLUMN "sort" TO "sort_code";
+ALTER TABLE "public"."rule" RENAME COLUMN "name" TO "rule_name";
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
index e74f112ce3..ed36458f30 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql
@@ -576,4 +576,6 @@ ALTER TABLE rule DROP COLUMN handle;
ALTER TABLE rule RENAME COLUMN handle_new TO handle;
ALTER TABLE selector RENAME COLUMN "type" TO "selector_type";
ALTER TABLE selector RENAME COLUMN "sort" TO "sort_code";
-ALTER TABLE selector RENAME COLUMN "name" TO "selector_name";
\ No newline at end of file
+ALTER TABLE selector RENAME COLUMN "name" TO "selector_name";
+ALTER TABLE rule RENAME COLUMN "sort" TO "sort_code";
+ALTER TABLE rule RENAME COLUMN "name" TO "rule_name";
\ No newline at end of file
diff --git a/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
index 3cd33cdf72..3a8572ee4a 100755
--- a/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
+++ b/db/upgrade/2.7.0-upgrade-2.7.1-pg.sql
@@ -284,4 +284,6 @@ INSERT INTO "public"."permission" VALUES
('1953049887387303905', '13463585604272
ALTER TABLE "public"."rule" ALTER COLUMN "handle" TYPE text;
ALTER TABLE "public"."selector" RENAME COLUMN "type" TO "selector_type";
ALTER TABLE "public"."selector" RENAME COLUMN "sort" TO "sort_code";
-ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
\ No newline at end of file
+ALTER TABLE "public"."selector" RENAME COLUMN "name" TO "selector_name";
+ALTER TABLE "public"."rule" RENAME COLUMN "sort" TO "sort_code";
+ALTER TABLE "public"."rule" RENAME COLUMN "name" TO "rule_name";
\ No newline at end of file
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
index 39384cf494..13ef28a98d 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/RuleMapper.java
@@ -22,7 +22,6 @@ import org.apache.ibatis.annotations.Param;
import org.apache.shenyu.admin.model.entity.RuleDO;
import org.apache.shenyu.admin.model.query.RuleQuery;
import org.apache.shenyu.admin.model.query.RuleQueryCondition;
-import org.apache.shenyu.admin.model.vo.RuleVO;
import org.apache.shenyu.admin.validation.ExistProvider;
import java.io.Serializable;
@@ -177,7 +176,7 @@ public interface RuleMapper extends ExistProvider {
* @param condition condition
* @return list
*/
- List<RuleVO> selectByCondition(@Param("condition") RuleQueryCondition
condition);
+ List<RuleDO> selectByCondition(@Param("condition") RuleQueryCondition
condition);
/**
* get plugin name by selectorId.
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/RuleDO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/RuleDO.java
index 07b0fba6ba..0316312180 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/RuleDO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/RuleDO.java
@@ -49,7 +49,7 @@ public final class RuleDO extends BaseDO {
/**
* rule name.
*/
- private String name;
+ private String ruleName;
/**
* whether enabled.
@@ -62,9 +62,9 @@ public final class RuleDO extends BaseDO {
private Boolean loged;
/**
- * sort type.
+ * sort code.
*/
- private Integer sort;
+ private Integer sortCode;
/**
* process logic.
@@ -86,19 +86,19 @@ public final class RuleDO extends BaseDO {
public RuleDO(final String selectorId,
final Integer matchMode,
- final String name,
+ final String ruleName,
final Boolean enabled,
final Boolean loged,
- final Integer sort,
+ final Integer sortCode,
final String handle,
final Boolean matchRestful,
final String namespaceId) {
this.selectorId = selectorId;
this.matchMode = matchMode;
- this.name = name;
+ this.ruleName = ruleName;
this.enabled = enabled;
this.loged = loged;
- this.sort = sort;
+ this.sortCode = sortCode;
this.handle = handle;
this.matchRestful = matchRestful;
this.namespaceId = namespaceId;
@@ -141,21 +141,21 @@ public final class RuleDO extends BaseDO {
}
/**
- * Gets the value of name.
+ * Gets the value of ruleName.
*
- * @return the value of name
+ * @return the value of ruleName
*/
- public String getName() {
- return name;
+ public String getRuleName() {
+ return ruleName;
}
/**
- * Sets the name.
+ * Sets the ruleName.
*
- * @param name name
+ * @param ruleName ruleName
*/
- public void setName(final String name) {
- this.name = name;
+ public void setRuleName(final String ruleName) {
+ this.ruleName = ruleName;
}
/**
@@ -195,21 +195,21 @@ public final class RuleDO extends BaseDO {
}
/**
- * Gets the value of sort.
+ * Gets the value of sortCode.
*
- * @return the value of sort
+ * @return the value of sortCode
*/
- public Integer getSort() {
- return sort;
+ public Integer getSortCode() {
+ return sortCode;
}
/**
- * Sets the sort.
+ * Sets the sortCode.
*
- * @param sort sort
+ * @param sortCode sortCode
*/
- public void setSort(final Integer sort) {
- this.sort = sort;
+ public void setSortCode(final Integer sortCode) {
+ this.sortCode = sortCode;
}
/**
@@ -287,10 +287,10 @@ public final class RuleDO extends BaseDO {
RuleDO ruleDO = RuleDO.builder()
.selectorId(item.getSelectorId())
.matchMode(item.getMatchMode())
- .name(item.getName())
+ .ruleName(item.getName())
.enabled(item.getEnabled())
.loged(item.getLoged())
- .sort(item.getSort())
+ .sortCode(item.getSort())
.handle(item.getHandle())
.matchRestful(item.getMatchRestful())
.dateUpdated(currentTime)
@@ -318,11 +318,11 @@ public final class RuleDO extends BaseDO {
public static RuleData transFrom(final RuleDO ruleDO, final String
pluginName, final List<ConditionData> conditionDataList, final
List<ConditionData> beforeConditionDataList) {
return RuleData.builder()
.id(ruleDO.getId())
- .name(ruleDO.getName())
+ .name(ruleDO.getRuleName())
.pluginName(pluginName)
.selectorId(ruleDO.getSelectorId())
.matchMode(ruleDO.getMatchMode())
- .sort(ruleDO.getSort())
+ .sort(ruleDO.getSortCode())
.enabled(ruleDO.getEnabled())
.loged(ruleDO.getLoged())
.handle(ruleDO.getHandle())
@@ -360,10 +360,10 @@ public final class RuleDO extends BaseDO {
RuleDO ruleDO = (RuleDO) o;
return Objects.equals(selectorId, ruleDO.selectorId)
&& Objects.equals(matchMode, ruleDO.matchMode)
- && Objects.equals(name, ruleDO.name)
+ && Objects.equals(ruleName, ruleDO.ruleName)
&& Objects.equals(enabled, ruleDO.enabled)
&& Objects.equals(loged, ruleDO.loged)
- && Objects.equals(sort, ruleDO.sort)
+ && Objects.equals(sortCode, ruleDO.sortCode)
&& Objects.equals(handle, ruleDO.handle)
&& Objects.equals(matchRestful, ruleDO.matchRestful)
&& Objects.equals(namespaceId, ruleDO.namespaceId);
@@ -371,7 +371,7 @@ public final class RuleDO extends BaseDO {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), selectorId, matchMode, name,
enabled, loged, sort, handle, matchRestful,
+ return Objects.hash(super.hashCode(), selectorId, matchMode, ruleName,
enabled, loged, sortCode, handle, matchRestful,
namespaceId);
}
@@ -387,13 +387,13 @@ public final class RuleDO extends BaseDO {
private Integer matchMode;
- private String name;
+ private String ruleName;
private Boolean enabled;
private Boolean loged;
- private Integer sort;
+ private Integer sortCode;
private String handle;
@@ -460,13 +460,13 @@ public final class RuleDO extends BaseDO {
}
/**
- * name.
+ * ruleName.
*
- * @param name the name.
+ * @param ruleName the ruleName.
* @return RuleDOBuilder.
*/
- public RuleDOBuilder name(final String name) {
- this.name = name;
+ public RuleDOBuilder ruleName(final String ruleName) {
+ this.ruleName = ruleName;
return this;
}
@@ -493,13 +493,13 @@ public final class RuleDO extends BaseDO {
}
/**
- * sort.
+ * sortCode.
*
- * @param sort the sort.
+ * @param sortCode the sortCode.
* @return RuleDOBuilder.
*/
- public RuleDOBuilder sort(final Integer sort) {
- this.sort = sort;
+ public RuleDOBuilder sortCode(final Integer sortCode) {
+ this.sortCode = sortCode;
return this;
}
@@ -548,10 +548,10 @@ public final class RuleDO extends BaseDO {
ruleDO.setDateUpdated(dateUpdated);
ruleDO.setSelectorId(selectorId);
ruleDO.setMatchMode(matchMode);
- ruleDO.setName(name);
+ ruleDO.setRuleName(ruleName);
ruleDO.setEnabled(enabled);
ruleDO.setLoged(loged);
- ruleDO.setSort(sort);
+ ruleDO.setSortCode(sortCode);
ruleDO.setHandle(handle);
ruleDO.setMatchRestful(matchRestful);
ruleDO.setNamespaceId(namespaceId);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/BatchRuleDeletedEvent.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/BatchRuleDeletedEvent.java
index 10975d0f71..0a4802a1e7 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/BatchRuleDeletedEvent.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/BatchRuleDeletedEvent.java
@@ -57,7 +57,7 @@ public class BatchRuleDeletedEvent extends BatchChangedEvent {
public String buildContext() {
final String selector = ((Collection<?>) getSource())
.stream()
- .map(s -> ((RuleDO) s).getName())
+ .map(s -> ((RuleDO) s).getRuleName())
.collect(Collectors.joining(","));
final String namespaceId = ((Collection<?>) getSource())
.stream()
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/RuleChangedEvent.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/RuleChangedEvent.java
index 153c59f6f1..7e1879ebb5 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/RuleChangedEvent.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/rule/RuleChangedEvent.java
@@ -47,9 +47,9 @@ public class RuleChangedEvent extends
AdminDataModelChangedEvent {
public String buildContext() {
final RuleDO after = (RuleDO) getAfter();
if (Objects.isNull(getBefore())) {
- return String.format("the namespace [%s] rule [%s] is %s",
after.getNamespaceId(), after.getName(),
StringUtils.lowerCase(getType().getType().toString()));
+ return String.format("the namespace [%s] rule [%s] is %s",
after.getNamespaceId(), after.getRuleName(),
StringUtils.lowerCase(getType().getType().toString()));
}
- return String.format("the namespace [%s] rule [%s] is %s : %s",
after.getNamespaceId(), after.getName(),
StringUtils.lowerCase(getType().getType().toString()), contrast());
+ return String.format("the namespace [%s] rule [%s] is %s : %s",
after.getNamespaceId(), after.getRuleName(),
StringUtils.lowerCase(getType().getType().toString()), contrast());
}
@@ -62,8 +62,8 @@ public class RuleChangedEvent extends
AdminDataModelChangedEvent {
return "it no change";
}
final StringBuilder builder = new StringBuilder();
- if (!Objects.equals(before.getName(), after.getName())) {
- builder.append(String.format("name[%s => %s] ", before.getName(),
after.getName()));
+ if (!Objects.equals(before.getRuleName(), after.getRuleName())) {
+ builder.append(String.format("name[%s => %s] ",
before.getRuleName(), after.getRuleName()));
}
if (!Objects.equals(before.getHandle(), after.getHandle())) {
builder.append(String.format("handle[%s => %s] ",
before.getHandle(), after.getHandle()));
@@ -74,8 +74,8 @@ public class RuleChangedEvent extends
AdminDataModelChangedEvent {
if (!Objects.equals(before.getEnabled(), after.getEnabled())) {
builder.append(String.format("enable[%s => %s] ",
before.getEnabled(), after.getEnabled()));
}
- if (!Objects.equals(before.getSort(), after.getSort())) {
- builder.append(String.format("sort[%s => %s] ", before.getSort(),
after.getSort()));
+ if (!Objects.equals(before.getSortCode(), after.getSortCode())) {
+ builder.append(String.format("sort[%s => %s] ",
before.getSortCode(), after.getSortCode()));
}
if (!Objects.equals(before.getLoged(), after.getLoged())) {
builder.append(String.format("loged[%s => %s] ",
before.getLoged(), after.getLoged()));
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
index 10c83127d3..e9e7bcd535 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DataPermissionPageVO.java
@@ -129,7 +129,7 @@ public class DataPermissionPageVO implements Serializable {
*/
public static DataPermissionPageVO buildPageVOByRule(final RuleDO ruleDO,
final Boolean isChecked) {
return Optional.of(ruleDO)
- .map(item -> new DataPermissionPageVO(item.getId(),
item.getName(), isChecked))
+ .map(item -> new DataPermissionPageVO(item.getId(),
item.getRuleName(), isChecked))
.orElse(null);
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/RuleVO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/RuleVO.java
index a1a70f06ea..9502deb0c4 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/RuleVO.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/RuleVO.java
@@ -380,7 +380,7 @@ public class RuleVO implements Serializable {
*/
public static RuleVO buildRuleVO(final RuleDO ruleDO, final
List<RuleConditionVO> ruleConditions) {
return new RuleVO(ruleDO.getId(), ruleDO.getSelectorId(),
ruleDO.getMatchMode(), MatchModeEnum.getMatchModeByCode(ruleDO.getMatchMode()),
- ruleDO.getName(), ruleDO.getEnabled(), ruleDO.getLoged(),
ruleDO.getSort(), ruleDO.getHandle(),
+ ruleDO.getRuleName(), ruleDO.getEnabled(), ruleDO.getLoged(),
ruleDO.getSortCode(), ruleDO.getHandle(),
ruleDO.getMatchRestful(), ruleConditions,
DateUtils.localDateTimeToString(ruleDO.getDateCreated().toLocalDateTime()),
DateUtils.localDateTimeToString(ruleDO.getDateUpdated().toLocalDateTime()));
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
index 7426e17b95..f609f83919 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/RuleServiceImpl.java
@@ -110,7 +110,8 @@ public class RuleServiceImpl implements RuleService {
@Override
public List<RuleVO> searchByCondition(final RuleQueryCondition condition) {
condition.init();
- final List<RuleVO> rules = ruleMapper.selectByCondition(condition);
+ final List<RuleDO> ruleDOList =
ruleMapper.selectByCondition(condition);
+ List<RuleVO> rules =
ruleDOList.stream().map(RuleVO::buildRuleVO).collect(Collectors.toList());
for (RuleVO rule : rules) {
rule.setMatchModeName(MatchModeEnum.getMatchModeByCode(rule.getMatchMode()));
}
@@ -279,7 +280,7 @@ public class RuleServiceImpl implements RuleService {
Set<String> existRuleNameSet = selectorRuleMap
.getOrDefault(selectorId, Lists.newArrayList())
.stream()
- .map(RuleDO::getName)
+ .map(RuleDO::getRuleName)
.collect(Collectors.toSet());
if (existRuleNameSet.contains(ruleName)) {
@@ -331,7 +332,7 @@ public class RuleServiceImpl implements RuleService {
Set<String> existRuleNameSet = selectorRuleMap
.getOrDefault(newSelectorId, Lists.newArrayList())
.stream()
- .map(RuleDO::getName)
+ .map(RuleDO::getRuleName)
.collect(Collectors.toSet());
if (existRuleNameSet.contains(ruleName)) {
diff --git a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
index 79a48d91a9..56cccb983a 100644
--- a/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/rule-sqlmap.xml
@@ -23,9 +23,9 @@
<result column="date_created" jdbcType="TIMESTAMP"
property="dateCreated"/>
<result column="date_updated" jdbcType="TIMESTAMP"
property="dateUpdated"/>
<result column="selector_id" jdbcType="VARCHAR" property="selectorId"/>
- <result column="name" jdbcType="VARCHAR" property="name"/>
+ <result column="rule_name" jdbcType="VARCHAR" property="ruleName"/>
<result column="match_mode" jdbcType="INTEGER" property="matchMode"/>
- <result column="sort" jdbcType="INTEGER" property="sort"/>
+ <result column="sort_code" jdbcType="INTEGER" property="sortCode"/>
<result column="enabled" jdbcType="TINYINT" property="enabled"/>
<result column="loged" jdbcType="TINYINT" property="loged"/>
<result column="match_restful" jdbcType="TINYINT"
property="matchRestful"/>
@@ -38,9 +38,9 @@
date_created,
date_updated,
selector_id,
- name,
+ rule_name,
match_mode,
- sort,
+ sort_code,
enabled,
loged,
match_restful,
@@ -59,7 +59,7 @@
SELECT
<include refid="Base_Column_List"/>
FROM rule
- WHERE name = #{name, jdbcType=VARCHAR}
+ WHERE rule_name = #{name, jdbcType=VARCHAR}
</select>
<select id="findBySelectorIdAndName" resultMap="BaseResultMap">
@@ -67,7 +67,7 @@
<include refid="Base_Column_List"/>
FROM rule
WHERE 1=1
- AND name = #{name, jdbcType=VARCHAR}
+ AND rule_name = #{name, jdbcType=VARCHAR}
AND selector_id = #{selectorId, jdbcType=VARCHAR}
</select>
@@ -81,7 +81,7 @@
</if>
<if test="name != null and name != ''">
<bind name="nameLike" value="('%' + name + '%')"/>
- AND name like #{nameLike, jdbcType=VARCHAR}
+ AND rule_name like #{nameLike, jdbcType=VARCHAR}
</if>
<if test="filterIds != null">
AND id IN
@@ -90,7 +90,7 @@
</foreach>
</if>
</where>
- ORDER BY sort
+ ORDER BY sort_code
</select>
<select id="findBySelectorId" parameterType="java.lang.String"
resultMap="BaseResultMap">
@@ -119,7 +119,7 @@
selector_id = #{selectorId, jdbcType=VARCHAR}
</if>
<if test="name != null and name != ''">
- AND name = #{name, jdbcType=VARCHAR}
+ AND rule_name = #{name, jdbcType=VARCHAR}
</if>
<if test="filterIds != null">
AND id IN
@@ -160,18 +160,18 @@
LIMIT 1
</select>
- <select id="selectByCondition"
resultType="org.apache.shenyu.admin.model.vo.RuleVO">
+ <select id="selectByCondition"
resultType="org.apache.shenyu.admin.model.entity.RuleDO"
resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"/>
FROM rule
<where>
<if test="condition.keyword != null and condition.keyword != ''">
<bind name="keyword" value="('%' + condition.keyword + '%')"/>
- AND name LIKE #{keyword, jdbcType=VARCHAR}
+ AND rule_name LIKE #{keyword, jdbcType=VARCHAR}
</if>
<if test="condition.excluded != null and condition.excluded != ''">
<bind name="excluded" value="('%' + condition.excluded +
'%')"/>
- AND name NOT LIKE #{excluded, jdbcType=VARCHAR}
+ AND rule_name NOT LIKE #{excluded, jdbcType=VARCHAR}
</if>
<if test="condition.switchStatus != null">
AND enabled = #{condition.switchStatus, jdbcType=BOOLEAN}
@@ -215,9 +215,9 @@
date_created,
date_updated,
selector_id,
- name,
+ rule_name,
match_mode,
- sort,
+ sort_code,
enabled,
loged,
match_restful,
@@ -227,9 +227,9 @@
#{dateCreated, jdbcType=TIMESTAMP},
#{dateUpdated, jdbcType=TIMESTAMP},
#{selectorId, jdbcType=VARCHAR},
- #{name, jdbcType=VARCHAR},
+ #{ruleName, jdbcType=VARCHAR},
#{matchMode, jdbcType=INTEGER},
- #{sort, jdbcType=INTEGER},
+ #{sortCode, jdbcType=INTEGER},
#{enabled, jdbcType=TINYINT},
#{loged, jdbcType=TINYINT},
#{matchRestful, jdbcType=TINYINT},
@@ -250,14 +250,14 @@
<if test="selectorId != null">
selector_id,
</if>
- <if test="name != null">
- name,
+ <if test="ruleName != null">
+ rule_name,
</if>
<if test="matchMode != null">
match_mode,
</if>
- <if test="sort != null">
- sort,
+ <if test="sortCode != null">
+ sort_code,
</if>
<if test="enabled != null">
enabled,
@@ -286,14 +286,14 @@
<if test="selectorId != null">
#{selectorId, jdbcType=VARCHAR},
</if>
- <if test="name != null">
- #{name, jdbcType=VARCHAR},
+ <if test="ruleName != null">
+ #{ruleName, jdbcType=VARCHAR},
</if>
<if test="matchMode != null">
#{matchMode, jdbcType=INTEGER},
</if>
- <if test="sort != null">
- #{sort, jdbcType=INTEGER},
+ <if test="sortCode != null">
+ #{sortCode, jdbcType=INTEGER},
</if>
<if test="enabled != null">
#{enabled, jdbcType=TINYINT},
@@ -318,9 +318,9 @@
SET date_created = #{dateCreated, jdbcType=TIMESTAMP},
date_updated = #{dateUpdated, jdbcType=TIMESTAMP},
selector_id = #{selectorId, jdbcType=VARCHAR},
- name = #{name, jdbcType=VARCHAR},
+ rule_name = #{ruleName, jdbcType=VARCHAR},
match_mode = #{matchMode, jdbcType=INTEGER},
- sort = #{sort, jdbcType=INTEGER},
+ sort_code = #{sortCode, jdbcType=INTEGER},
enabled = #{enabled, jdbcType=TINYINT},
loged = #{loged, jdbcType=TINYINT},
match_restful = #{matchRestful, jdbcType=TINYINT},
@@ -340,14 +340,14 @@
<if test="selectorId != null">
selector_id = #{selectorId, jdbcType=VARCHAR},
</if>
- <if test="name != null">
- name = #{name, jdbcType=VARCHAR},
+ <if test="ruleName != null">
+ rule_name = #{ruleName, jdbcType=VARCHAR},
</if>
<if test="matchMode != null">
match_mode = #{matchMode, jdbcType=INTEGER},
</if>
- <if test="sort != null">
- sort = #{sort, jdbcType=INTEGER},
+ <if test="sortCode != null">
+ sort_code = #{sortCode, jdbcType=INTEGER},
</if>
<if test="enabled != null">
enabled = #{enabled, jdbcType=TINYINT},
diff --git a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
index 5bd7575052..b494f590fe 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -92,12 +92,12 @@ CREATE TABLE IF NOT EXISTS `rule` (
`id` varchar(128) NOT NULL COMMENT 'primary key id' PRIMARY KEY,
`selector_id` varchar(128) NOT NULL COMMENT 'selector id',
`match_mode` int(2) NOT NULL COMMENT 'matching mode (0 and 1 or)',
- `name` varchar(128) NOT NULL COMMENT 'rule name',
+ `rule_name` varchar(128) NOT NULL COMMENT 'rule name',
`enabled` tinyint(4) NOT NULL COMMENT 'whether to open',
`loged` tinyint(4) NOT NULL COMMENT 'whether to log or not',
`match_restful` tinyint(4) NOT NULL COMMENT 'whether to match restful(0
cache, 1 not cache)',
`namespace_id` varchar(50) NOT NULL COMMENT 'namespace id',
- `sort` int(4) NOT NULL COMMENT 'sort',
+ `sort_code` int(4) NOT NULL COMMENT 'sort',
`handle` varchar(1024) DEFAULT NULL COMMENT 'processing logic (here for
different plug-ins, there will be different fields to identify different
processes, all data in JSON format is stored)',
`date_created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create
time',
`date_updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP COMMENT 'update time'
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
index 09e4cc0801..2a2938d359 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/RuleMapperTest.java
@@ -88,7 +88,7 @@ public final class RuleMapperTest extends
AbstractSpringIntegrationTest {
int insert = ruleMapper.insert(ruleDO);
assertThat(insert, equalTo(1));
- RuleDO findByName = ruleMapper.findByName(ruleDO.getName());
+ RuleDO findByName = ruleMapper.findByName(ruleDO.getRuleName());
assertThat(ruleDO, equalTo(findByName));
int delete = ruleMapper.delete(ruleDO.getId());
@@ -195,14 +195,14 @@ public final class RuleMapperTest extends
AbstractSpringIntegrationTest {
String id = UUIDUtils.getInstance().generateShortUuid();
return RuleDO.builder()
.id(id)
- .name("test-name-" + new Random().nextInt())
+ .ruleName("test-name-" + new Random().nextInt())
.enabled(true)
.handle("test-handle")
.loged(true)
.matchMode(1)
.selectorId("test-selector-1")
.matchRestful(false)
- .sort(1)
+ .sortCode(1)
.dateCreated(now)
.dateUpdated(now)
.namespaceId(SYS_DEFAULT_NAMESPACE_ID)
