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 89bbacd7de feat: adaptor other db for tag and appAuth (#6152)
89bbacd7de is described below
commit 89bbacd7de72f0bb4df0c032910ecab79ac6bd41
Author: shown <[email protected]>
AuthorDate: Mon Sep 15 14:35:09 2025 +0800
feat: adaptor other db for tag and appAuth (#6152)
* feat: adaptor other db for tag and appAuth
Signed-off-by: yuluo-yx <[email protected]>
* fix
Signed-off-by: yuluo-yx <[email protected]>
* fix
Signed-off-by: yuluo-yx <[email protected]>
* fix
Signed-off-by: yuluo-yx <[email protected]>
* fix
Signed-off-by: yuluo-yx <[email protected]>
* fix
Signed-off-by: yuluo-yx <[email protected]>
---------
Signed-off-by: yuluo-yx <[email protected]>
Co-authored-by: aias00 <[email protected]>
---
db/init/mysql/schema.sql | 2 +-
db/init/ob/schema.sql | 2 +-
db/init/og/create-table.sql | 2 +-
db/init/oracle/schema.sql | 2 +-
db/init/pg/create-table.sql | 2 +-
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 1 +
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 3 +-
db/upgrade/2.7.0-upgrade-2.7.1-og.sql | 1 +
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 3 +-
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 3 +-
.../apache/shenyu/admin/mapper/AppAuthMapper.java | 3 +-
.../org/apache/shenyu/admin/model/dto/TagDTO.java | 17 +++++----
.../apache/shenyu/admin/model/entity/TagDO.java | 43 +++++++++++-----------
.../model/event/role/BatchRoleDeletedEvent.java | 2 -
.../admin/model/event/role/RoleChangedEvent.java | 1 -
.../admin/model/event/role/RoleCreatedEvent.java | 3 +-
.../apache/shenyu/admin/model/query/TagQuery.java | 16 ++++----
.../org/apache/shenyu/admin/model/vo/TagVO.java | 21 ++++++-----
.../admin/service/impl/AppAuthServiceImpl.java | 3 +-
.../admin/service/impl/SelectorServiceImpl.java | 7 ++++
.../shenyu/admin/service/impl/TagServiceImpl.java | 23 ++++++------
.../AbstractShenyuClientRegisterServiceImpl.java | 2 +
.../FallbackShenyuClientRegisterService.java | 1 -
.../src/main/resources/mappers/tag-sqlmap.xml | 26 ++++++-------
.../src/main/resources/sql-script/h2/schema.sql | 2 +-
.../shenyu/admin/controller/TagControllerTest.java | 9 +++--
.../apache/shenyu/admin/mapper/TagMapperTest.java | 15 ++++----
.../shenyu/admin/service/TagServiceTest.java | 17 +++++----
.../shenyu/common/timer/AbstractRetryTask.java | 4 +-
29 files changed, 126 insertions(+), 110 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 6952137b5c..b9e215ab35 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -2318,7 +2318,7 @@ DROP TABLE IF EXISTS `tag`;
CREATE TABLE `tag`
(
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
- `name` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
+ `tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
`tag_desc` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'tag description',
`parent_tag_id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'parent tag_id',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extension info',
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 7f4601dc09..65b03ac012 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -2233,7 +2233,7 @@ DROP TABLE IF EXISTS `tag`;
CREATE TABLE `tag`
(
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
- `name` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
+ `tag_name` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'tag name',
`tag_desc` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'tag description',
`parent_tag_id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'parent tag_id',
`ext` varchar(1024) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'extension info',
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index 9c2ea23a63..6a050ef959 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -2345,7 +2345,7 @@ ALTER TABLE "public"."shenyu_dict" ADD CONSTRAINT
"shenyu_dict_pkey" PRIMARY KEY
DROP TABLE IF EXISTS "public"."tag";
CREATE TABLE "public"."tag" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
+ "tag_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"tag_desc" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"parent_tag_id" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default",
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index aec581a2b5..a9fed158bb 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -2455,7 +2455,7 @@ INSERT /*+ IGNORE_ROW_ON_DUPKEY_INDEX (permission(id)) */
INTO permission (id, o
create table tag
(
id VARCHAR2(128) not null,
- name VARCHAR2(255) not null,
+ tag_name VARCHAR2(255) not null,
tag_desc VARCHAR2(255) not null,
parent_tag_id VARCHAR2(128) not null,
ext VARCHAR2(1024) not null,
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index 68aafb8c8d..e5567d6849 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -2472,7 +2472,7 @@ ALTER TABLE "public"."shenyu_dict" ADD CONSTRAINT
"shenyu_dict_pkey" PRIMARY KEY
DROP TABLE IF EXISTS "public"."tag";
CREATE TABLE "public"."tag" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
+ "ta_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"tag_desc" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"parent_tag_id" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"ext" varchar(1024) COLLATE "pg_catalog"."default" NOT NULL,
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 cd237d6992..14f6887c6e 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,5 +270,6 @@ 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 `tag` CHANGE COLUMN `name` `tag_name` varchar(128) CHARACTER SET
utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag 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 e3a6c4004c..f372ccbb75 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
@@ -263,5 +263,6 @@ 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 `tag` CHANGE COLUMN `name` `tag_name` varchar(128) CHARACTER SET
utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'tag 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
+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-og.sql
b/db/upgrade/2.7.0-upgrade-2.7.1-og.sql
index 161f12a695..0e6cddb81f 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,5 +287,6 @@ 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"."tag" RENAME COLUMN "name" TO "tag_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 ed36458f30..91e74a515c 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
@@ -577,5 +577,6 @@ 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";
+ALTER TABLE tag RENAME COLUMN "name" TO "tag_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
+ALTER TABLE rule RENAME COLUMN "name" TO "rule_name";
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 3a8572ee4a..fee3028b93 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
@@ -285,5 +285,6 @@ 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"."tag" RENAME COLUMN "name" TO "tag_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
+ALTER TABLE "public"."rule" RENAME COLUMN "name" TO "rule_name";
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/AppAuthMapper.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/AppAuthMapper.java
index 71247dc48a..5034a735ee 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/AppAuthMapper.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/AppAuthMapper.java
@@ -21,7 +21,6 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.shenyu.admin.model.entity.AppAuthDO;
import org.apache.shenyu.admin.model.query.AppAuthQuery;
-import org.apache.shenyu.admin.model.vo.AppAuthVO;
import org.apache.shenyu.admin.validation.ExistProvider;
import java.io.Serializable;
@@ -195,7 +194,7 @@ public interface AppAuthMapper extends ExistProvider {
* @param condition condition.
* @return list
*/
- List<AppAuthVO> selectByCondition(@Param("condition") AppAuthQuery
condition);
+ List<AppAuthDO> selectByCondition(@Param("condition") AppAuthQuery
condition);
/**
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/TagDTO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/TagDTO.java
index fe7abaab5a..25bb6165d1 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/TagDTO.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/dto/TagDTO.java
@@ -17,10 +17,11 @@
package org.apache.shenyu.admin.model.dto;
-import java.io.Serializable;
import org.apache.shenyu.admin.mapper.TagMapper;
import org.apache.shenyu.admin.validation.annotation.Existed;
+import java.io.Serializable;
+
/**
* this tag from web front.
*/
@@ -37,7 +38,7 @@ public class TagDTO implements Serializable {
/**
* name.
*/
- private String name;
+ private String tagName;
/**
* tagDesc.
@@ -55,7 +56,7 @@ public class TagDTO implements Serializable {
public TagDTO(final String id, final String name, final String tagDesc,
final String parentTagId, final String ext) {
this.id = id;
- this.name = name;
+ this.tagName = name;
this.tagDesc = tagDesc;
this.parentTagId = parentTagId;
}
@@ -82,16 +83,16 @@ public class TagDTO implements Serializable {
*
* @return getName
*/
- public String getName() {
- return name;
+ public String getTagName() {
+ return tagName;
}
/**
* set name.
- * @param name name
+ * @param tagName name
*/
- public void setName(final String name) {
- this.name = name;
+ public void setName(final String tagName) {
+ this.tagName = tagName;
}
/**
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/TagDO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/TagDO.java
index 3c20d13e82..b1a040134c 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/TagDO.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/TagDO.java
@@ -17,13 +17,14 @@
package org.apache.shenyu.admin.model.entity;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shenyu.admin.model.dto.TagDTO;
+import org.apache.shenyu.common.utils.UUIDUtils;
+
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.Objects;
import java.util.Optional;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shenyu.admin.model.dto.TagDTO;
-import org.apache.shenyu.common.utils.UUIDUtils;
public final class TagDO extends BaseDO {
@@ -32,7 +33,7 @@ public final class TagDO extends BaseDO {
/**
* name.
*/
- private String name;
+ private String tagName;
/**
* tagDesc.
@@ -54,8 +55,8 @@ public final class TagDO extends BaseDO {
*
* @return name
*/
- public String getName() {
- return name;
+ public String getTagName() {
+ return tagName;
}
/**
@@ -64,7 +65,7 @@ public final class TagDO extends BaseDO {
* @param name name
*/
public void setName(final String name) {
- this.name = name;
+ this.tagName = name;
}
/**
@@ -142,7 +143,7 @@ public final class TagDO extends BaseDO {
return false;
}
TagDO tagDO = (TagDO) o;
- return Objects.equals(name, tagDO.name)
+ return Objects.equals(tagName, tagDO.tagName)
&& Objects.equals(tagDesc, tagDO.tagDesc)
&& Objects.equals(ext, tagDO.ext)
&& Objects.equals(parentTagId, tagDO.parentTagId);
@@ -160,7 +161,7 @@ public final class TagDO extends BaseDO {
TagDO tagDO = TagDO.builder()
.parentTagId(tagDTO.getParentTagId())
.tagDesc(tagDTO.getTagDesc())
- .name(tagDTO.getName())
+ .tagName(tagDTO.getTagName())
.dateUpdated(currentTime)
.build();
if (StringUtils.isEmpty(item.getId())) {
@@ -177,14 +178,14 @@ public final class TagDO extends BaseDO {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), name, tagDesc, ext, parentTagId);
+ return Objects.hash(super.hashCode(), tagName, tagDesc, ext,
parentTagId);
}
public static final class TagDOBuilder {
private String id;
- private String name;
+ private String tagName;
private String tagDesc;
@@ -268,11 +269,11 @@ public final class TagDO extends BaseDO {
/**
* name.
*
- * @param name name
+ * @param tagName name
* @return TagDOBuilder.
*/
- public TagDO.TagDOBuilder name(final String name) {
- this.name = name;
+ public TagDO.TagDOBuilder tagName(final String tagName) {
+ this.tagName = tagName;
return this;
}
@@ -285,7 +286,7 @@ public final class TagDO extends BaseDO {
TagDO tagDO = new TagDO();
tagDO.setTagDesc(tagDesc);
tagDO.setParentTagId(parentTagId);
- tagDO.setName(name);
+ tagDO.setName(tagName);
tagDO.setId(id);
tagDO.setExt(ext);
tagDO.setDateCreated(dateCreated);
@@ -309,7 +310,7 @@ public final class TagDO extends BaseDO {
/**
* name.
*/
- private String name;
+ private String tagName;
/**
* parent.
@@ -367,19 +368,19 @@ public final class TagDO extends BaseDO {
/**
* get name.
*
- * @return name
+ * @return tagName tagName
*/
public String getName() {
- return name;
+ return tagName;
}
/**
* set name.
*
- * @param name name
+ * @param tagName name
*/
- public void setName(final String name) {
- this.name = name;
+ public void setName(final String tagName) {
+ this.tagName = tagName;
}
/**
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/BatchRoleDeletedEvent.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/BatchRoleDeletedEvent.java
index 069c536438..b8f6854938 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/BatchRoleDeletedEvent.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/BatchRoleDeletedEvent.java
@@ -67,8 +67,6 @@ public class BatchRoleDeletedEvent extends BatchChangedEvent {
.collect(Collectors.toList());
}
-
-
/**
* get deleted ids.
*
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleChangedEvent.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleChangedEvent.java
index f20afc7520..c7caf6ea1a 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleChangedEvent.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleChangedEvent.java
@@ -30,7 +30,6 @@ import java.util.Objects;
*/
public class RoleChangedEvent extends AdminDataModelChangedEvent {
-
/**
* Create a new {@code RoleChangedEvent}.operator is unknown.
*
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleCreatedEvent.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleCreatedEvent.java
index a5ed2727be..47a2d4b291 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleCreatedEvent.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/event/role/RoleCreatedEvent.java
@@ -24,8 +24,7 @@ import org.apache.shenyu.admin.model.enums.EventTypeEnum;
* RuleCreatedEvent.
*/
public class RoleCreatedEvent extends RoleChangedEvent {
-
-
+
/**
* Create a new {@code RoleCreatedEvent}.operator is unknown.
*
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/query/TagQuery.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/query/TagQuery.java
index 535691c7c2..eb12c9b5a0 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/query/TagQuery.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/query/TagQuery.java
@@ -27,7 +27,7 @@ public class TagQuery {
/**
* name.
*/
- private String name;
+ private String tagName;
/**
* parentTagId.
@@ -54,16 +54,16 @@ public class TagQuery {
* get name.
* @return name
*/
- public String getName() {
- return name;
+ public String getTagName() {
+ return tagName;
}
/**
* set name.
- * @param name name
+ * @param tagName name
*/
- public void setName(final String name) {
- this.name = name;
+ public void setTagName(final String tagName) {
+ this.tagName = tagName;
}
@Override
@@ -75,13 +75,13 @@ public class TagQuery {
return false;
}
TagQuery that = (TagQuery) o;
- return Objects.equals(name, that.name)
+ return Objects.equals(tagName, that.tagName)
&& Objects.equals(parentTagId, that.parentTagId);
}
@Override
public int hashCode() {
- return Objects.hash(name, parentTagId);
+ return Objects.hash(tagName, parentTagId);
}
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/TagVO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/TagVO.java
index 2e26c2dc3f..e58f548678 100644
--- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/TagVO.java
+++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/TagVO.java
@@ -17,10 +17,11 @@
package org.apache.shenyu.admin.model.vo;
-import java.io.Serializable;
import org.apache.shenyu.admin.model.entity.TagDO;
import org.apache.shenyu.common.utils.DateUtils;
+import java.io.Serializable;
+
/**
* this is tag view to web front.
*/
@@ -36,7 +37,7 @@ public class TagVO implements Serializable {
/**
* name.
*/
- private String name;
+ private String tagName;
/**
* tagDesc.
@@ -72,14 +73,14 @@ public class TagVO implements Serializable {
}
public TagVO(final String id,
- final String name,
+ final String tagName,
final String tagDesc,
final String parentTagId,
final String ext,
final String dateCreated,
final String dateUpdated) {
this.id = id;
- this.name = name;
+ this.tagName = tagName;
this.tagDesc = tagDesc;
this.parentTagId = parentTagId;
this.ext = ext;
@@ -107,16 +108,16 @@ public class TagVO implements Serializable {
* get name.
* @return name
*/
- public String getName() {
- return name;
+ public String getTagName() {
+ return tagName;
}
/**
* set name.
- * @param name name
+ * @param tagName name
*/
- public void setName(final String name) {
- this.name = name;
+ public void setTagName(final String tagName) {
+ this.tagName = tagName;
}
/**
@@ -237,7 +238,7 @@ public class TagVO implements Serializable {
* @return tagVO
*/
public static TagVO buildTagVO(final TagDO tagDO) {
- return new TagVO(tagDO.getId(), tagDO.getName(), tagDO.getTagDesc(),
tagDO.getParentTagId(), tagDO.getExt(),
+ return new TagVO(tagDO.getId(), tagDO.getTagName(),
tagDO.getTagDesc(), tagDO.getParentTagId(), tagDO.getExt(),
DateUtils.localDateTimeToString(tagDO.getDateCreated().toLocalDateTime()),
DateUtils.localDateTimeToString(tagDO.getDateUpdated().toLocalDateTime()));
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/AppAuthServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/AppAuthServiceImpl.java
index bfdb125268..500fcc5c5f 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/AppAuthServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/AppAuthServiceImpl.java
@@ -96,7 +96,8 @@ public class AppAuthServiceImpl implements AppAuthService {
@Override
public List<AppAuthVO> searchByCondition(final AppAuthQuery condition) {
- return appAuthMapper.selectByCondition(condition);
+ final List<AppAuthDO> appAuthDOS =
appAuthMapper.selectByCondition(condition);
+ return
appAuthDOS.stream().map(AppAuthTransfer.INSTANCE::mapToVO).toList();
}
@Override
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
index 84027f7cab..db4422515d 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/SelectorServiceImpl.java
@@ -76,6 +76,8 @@ import org.apache.shenyu.common.utils.JsonUtils;
import org.apache.shenyu.common.utils.ListUtil;
import org.apache.shenyu.common.utils.UUIDUtils;
import org.apache.shenyu.register.common.dto.MetaDataRegisterDTO;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Service;
@@ -100,6 +102,8 @@ import static
org.apache.shenyu.common.constant.Constants.SYS_DEFAULT_NAMESPACE_
@Service
public class SelectorServiceImpl implements SelectorService {
+ private static final Logger LOG =
LoggerFactory.getLogger(SelectorServiceImpl.class);
+
private final SelectorMapper selectorMapper;
private final SelectorConditionMapper selectorConditionMapper;
@@ -358,7 +362,10 @@ public class SelectorServiceImpl implements
SelectorService {
*/
@Override
public SelectorDO findByNameAndPluginNameAndNamespaceId(final String name,
final String pluginName, final String namespaceId) {
+
PluginDO pluginDO = pluginMapper.selectByName(pluginName);
+ LOG.info("pluginDO info: {}.", pluginDO);
+
return selectorMapper.findByNameAndPluginIdAndNamespaceId(name,
pluginDO.getId(), namespaceId);
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/TagServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/TagServiceImpl.java
index 7a3bbbfbeb..98b8480398 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/TagServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/TagServiceImpl.java
@@ -18,14 +18,6 @@
package org.apache.shenyu.admin.service.impl;
import com.google.common.collect.Lists;
-import java.sql.Timestamp;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
-import java.util.stream.Collectors;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shenyu.admin.mapper.TagMapper;
@@ -40,6 +32,15 @@ import org.apache.shenyu.common.constant.AdminConstants;
import org.apache.shenyu.common.utils.GsonUtils;
import org.springframework.stereotype.Service;
+import java.sql.Timestamp;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
/**
* Implementation of the {@link org.apache.shenyu.admin.service.TagService}.
*/
@@ -120,7 +121,7 @@ public class TagServiceImpl implements TagService {
@Override
public List<TagVO> findByQuery(final String tagName, final String
parentTagId) {
TagQuery tagQuery = new TagQuery();
- tagQuery.setName(tagName);
+ tagQuery.setTagName(tagName);
tagQuery.setParentTagId(parentTagId);
List<TagDO> tagDOS =
Optional.ofNullable(tagMapper.selectByQuery(tagQuery)).orElse(Lists.newArrayList());
return
tagDOS.stream().map(TagVO::buildTagVO).collect(Collectors.toList());
@@ -203,7 +204,7 @@ public class TagServiceImpl implements TagService {
final TagDO.TagExt parent = new TagDO.TagExt();
TagDO.TagExt tagExt = new TagDO.TagExt();
tagExt.setDesc(parentTagDO.getTagDesc());
- tagExt.setName(parentTagDO.getName());
+ tagExt.setName(parentTagDO.getTagName());
tagExt.setId(parentTagDO.getId());
tagExt.setRefreshTime(parent.getRefreshTime());
tagExt.setApiDocMd5(parent.getApiDocMd5());
@@ -213,7 +214,7 @@ public class TagServiceImpl implements TagService {
TagDO.TagExt parentTagExt =
Optional.ofNullable(GsonUtils.getInstance().fromJson(parentTagDO.getExt(),
TagDO.TagExt.class)).orElse(new TagDO.TagExt());
final TagDO.TagExt tagExt = new TagDO.TagExt();
parentTagExt.setDesc(parentTagDO.getTagDesc());
- parentTagExt.setName(parentTagDO.getName());
+ parentTagExt.setName(parentTagDO.getTagName());
parentTagExt.setId(parentTagDO.getId());
tagExt.setParent(parentTagExt);
ext = GsonUtils.getInstance().toJson(tagExt);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
index cda2bbbc18..9a5baf41d7 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/AbstractShenyuClientRegisterServiceImpl.java
@@ -192,6 +192,8 @@ public abstract class
AbstractShenyuClientRegisterServiceImpl extends FallbackSh
}
String pluginName = PluginNameAdapter.rpcTypeAdapter(rpcType());
SelectorDO selectorDO =
selectorService.findByNameAndPluginNameAndNamespaceId(selectorName, pluginName,
namespaceId);
+ LOG.info("selector info params: selectorName: {}, pluginName: {},
namespaceId: {}, selectorDO info: {}.",
+ selectorName, pluginName, namespaceId, selectorDO);
if (Objects.isNull(selectorDO)) {
throw new ShenyuException("doRegister Failed to execute, because
selectorDO object is null, wait to retry.");
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java
index 1ff2cc6e5b..1e5046f6ce 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/register/FallbackShenyuClientRegisterService.java
@@ -198,7 +198,6 @@ public abstract class FallbackShenyuClientRegisterService
implements ShenyuClien
protected void doRetry(final String key, final TimerTask timerTask) {
registerService.recover(key);
registerService.removeFallBack(key);
-
}
}
}
diff --git a/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
index f809e64a10..3db339dc89 100644
--- a/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
@@ -22,7 +22,7 @@
<id column="id" jdbcType="VARCHAR" property="id"/>
<result column="date_created" jdbcType="TIMESTAMP"
property="dateCreated"/>
<result column="date_updated" jdbcType="TIMESTAMP"
property="dateUpdated"/>
- <result column="name" jdbcType="VARCHAR" property="name"/>
+ <result column="tag_name" jdbcType="VARCHAR" property="tagName"/>
<result column="tag_desc" jdbcType="VARCHAR" property="tagDesc"/>
<result column="parent_tag_id" jdbcType="VARCHAR"
property="parentTagId"/>
<result column="ext" jdbcType="VARCHAR" property="ext"/>
@@ -32,7 +32,7 @@
id,
date_created,
date_updated,
- name,
+ tag_name,
tag_desc,
parent_tag_id,
ext
@@ -58,8 +58,8 @@
<include refid="Base_Column_List"/>
FROM tag
<where>
- <if test="name != null">
- name = #{name, jdbcType=VARCHAR}
+ <if test="tagName != null">
+ tag_name = #{tagName, jdbcType=VARCHAR}
</if>
<if test="parentTagId != null">
and parent_tag_id = #{parentTagId, jdbcType=VARCHAR}
@@ -82,7 +82,7 @@
(id,
date_created,
date_updated,
- name,
+ tag_name,
tag_desc,
parent_tag_id,
ext)
@@ -90,7 +90,7 @@
(#{id, jdbcType=VARCHAR},
#{dateCreated, jdbcType=TIMESTAMP},
#{dateUpdated, jdbcType=TIMESTAMP},
- #{name, jdbcType=VARCHAR},
+ #{tagName, jdbcType=VARCHAR},
#{tagDesc, jdbcType=VARCHAR},
#{parentTagId, jdbcType=VARCHAR},
#{ext, jdbcType=VARCHAR})
@@ -106,8 +106,8 @@
<if test="dateUpdated != null">
date_updated,
</if>
- <if test="name != null">
- name,
+ <if test="tagName != null">
+ tag_name,
</if>
<if test="tagDesc != null">
tag_desc,
@@ -127,8 +127,8 @@
<if test="dateUpdated != null">
#{dateUpdated, jdbcType=TIMESTAMP},
</if>
- <if test="name != null">
- #{name, jdbcType=VARCHAR},
+ <if test="tagName != null">
+ #{tag_name, jdbcType=VARCHAR},
</if>
<if test="tagDesc != null">
#{tagDesc, jdbcType=VARCHAR},
@@ -151,8 +151,8 @@
<if test="dateUpdated != null">
date_updated = #{dateUpdated, jdbcType=TIMESTAMP},
</if>
- <if test="name != null">
- name = #{name, jdbcType=VARCHAR},
+ <if test="tagName != null">
+ tag_name = #{tagName, jdbcType=VARCHAR},
</if>
<if test="tagDesc != null">
tag_desc = #{tagDesc, jdbcType=VARCHAR},
@@ -170,7 +170,7 @@
<update id="updateByPrimaryKey"
parameterType="org.apache.shenyu.admin.model.entity.TagDO">
update tag
set
- name = #{name,jdbcType=VARCHAR},
+ tag_name = #{tagName,jdbcType=VARCHAR},
tag_desc = #{tagDesc,jdbcType=VARCHAR},
parent_tag_id = #{parentTagId,jdbcType=VARCHAR},
ext = #{ext,jdbcType=VARCHAR},
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 b494f590fe..6ef6385d17 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -1156,7 +1156,7 @@ INSERT IGNORE INTO `permission` (`id`, `object_id`,
`resource_id`) VALUES ('1697
CREATE TABLE IF NOT EXISTS `tag`
(
`id` varchar(128) NOT NULL COMMENT 'primary key id',
- `name` varchar(128) NOT NULL COMMENT 'tag name',
+ `tag_name` varchar(128) NOT NULL COMMENT 'tag name',
`tag_desc` varchar(128) NOT NULL COMMENT 'tag description',
`parent_tag_id` varchar(128) NOT NULL COMMENT 'parent tag_id',
`ext` varchar(1024) NOT NULL COMMENT 'extension info',
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/TagControllerTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/TagControllerTest.java
index 2691be6f78..1171618bed 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/TagControllerTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/controller/TagControllerTest.java
@@ -17,9 +17,6 @@
package org.apache.shenyu.admin.controller;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
import org.apache.shenyu.admin.exception.ExceptionHandlers;
import org.apache.shenyu.admin.model.dto.TagDTO;
import org.apache.shenyu.admin.model.vo.TagVO;
@@ -39,6 +36,10 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
import static org.hamcrest.core.Is.is;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.BDDMockito.given;
@@ -168,7 +169,7 @@ public final class TagControllerTest {
public TagVO buildTagVO() {
TagVO tagVO = new TagVO();
tagVO.setTagDesc("123");
- tagVO.setName("test tag");
+ tagVO.setTagName("test tag");
tagVO.setDateCreated(new Date().toString());
tagVO.setDateUpdated(new Date().toString());
return tagVO;
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/TagMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/TagMapperTest.java
index a6489f38c6..7df99c045f 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/TagMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/TagMapperTest.java
@@ -18,11 +18,6 @@
package org.apache.shenyu.admin.mapper;
import com.google.common.collect.Lists;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
import jakarta.annotation.Resource;
import org.apache.shenyu.admin.AbstractSpringIntegrationTest;
import org.apache.shenyu.admin.model.entity.TagDO;
@@ -30,6 +25,12 @@ import org.apache.shenyu.admin.model.query.TagQuery;
import org.apache.shenyu.common.utils.UUIDUtils;
import org.junit.jupiter.api.Test;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
@@ -102,7 +103,7 @@ public final class TagMapperTest extends
AbstractSpringIntegrationTest {
int count = tagMapper.insertSelective(record);
assertEquals(count, 1);
TagQuery tagQuery = new TagQuery();
- tagQuery.setName("111");
+ tagQuery.setTagName("111");
List<TagDO> tagDOList = tagMapper.selectByQuery(tagQuery);
assertEquals(tagDOList.size(), 1);
int delete = tagMapper.deleteByPrimaryKey(record.getId());
@@ -156,7 +157,7 @@ public final class TagMapperTest extends
AbstractSpringIntegrationTest {
String id = UUIDUtils.getInstance().generateShortUuid();
return TagDO.builder()
.id(id)
- .name("111")
+ .tagName("111")
.tagDesc("test")
.ext("11")
.parentTagId("0")
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/TagServiceTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/TagServiceTest.java
index 5a8fcad26d..7e5c7f9bbe 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/TagServiceTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/TagServiceTest.java
@@ -18,10 +18,6 @@
package org.apache.shenyu.admin.service;
import com.google.common.collect.Lists;
-import java.sql.Timestamp;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.shenyu.admin.mapper.TagMapper;
import org.apache.shenyu.admin.model.dto.TagDTO;
import org.apache.shenyu.admin.model.entity.TagDO;
@@ -35,6 +31,11 @@ import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
@@ -149,7 +150,7 @@ public class TagServiceTest {
private TagDO buildTagDO() {
Timestamp now = Timestamp.valueOf(LocalDateTime.now());
TagDO tagDO = TagDO.builder()
- .name("film")
+ .tagName("film")
.tagDesc("this is a pic tag")
.parentTagId("0")
.id("123")
@@ -162,7 +163,7 @@ public class TagServiceTest {
private TagDO buildParentTagDO() {
Timestamp now = Timestamp.valueOf(LocalDateTime.now());
TagDO tagDO = TagDO.builder()
- .name("film")
+ .tagName("film")
.tagDesc("this is a pic tag")
.parentTagId("123")
.id("456")
@@ -175,7 +176,7 @@ public class TagServiceTest {
private TagDO buildParentTagDO1() {
Timestamp now = Timestamp.valueOf(LocalDateTime.now());
TagDO tagDO = TagDO.builder()
- .name("film")
+ .tagName("film")
.tagDesc("this is a pic tag789")
.parentTagId("456")
.id("789")
@@ -188,7 +189,7 @@ public class TagServiceTest {
private TagDO buildParentTagDO2() {
Timestamp now = Timestamp.valueOf(LocalDateTime.now());
TagDO tagDO = TagDO.builder()
- .name("film")
+ .tagName("film")
.tagDesc("this is a pic tag789")
.parentTagId("789")
.id("101112")
diff --git
a/shenyu-common/src/main/java/org/apache/shenyu/common/timer/AbstractRetryTask.java
b/shenyu-common/src/main/java/org/apache/shenyu/common/timer/AbstractRetryTask.java
index 97842c924b..bfba49b040 100644
---
a/shenyu-common/src/main/java/org/apache/shenyu/common/timer/AbstractRetryTask.java
+++
b/shenyu-common/src/main/java/org/apache/shenyu/common/timer/AbstractRetryTask.java
@@ -105,13 +105,13 @@ public abstract class AbstractRetryTask extends TimerTask
{
return;
}
if (!retryLimit && tickCount > retryCount) {
- logger.warn("Final failed to execute task, key:{},retried:{},task
over.", key, tickCount);
+ logger.warn("Final failed to execute task, key:{}, retried:{},
task over.", key, tickCount);
return;
}
try {
this.doRetry(key, taskEntity.getTimerTask());
} catch (Throwable ex) {
- logger.warn("Failed to execute task:{},retried：{} ,total
retries:{},cause:{}", key, tickCount, retryCount, ex.getMessage());
+ logger.warn("Failed to execute task:{}, retried:{}, total
retries:{}, cause:{}", key, tickCount, retryCount, ex.getMessage());
this.again(taskEntity);
}
}
