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 8d0c4e9b75 feat: adapt other db for discovery sql fields (#6166)
8d0c4e9b75 is described below
commit 8d0c4e9b757bf9e0c0500f0fe22b54bb2478923c
Author: shown <[email protected]>
AuthorDate: Sat Sep 27 07:56:45 2025 +0800
feat: adapt other db for discovery sql fields (#6166)
---
db/init/mysql/schema.sql | 4 +-
db/init/ob/schema.sql | 6 +--
db/init/og/create-table.sql | 4 +-
db/init/oracle/schema.sql | 4 +-
db/init/pg/create-table.sql | 4 +-
db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 2 +
db/upgrade/2.7.0-upgrade-2.7.1-ob.sql | 2 +
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 | 2 +
.../discovery/AbstractDiscoveryProcessor.java | 4 +-
.../shenyu/admin/model/entity/DiscoveryDO.java | 57 +++++++++++-----------
.../apache/shenyu/admin/model/vo/DiscoveryVO.java | 35 +++++++------
.../admin/service/impl/DiscoveryServiceImpl.java | 26 +++++-----
.../service/impl/DiscoveryUpstreamServiceImpl.java | 2 +-
.../service/impl/ProxySelectorServiceImpl.java | 12 ++---
.../admin/service/impl/SelectorServiceImpl.java | 2 +-
.../shenyu/admin/transfer/DiscoveryTransfer.java | 8 +--
.../main/resources/mappers/discovery-sqlmap.xml | 50 +++++++++----------
.../src/main/resources/sql-script/h2/schema.sql | 4 +-
.../discovery/DefaultDiscoveryProcessorTest.java | 2 +-
.../service/DiscoveryUpstreamServiceTest.java | 4 +-
.../shenyu/admin/service/SelectorServiceTest.java | 2 +-
.../testcase/websocket/WebSocketPluginCases.java | 1 +
.../testcase/websocket/WebSocketPluginTest.java | 1 -
25 files changed, 129 insertions(+), 115 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 860e747ca9..c2b8cbc85d 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -2382,11 +2382,11 @@ DROP TABLE IF EXISTS `discovery`;
CREATE TABLE `discovery`
(
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
- `name` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
+ `discovery_name` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
`discovery_level` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT '0 selector,1 plugin 2 global',
`plugin_name` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci COMMENT 'the plugin name',
`namespace_id` varchar(50) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'namespace id',
- `type` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
+ `discovery_type` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
`server_list` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci COMMENT 'register server url (,)',
`props` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT
'the discovery pops (json) ',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 98b70f0209..0862529506 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -2308,11 +2308,11 @@ DROP TABLE IF EXISTS `discovery`;
CREATE TABLE `discovery`
(
`id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'primary key id',
- `name` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
- `discovery_level` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT '0 selector,1 plugin 2 global',
+ `discovery_name` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery name',
+ `discovery_level` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT '0 selector,1 plugin 2 global',
`plugin_name` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci COMMENT 'the plugin name',
`namespace_id` varchar(50) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'namespace id',
- `type` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
+ `discovery_type` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'local,zookeeper,etcd,consul,nacos',
`server_list` varchar(255) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci COMMENT 'register server url (,)',
`props` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT
'the discovery pops (json) ',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index ba7e5407af..0f35c1a36b 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -2416,10 +2416,10 @@ COMMENT ON COLUMN
"public"."tag_relation"."date_updated" IS 'update time';
DROP TABLE IF EXISTS "public"."discovery";
CREATE TABLE "public"."discovery" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
+ "discovery_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"discovery_level" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
"plugin_name" varchar(255) COLLATE "pg_catalog"."default",
- "type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
+ "discovery_type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
"server_list" varchar(255) COLLATE "pg_catalog"."default",
"props" text COLLATE "pg_catalog"."default",
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index fd597b56ea..32fedb7a76 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -2574,11 +2574,11 @@ comment on column TAG_RELATION.date_updated
create table discovery
(
id VARCHAR2(128) not null,
- name VARCHAR2(255) not null,
+ discovery_name VARCHAR2(255) not null,
discovery_level VARCHAR2(64) not null,
plugin_name VARCHAR2(255),
namespace_id VARCHAR2(50) not null,
- type VARCHAR2(64) not null,
+ discovery_type VARCHAR2(64) not null,
server_list VARCHAR2(255),
props CLOB,
date_created timestamp(3) default SYSDATE not null,
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index 296b55f037..4ae3172cf1 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -2540,11 +2540,11 @@ COMMENT ON COLUMN
"public"."tag_relation"."date_updated" IS 'update time';
DROP TABLE IF EXISTS "public"."discovery";
CREATE TABLE "public"."discovery" (
"id" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
+ "discovery_name" varchar(255) COLLATE "pg_catalog"."default" NOT NULL,
"discovery_level" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
"plugin_name" varchar(255) COLLATE "pg_catalog"."default",
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
- "type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
+ "discovery_type" varchar(64) COLLATE "pg_catalog"."default" NOT NULL,
"server_list" varchar(255) COLLATE "pg_catalog"."default",
"props" text COLLATE "pg_catalog"."default",
"date_created" timestamp(6) NOT NULL DEFAULT timezone('UTC-8'::text,
(now())::timestamp(0) without time zone),
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 ab48df7b17..3b9e2a99e1 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
@@ -291,6 +291,8 @@ ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name`
varchar(64) CHARACTE
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';
+ALTER TABLE `discovery` CHANGE COLUMN `name` `discovery_name` varchar(128)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'discovery
name';
+ALTER TABLE `discovery` CHANGE COLUMN `type` `discovery_type` varchar(128)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'discovery
name';
ALTER TABLE `discovery_upstream` CHANGE COLUMN `url` `upstream_url`
varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT
'ip:port';
ALTER TABLE `discovery_upstream` CHANGE COLUMN `status` `upstream_status`
int(0) NOT NULL COMMENT 'type (0, healthy, 1 unhealthy)';
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 5ab479222e..8c96fd55c9 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
@@ -286,6 +286,8 @@ ALTER TABLE `selector` CHANGE COLUMN `name` `selector_name`
varchar(64) CHARACTE
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';
+ALTER TABLE `discovery` CHANGE COLUMN `type` `discovery_type` int(0) NOT NULL
COMMENT 'discovery type';
+ALTER TABLE `discovery` CHANGE COLUMN `name` `discovery_name` varchar(128)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'discovery
name';
ALTER TABLE `discovery_upstream` CHANGE COLUMN `url` `upstream_url`
varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT
'ip:port';
ALTER TABLE `discovery_upstream` CHANGE COLUMN `status` `upstream_status`
int(0) NOT NULL COMMENT 'type (0, healthy, 1 unhealthy)';
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 3d2baafa38..9defc8c350 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
@@ -312,6 +312,8 @@ 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";
+ALTER TABLE "public"."discovery" RENAME COLUMN "type" TO "discovery_type";
+ALTER TABLE "public"."discovery" RENAME COLUMN "name" TO "discovery_name";
ALTER TABLE "public"."discovery_upstream" RENAME COLUMN "url" TO
"upstream_url";
ALTER TABLE "public"."discovery_upstream" RENAME COLUMN "status" TO
"upstream_status";
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 f6042eacd9..0d59b21efd 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
@@ -618,7 +618,9 @@ 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";
+ALTER TABLE discovery RENAME COLUMN "type" TO "discovery_type";
+ALTER TABLE discovery RENAME COLUMN "name" TO "discovery_name";
ALTER TABLE discovery_upstream RENAME COLUMN "url" TO "upstream_url";
ALTER TABLE discovery_upstream RENAME COLUMN "status" TO "upstream_status";
-ALTER TABLE discovery RENAME COLUMN "level" TO discovery_level;
\ No newline at end of file
+ALTER TABLE discovery RENAME COLUMN "level" TO discovery_level;
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 566d4ae4b0..a1949b578b 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
@@ -307,6 +307,8 @@ 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";
+ALTER TABLE "public"."discovery" RENAME COLUMN "type" TO "discovery_type";
+ALTER TABLE "public"."discovery" RENAME COLUMN "name" TO "discovery_name";
ALTER TABLE "public"."discovery_upstream" RENAME COLUMN "url" TO
"upstream_url";
ALTER TABLE "public"."discovery_upstream" RENAME COLUMN "status" TO
"upstream_status";
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java
index 0fded04b04..807da75826 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/AbstractDiscoveryProcessor.java
@@ -90,7 +90,7 @@ public abstract class AbstractDiscoveryProcessor implements
DiscoveryProcessor,
LOG.info("shenyu DiscoveryProcessor {} discovery has been init",
discoveryDO.getId());
return;
}
- String type = discoveryDO.getType();
+ String type = discoveryDO.getDiscoveryType();
String props = discoveryDO.getProps();
Properties properties = GsonUtils.getGson().fromJson(props,
Properties.class);
RegisterConfig discoveryConfig = new RegisterConfig();
@@ -117,7 +117,7 @@ public abstract class AbstractDiscoveryProcessor implements
DiscoveryProcessor,
}
if (discoveryServiceCache.values().stream().noneMatch(p ->
p.equals(shenyuDiscoveryService))) {
shenyuDiscoveryService.close();
- LOG.info("shenyu discovery shutdown [{}] discovery",
discoveryDO.getName());
+ LOG.info("shenyu discovery shutdown [{}] discovery",
discoveryDO.getDiscoveryName());
}
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryDO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryDO.java
index f88f140183..0f684b5ba7 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryDO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryDO.java
@@ -25,9 +25,9 @@ import java.util.Objects;
*/
public final class DiscoveryDO extends BaseDO {
- private String name;
+ private String discoveryName;
- private String type;
+ private String discoveryType;
private String discoveryLevel;
@@ -43,22 +43,23 @@ public final class DiscoveryDO extends BaseDO {
}
- public DiscoveryDO(final String name, final String type, final String
discoveryLevel, final String serverList,
+ public DiscoveryDO(final String discoveryName, final String discoveryType,
final String level, final String serverList,
final String pluginName, final String props) {
- this.name = name;
- this.type = type;
+ this.discoveryName = discoveryName;
+ this.discoveryType = discoveryType;
this.discoveryLevel = discoveryLevel;
this.serverList = serverList;
this.pluginName = pluginName;
this.props = props;
}
- public DiscoveryDO(final String id, final Timestamp dateCreated, final
Timestamp dateUpdated, final String name,
- final String type, final String discoveryLevel, final
String serverList, final String pluginName,
+ public DiscoveryDO(final String id, final Timestamp dateCreated, final
Timestamp dateUpdated, final String discoveryName,
+ final String discoveryType, final String
discoveryLevel, final String serverList, final String pluginName,
final String props) {
+
super(id, dateCreated, dateUpdated);
- this.name = name;
- this.type = type;
+ this.discoveryName = discoveryName;
+ this.discoveryType = discoveryType;
this.discoveryLevel = discoveryLevel;
this.serverList = serverList;
this.pluginName = pluginName;
@@ -70,8 +71,8 @@ public final class DiscoveryDO extends BaseDO {
*
* @return the name value
*/
- public String getName() {
- return name;
+ public String getDiscoveryName() {
+ return discoveryName;
}
/**
@@ -79,8 +80,8 @@ public final class DiscoveryDO extends BaseDO {
*
* @param name the name value
*/
- public void setName(final String name) {
- this.name = name;
+ public void setDiscoveryName(final String name) {
+ this.discoveryName = name;
}
/**
@@ -88,8 +89,8 @@ public final class DiscoveryDO extends BaseDO {
*
* @return the type value
*/
- public String getType() {
- return type;
+ public String getDiscoveryType() {
+ return discoveryType;
}
/**
@@ -97,8 +98,8 @@ public final class DiscoveryDO extends BaseDO {
*
* @param type the type value
*/
- public void setType(final String type) {
- this.type = type;
+ public void setDiscoveryType(final String type) {
+ this.discoveryType = type;
}
/**
@@ -212,8 +213,8 @@ public final class DiscoveryDO extends BaseDO {
return false;
}
DiscoveryDO discoveryDO = (DiscoveryDO) o;
- return Objects.equals(name, discoveryDO.name)
- && Objects.equals(type, discoveryDO.type)
+ return Objects.equals(discoveryName, discoveryDO.discoveryName)
+ && Objects.equals(discoveryType, discoveryDO.discoveryType)
&& Objects.equals(discoveryLevel, discoveryDO.discoveryLevel)
&& Objects.equals(serverList, discoveryDO.serverList)
&& Objects.equals(pluginName, discoveryDO.pluginName)
@@ -223,7 +224,7 @@ public final class DiscoveryDO extends BaseDO {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), name, type, discoveryLevel,
serverList, pluginName, props, namespaceId);
+ return Objects.hash(super.hashCode(), discoveryName, discoveryType,
discoveryLevel, serverList, pluginName, props, namespaceId);
}
public static final class DiscoveryDOBuilder {
@@ -234,9 +235,9 @@ public final class DiscoveryDO extends BaseDO {
private Timestamp dateUpdated;
- private String name;
+ private String discoveryName;
- private String type;
+ private String discoveryType;
private String discoveryLevel;
@@ -291,8 +292,8 @@ public final class DiscoveryDO extends BaseDO {
* @param name the type.
* @return DiscoveryDOBuilder.
*/
- public DiscoveryDOBuilder name(final String name) {
- this.name = name;
+ public DiscoveryDOBuilder discoveryName(final String name) {
+ this.discoveryName = name;
return this;
}
@@ -302,8 +303,8 @@ public final class DiscoveryDO extends BaseDO {
* @param type the type.
* @return DiscoveryDOBuilder.
*/
- public DiscoveryDOBuilder type(final String type) {
- this.type = type;
+ public DiscoveryDOBuilder discoveryType(final String type) {
+ this.discoveryType = type;
return this;
}
@@ -373,8 +374,8 @@ public final class DiscoveryDO extends BaseDO {
discoveryDO.setId(id);
discoveryDO.setDateCreated(dateCreated);
discoveryDO.setDateUpdated(dateUpdated);
- discoveryDO.setName(name);
- discoveryDO.setType(type);
+ discoveryDO.setDiscoveryName(discoveryName);
+ discoveryDO.setDiscoveryType(discoveryType);
discoveryDO.setDiscoveryLevel(discoveryLevel);
discoveryDO.setServerList(serverList);
discoveryDO.setPluginName(pluginName);
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DiscoveryVO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DiscoveryVO.java
index 7256d57f44..0378dcf4fc 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DiscoveryVO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/vo/DiscoveryVO.java
@@ -37,14 +37,14 @@ public class DiscoveryVO implements Serializable {
/**
* name.
*/
- @NotNull(message = "name not null")
- private String name;
+ @NotNull(message = "discovery name not null")
+ private String discoveryName;
/**
* discovery type.
*/
- @NotNull(message = "type not null")
- private String type;
+ @NotNull(message = "discovery type not null")
+ private String discoveryType;
/**
* handler.
@@ -110,8 +110,8 @@ public class DiscoveryVO implements Serializable {
*
* @return name
*/
- public String getName() {
- return name;
+ public String getDiscoveryName() {
+ return discoveryType;
}
/**
@@ -119,8 +119,8 @@ public class DiscoveryVO implements Serializable {
*
* @param name name
*/
- public void setName(final String name) {
- this.name = name;
+ public void setDiscoveryName(final String name) {
+ this.discoveryType = name;
}
/**
@@ -128,8 +128,8 @@ public class DiscoveryVO implements Serializable {
*
* @return type
*/
- public String getType() {
- return type;
+ public String getDiscoveryType() {
+ return discoveryType;
}
/**
@@ -137,8 +137,8 @@ public class DiscoveryVO implements Serializable {
*
* @param type type
*/
- public void setType(final String type) {
- this.type = type;
+ public void setDiscoveryType(final String type) {
+ this.discoveryType = type;
}
/**
@@ -273,9 +273,12 @@ public class DiscoveryVO implements Serializable {
}
DiscoveryVO that = (DiscoveryVO) o;
- return Objects.equals(id, that.id) && Objects.equals(name, that.name)
&& Objects.equals(type, that.type)
- && Objects.equals(level, that.level) &&
Objects.equals(serverList, that.serverList)
- && Objects.equals(pluginName, that.pluginName) &&
Objects.equals(props, that.props)
+ return Objects.equals(id, that.id) && Objects.equals(discoveryName,
that.discoveryName)
+ && Objects.equals(discoveryType, that.discoveryType)
+ && Objects.equals(level, that.level)
+ && Objects.equals(serverList, that.serverList)
+ && Objects.equals(pluginName, that.pluginName)
+ && Objects.equals(props, that.props)
&& Objects.equals(discoveryHandler, that.discoveryHandler)
&& Objects.equals(discoveryRel, that.discoveryRel)
&& Objects.equals(namespaceId, that.namespaceId);
@@ -283,6 +286,6 @@ public class DiscoveryVO implements Serializable {
@Override
public int hashCode() {
- return Objects.hash(id, name, type, level, serverList, pluginName,
props, discoveryHandler, discoveryRel, namespaceId);
+ return Objects.hash(id, discoveryName, discoveryType, level,
serverList, pluginName, props, discoveryHandler, discoveryRel, namespaceId);
}
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
index dc4264aab6..af1d4b2c11 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryServiceImpl.java
@@ -153,10 +153,10 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
discoveryDO = DiscoveryDO.builder()
.id(UUIDUtils.getInstance().generateShortUuid())
- .name(discoveryConfigRegisterDTO.getName())
+ .discoveryName(discoveryConfigRegisterDTO.getName())
.pluginName(discoveryConfigRegisterDTO.getPluginName())
+
.discoveryType(discoveryConfigRegisterDTO.getDiscoveryType())
.discoveryLevel(DiscoveryLevel.PLUGIN.getCode())
- .type(discoveryConfigRegisterDTO.getDiscoveryType())
.serverList(discoveryConfigRegisterDTO.getServerList())
.props(GsonUtils.getInstance().toJson(Optional.ofNullable(discoveryConfigRegisterDTO.getProps()).orElse(new
Properties())))
.namespaceId(discoveryConfigRegisterDTO.getNamespaceId())
@@ -196,7 +196,7 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
throw new ShenyuException("shenyu this discovery has
discoveryHandler can't be delete");
}
DiscoveryDO discoveryDO = discoveryMapper.selectById(discoveryId);
- DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType());
+ DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType());
discoveryProcessor.removeDiscovery(discoveryDO);
discoveryMapper.delete(discoveryId);
return ShenyuResultMessage.DELETE_SUCCESS;
@@ -209,11 +209,11 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
DiscoveryDO discoveryDO = DiscoveryDO.builder()
.id(discoveryDTO.getId())
- .name(discoveryDTO.getName())
+ .discoveryName(discoveryDTO.getName())
.pluginName(discoveryDTO.getPluginName())
.namespaceId(discoveryDTO.getNamespaceId())
+ .discoveryType(discoveryDTO.getType())
.discoveryLevel(discoveryDTO.getLevel())
- .type(discoveryDTO.getType())
.serverList(discoveryDTO.getServerList())
.props(discoveryDTO.getProps())
.dateCreated(currentTime)
@@ -222,7 +222,7 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
if (StringUtils.isEmpty(discoveryDTO.getId())) {
discoveryDO.setId(UUIDUtils.getInstance().generateShortUuid());
}
- DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType());
+ DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType());
DiscoveryVO result = discoveryMapper.insert(discoveryDO) > 0 ?
DiscoveryTransfer.INSTANCE.mapToVo(discoveryDO) : null;
discoveryProcessor.createDiscovery(discoveryDO);
return result;
@@ -235,8 +235,8 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
Timestamp currentTime = new Timestamp(System.currentTimeMillis());
DiscoveryDO discoveryDO = DiscoveryDO.builder()
.id(discoveryDTO.getId())
- .name(discoveryDTO.getName())
- .type(discoveryDTO.getType())
+ .discoveryName(discoveryDTO.getName())
+ .discoveryType(discoveryDTO.getType())
.serverList(discoveryDTO.getServerList())
.props(discoveryDTO.getProps())
.namespaceId(discoveryDTO.getNamespaceId())
@@ -247,7 +247,7 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
public void syncData(final List<DiscoveryDO> discoveryDOS) {
discoveryDOS.forEach(d -> {
- DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(d.getType());
+ DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(d.getDiscoveryType());
discoveryProcessor.createDiscovery(d);
proxySelectorMapper.selectByDiscoveryId(d.getId()).stream().map(DiscoveryTransfer.INSTANCE::mapToDTO).forEach(ps
-> {
DiscoveryHandlerDO discoveryHandlerDO =
discoveryHandlerMapper.selectByProxySelectorId(ps.getId());
@@ -369,10 +369,10 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
}
DiscoveryDO discoveryDO = new DiscoveryDO();
String discoveryId = UUIDUtils.getInstance().generateShortUuid();
+ discoveryDO.setDiscoveryName(pluginName + "_default_discovery");
discoveryDO.setDiscoveryLevel(DiscoveryLevel.SELECTOR.getCode());
- discoveryDO.setName(pluginName + "_default_discovery");
discoveryDO.setPluginName(pluginName);
- discoveryDO.setType(DiscoveryMode.LOCAL.name().toLowerCase());
+ discoveryDO.setDiscoveryType(DiscoveryMode.LOCAL.name().toLowerCase());
discoveryDO.setId(discoveryId);
discoveryDO.setNamespaceId(namespaceId);
discoveryMapper.insertSelective(discoveryDO);
@@ -412,7 +412,7 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
Set<String> existDiscoveryNameSet = pluginDiscoveryMap
.getOrDefault(pluginName, Lists.newArrayList())
.stream()
- .map(DiscoveryDO::getName)
+ .map(DiscoveryDO::getDiscoveryName)
.collect(Collectors.toSet());
if (existDiscoveryNameSet.contains(discoveryName)) {
errorMsgBuilder
@@ -470,7 +470,7 @@ public class DiscoveryServiceImpl implements
DiscoveryService {
Set<String> existDiscoveryNameSet = pluginDiscoveryMap
.getOrDefault(pluginName, Lists.newArrayList())
.stream()
- .map(DiscoveryDO::getName)
+ .map(DiscoveryDO::getDiscoveryName)
.collect(Collectors.toSet());
if (existDiscoveryNameSet.contains(discoveryName)) {
errorMsgBuilder
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
index 14104d16c4..b626f314fa 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/DiscoveryUpstreamServiceImpl.java
@@ -347,7 +347,7 @@ public class DiscoveryUpstreamServiceImpl implements
DiscoveryUpstreamService {
}
DiscoveryDO discoveryDO =
discoveryMapper.selectById(discoveryHandlerDO.getDiscoveryId());
List<DiscoveryUpstreamDTO> collect =
discoveryUpstreamDOS.stream().map(DiscoveryTransfer.INSTANCE::mapToDTO).collect(Collectors.toList());
- DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType());
+ DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType());
discoveryProcessor.changeUpstream(proxySelectorDTO, collect);
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
index 0bf4fa71fe..a4b2a40fd9 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/service/impl/ProxySelectorServiceImpl.java
@@ -177,7 +177,7 @@ public class ProxySelectorServiceImpl implements
ProxySelectorService {
if (Objects.nonNull(discoveryHandlerDO)) {
ProxySelectorDO proxySelectorDO =
proxySelectorMapper.selectById(proxySelectorId);
DiscoveryDO discoveryDO =
discoveryMapper.selectById(discoveryHandlerDO.getDiscoveryId());
- DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType());
+ DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType());
discoveryProcessor.removeProxySelector(DiscoveryTransfer.INSTANCE.mapToDTO(discoveryHandlerDO),
DiscoveryTransfer.INSTANCE.mapToDTO(proxySelectorDO));
if
(DiscoveryLevel.SELECTOR.getCode().equals(discoveryDO.getDiscoveryLevel())) {
discoveryProcessor.removeDiscovery(discoveryDO);
@@ -281,8 +281,8 @@ public class ProxySelectorServiceImpl implements
ProxySelectorService {
private static DiscoveryDO buildDiscovery(final ProxySelectorAddDTO
proxySelectorAddDTO, final Timestamp currentTime, final String discoveryId) {
return DiscoveryDO.builder()
.id(discoveryId)
- .name(proxySelectorAddDTO.getName())
- .type(proxySelectorAddDTO.getDiscovery().getDiscoveryType())
+ .discoveryName(proxySelectorAddDTO.getName())
+
.discoveryType(proxySelectorAddDTO.getDiscovery().getDiscoveryType())
.serverList(proxySelectorAddDTO.getDiscovery().getServerList())
.pluginName(proxySelectorAddDTO.getPluginName())
.namespaceId(proxySelectorAddDTO.getNamespaceId())
@@ -387,7 +387,7 @@ public class ProxySelectorServiceImpl implements
ProxySelectorService {
});
List<DiscoveryUpstreamDTO> fetchAll =
discoveryUpstreamMapper.selectByDiscoveryHandlerId(discoveryHandlerDO.getId()).stream()
.map(DiscoveryTransfer.INSTANCE::mapToDTO).collect(Collectors.toList());
- DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType());
+ DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType());
discoveryProcessor.changeUpstream(DiscoveryTransfer.INSTANCE.mapToDTO(proxySelectorDO),
fetchAll);
LOG.info("insert discovery upstreams, count is: {}",
proxySelectorAddDTO.getDiscoveryUpstreams().size());
return ShenyuResultMessage.UPDATE_SUCCESS;
@@ -400,7 +400,7 @@ public class ProxySelectorServiceImpl implements
ProxySelectorService {
ProxySelectorDO proxySelectorDO =
proxySelectorMapper.selectByHandlerId(discoveryHandlerId);
DiscoveryHandlerDTO discoveryHandlerDTO =
DiscoveryTransfer.INSTANCE.mapToDTO(discoveryHandlerDO);
if (Objects.nonNull(proxySelectorDO)) {
-
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType()).fetchAll(discoveryHandlerDTO,
DiscoveryTransfer.INSTANCE.mapToDTO(proxySelectorDO));
+
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType()).fetchAll(discoveryHandlerDTO,
DiscoveryTransfer.INSTANCE.mapToDTO(proxySelectorDO));
}
SelectorDO selectorDO =
selectorMapper.selectByDiscoveryHandlerId(discoveryHandlerId);
if (Objects.nonNull(selectorDO)) {
@@ -409,7 +409,7 @@ public class ProxySelectorServiceImpl implements
ProxySelectorService {
proxySelectorDTO.setName(selectorDO.getSelectorName());
proxySelectorDTO.setId(selectorDO.getId());
proxySelectorDTO.setNamespaceId(selectorDO.getNamespaceId());
-
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType()).fetchAll(discoveryHandlerDTO,
proxySelectorDTO);
+
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType()).fetchAll(discoveryHandlerDTO,
proxySelectorDTO);
}
}
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 b576b47b0b..13e04bef54 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
@@ -299,7 +299,7 @@ public class SelectorServiceImpl implements SelectorService
{
discoveryUpstreamMapper.deleteByDiscoveryHandlerId(discoveryHandlerDO.getId());
DiscoveryDO discoveryDO =
discoveryMapper.selectById(discoveryHandlerDO.getDiscoveryId());
if (Objects.nonNull(discoveryDO)) {
- final DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getType());
+ final DiscoveryProcessor discoveryProcessor =
discoveryProcessorHolder.chooseProcessor(discoveryDO.getDiscoveryType());
ProxySelectorDTO proxySelectorDTO = new ProxySelectorDTO();
proxySelectorDTO.setId(selector.getId());
proxySelectorDTO.setName(selector.getSelectorName());
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/DiscoveryTransfer.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/DiscoveryTransfer.java
index faf2249036..ff24cc9935 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/DiscoveryTransfer.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/transfer/DiscoveryTransfer.java
@@ -133,9 +133,9 @@ public enum DiscoveryTransfer {
return Optional.ofNullable(discoveryDO).map(data -> {
DiscoveryVO discoveryVO = new DiscoveryVO();
discoveryVO.setId(data.getId());
- discoveryVO.setName(data.getName());
+ discoveryVO.setDiscoveryName(data.getDiscoveryName());
discoveryVO.setNamespaceId(data.getNamespaceId());
- discoveryVO.setType(data.getType());
+ discoveryVO.setDiscoveryType(data.getDiscoveryType());
discoveryVO.setLevel(data.getDiscoveryLevel());
discoveryVO.setServerList(data.getServerList());
discoveryVO.setPluginName(data.getPluginName());
@@ -148,8 +148,8 @@ public enum DiscoveryTransfer {
return Optional.ofNullable(discoveryDO).map(data -> {
DiscoveryDTO discoveryDTO = new DiscoveryDTO();
discoveryDTO.setId(data.getId());
- discoveryDTO.setName(data.getName());
- discoveryDTO.setType(data.getType());
+ discoveryDTO.setName(data.getDiscoveryName());
+ discoveryDTO.setType(data.getDiscoveryType());
discoveryDTO.setLevel(data.getDiscoveryLevel());
discoveryDTO.setServerList(data.getServerList());
discoveryDTO.setPluginName(data.getPluginName());
diff --git a/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml
index 56cfbf0328..fb84755e0c 100644
--- a/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/discovery-sqlmap.xml
@@ -22,8 +22,8 @@
<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="type" jdbcType="VARCHAR" property="type"/>
+ <result column="discovery_name" jdbcType="VARCHAR"
property="discoveryName"/>
+ <result column="discovery_type" jdbcType="VARCHAR"
property="discoveryType"/>
<result column="discovery_level" jdbcType="VARCHAR"
property="discoveryLevel"/>
<result column="server_list" jdbcType="VARCHAR" property="serverList"/>
<result column="plugin_name" jdbcType="VARCHAR" property="pluginName"/>
@@ -35,8 +35,8 @@
id,
date_created,
date_updated,
- name,
- type,
+ discovery_name,
+ discovery_type,
discovery_level,
server_list,
plugin_name,
@@ -69,7 +69,7 @@
<include refid="Base_Column_List"/>
FROM discovery
WHERE plugin_name = #{pluginName, jdbcType=VARCHAR} AND
discovery_level = #{level, jdbcType=VARCHAR} AND namespace_id = #{namespaceId,
jdbcType=VARCHAR}
- AND type = #{discoveryType, jdbcType=VARCHAR}
+ AND discovery_type = #{discoveryType, jdbcType=VARCHAR}
</select>
<select id="selectAll"
resultType="org.apache.shenyu.admin.model.entity.DiscoveryDO">
@@ -100,8 +100,8 @@
d.id,
d.date_created,
d.date_updated,
- d.name,
- d.type,
+ d.discovery_name,
+ d.discovery_type,
d.discovery_level,
d.server_list,
d.plugin_name,
@@ -120,8 +120,8 @@
(id,
date_created,
date_updated,
- name,
- type,
+ discovery_name,
+ discovery_type,
discovery_level,
server_list,
plugin_name,
@@ -131,8 +131,8 @@
(#{id, jdbcType=VARCHAR},
#{dateCreated, jdbcType=TIMESTAMP},
#{dateUpdated, jdbcType=TIMESTAMP},
- #{name, jdbcType=VARCHAR},
- #{type, jdbcType=VARCHAR},
+ #{discoveryName, jdbcType=VARCHAR},
+ #{discoveryType, jdbcType=VARCHAR},
#{discoveryLevel, jdbcType=VARCHAR},
#{serverList, jdbcType=VARCHAR},
#{pluginName, jdbcType=VARCHAR},
@@ -150,11 +150,11 @@
<if test="dateUpdated != null">
date_updated,
</if>
- <if test="name != null">
- name,
+ <if test="discoveryName != null">
+ discovery_name,
</if>
- <if test="type != null">
- type,
+ <if test="discoveryType != null">
+ discovery_type,
</if>
<if test="discoveryLevel != null">
discovery_level,
@@ -180,11 +180,11 @@
<if test="dateUpdated != null">
#{dateUpdated, jdbcType=TIMESTAMP},
</if>
- <if test="name != null">
- #{name, jdbcType=VARCHAR},
+ <if test="discoveryName != null">
+ #{discoveryName, jdbcType=VARCHAR},
</if>
- <if test="type != null">
- #{type, jdbcType=VARCHAR},
+ <if test="discoveryType != null">
+ #{discoveryType, jdbcType=VARCHAR},
</if>
<if test="discoveryLevel != null">
#{discoveryLevel, jdbcType=VARCHAR},
@@ -208,8 +208,8 @@
UPDATE discovery
SET date_created = #{dateCreated, jdbcType=TIMESTAMP},
date_updated = #{dateUpdated, jdbcType=TIMESTAMP},
- name = #{name, jdbcType=VARCHAR},
- type = #{type, jdbcType=VARCHAR},
+ discovery_name = #{discoveryName, jdbcType=VARCHAR},
+ discovery_type = #{discoveryType, jdbcType=VARCHAR},
discovery_level = #{discoveryLevel, jdbcType=VARCHAR},
server_list = #{serverList, jdbcType=VARCHAR},
plugin_name = #{pluginName, jdbcType=VARCHAR},
@@ -226,11 +226,11 @@
<if test="dateUpdated != null">
date_updated = #{dateUpdated, jdbcType=TIMESTAMP},
</if>
- <if test="name != null">
- name = #{name, jdbcType=VARCHAR},
+ <if test="discoveryName != null">
+ discovery_name = #{discoveryName, jdbcType=VARCHAR},
</if>
- <if test="type != null">
- type = #{type, jdbcType=VARCHAR},
+ <if test="discoveryType != null">
+ discovery_type = #{discoveryType, jdbcType=VARCHAR},
</if>
<if test="discoveryLevel != null">
discovery_level = #{discoveryLevel, 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 c3883d0ccd..804e8ea776 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -1220,11 +1220,11 @@ CREATE TABLE IF NOT EXISTS `tag_relation`
CREATE TABLE IF NOT EXISTS `discovery`
(
`id` varchar(128) NOT NULL COMMENT 'primary key id',
- `name` varchar(255) NOT NULL COMMENT 'the discovery name',
+ `discovery_name` varchar(255) NOT NULL COMMENT 'the discovery
name',
`discovery_level` varchar(64) NOT NULL COMMENT '0 selector,1
plugin 2 global',
`plugin_name` varchar(255) COMMENT 'the plugin name',
`namespace_id` varchar(50) NOT NULL COMMENT 'namespace id',
- `type` varchar(64) NOT NULL COMMENT
'local,zookeeper,etcd,consul,nacos',
+ `discovery_type` varchar(64) NOT NULL COMMENT
'local,zookeeper,etcd,consul,nacos',
`server_list` varchar(255) COMMENT 'register server url (,)',
`props` text COMMENT 'the discovery pops (json) ',
`date_created` timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT
'create time',
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java
index b7b0860f04..819cce7028 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/discovery/DefaultDiscoveryProcessorTest.java
@@ -98,7 +98,7 @@ public class DefaultDiscoveryProcessorTest {
Properties properties = new Properties();
properties.putAll(map);
discoveryDO.setId(id);
- discoveryDO.setType(type);
+ discoveryDO.setDiscoveryType(type);
discoveryDO.setProps(props);
discoveryDO.setServerList("localhost:2181");
MockedStatic<ExtensionLoader> mocked =
mockStatic(ExtensionLoader.class);
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
index 3703267c1a..28adf2c609 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/DiscoveryUpstreamServiceTest.java
@@ -207,9 +207,9 @@ public final class DiscoveryUpstreamServiceTest {
private DiscoveryDO buildDiscoveryDO() {
DiscoveryDO discoveryDO = new DiscoveryDO();
- discoveryDO.setName("123");
+ discoveryDO.setDiscoveryName("123");
discoveryDO.setId("123");
- discoveryDO.setType("local");
+ discoveryDO.setDiscoveryType("local");
return discoveryDO;
}
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/SelectorServiceTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/SelectorServiceTest.java
index 28d7d34a2b..5396ebb0ba 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/SelectorServiceTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/service/SelectorServiceTest.java
@@ -146,7 +146,7 @@ public final class SelectorServiceTest {
when(discoveryRelMapper.deleteByDiscoveryHandlerId(anyString())).thenReturn(1);
DiscoveryDO discoveryDO = new DiscoveryDO();
discoveryDO.setId("1");
- discoveryDO.setType("local");
+ discoveryDO.setDiscoveryType("local");
when(discoveryMapper.selectById(anyString())).thenReturn(discoveryDO);
DiscoveryHandlerDO discoveryHandlerDO = new DiscoveryHandlerDO();
discoveryHandlerDO.setDiscoveryId("1");
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginCases.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginCases.java
index deb1948885..2809078e80 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginCases.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginCases.java
@@ -43,6 +43,7 @@ public class WebSocketPluginCases implements
ShenYuScenarioProvider {
* @return ShenYuScenarioSpec
*/
public ShenYuScenarioSpec testWebSocket() {
+
return ShenYuScenarioSpec.builder()
.name("single-websocket test")
.beforeEachSpec(ShenYuBeforeEachSpec.builder()
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginTest.java
index e58f1aedd9..dbaa39c300 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-websocket/src/test/java/org/apache/shenyue/e2e/testcase/websocket/WebSocketPluginTest.java
@@ -76,7 +76,6 @@ public class WebSocketPluginTest {
reqBody.put("namespaceId",
Constants.SYS_DEFAULT_NAMESPACE_NAMESPACE_ID);
adminClient.changePluginStatus("1801816010882822163", reqBody);
WaitDataSync.waitGatewayPluginUse(gatewayClient,
"org.apache.shenyu.plugin.websocket.WebSocketPlugin");
-
}
@ShenYuScenario(provider = WebSocketPluginCases.class)
