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 feadbd2215 feat:refactor reserved keyword fields for discovery
upstream (#6167)
feadbd2215 is described below
commit feadbd221548dd98ca401a72ef23b39aaee62790
Author: Wweiei <[email protected]>
AuthorDate: Mon Sep 22 16:02:47 2025 +0800
feat:refactor reserved keyword fields for discovery upstream (#6167)
Co-authored-by: aias00 <[email protected]>
Co-authored-by: xcsnx <[email protected]>
---
db/init/mysql/schema.sql | 6 +--
db/init/ob/schema.sql | 6 +--
db/init/og/create-table.sql | 10 ++---
db/init/oracle/schema.sql | 10 ++---
db/init/pg/create-table.sql | 10 ++---
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 | 4 +-
db/upgrade/2.7.0-upgrade-2.7.1-oracle.sql | 2 +
db/upgrade/2.7.0-upgrade-2.7.1-pg.sql | 2 +
.../discovery/AbstractDiscoveryProcessor.java | 4 +-
.../DiscoveryDataChangedEventSyncListener.java | 2 +-
.../admin/mapper/DiscoveryUpstreamMapper.java | 16 +++----
.../admin/model/entity/DiscoveryUpstreamDO.java | 38 ++++++++--------
.../service/impl/DiscoveryUpstreamServiceImpl.java | 6 +--
.../shenyu/admin/transfer/DiscoveryTransfer.java | 12 ++---
.../mappers/discovery-upstream-sqlmap.xml | 52 +++++++++++-----------
.../src/main/resources/mappers/tag-sqlmap.xml | 2 +-
.../src/main/resources/sql-script/h2/schema.sql | 6 +--
.../admin/mapper/DiscoveryUpstreamMapperTest.java | 4 +-
.../service/DiscoveryUpstreamServiceTest.java | 6 +--
21 files changed, 107 insertions(+), 97 deletions(-)
diff --git a/db/init/mysql/schema.sql b/db/init/mysql/schema.sql
index 0a5fe4cbd1..b53b60f703 100644
--- a/db/init/mysql/schema.sql
+++ b/db/init/mysql/schema.sql
@@ -2374,14 +2374,14 @@ CREATE TABLE `discovery_upstream`
`discovery_handler_id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery handler id',
`namespace_id` varchar(50) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'namespace id',
`protocol` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci COMMENT 'for http, https, tcp, ws',
- `url` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'ip:port',
- `status` int(0) NOT NULL COMMENT 'type (0, healthy, 1 unhealthy)',
+ `upstream_url` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'ip:port',
+ `upstream_status` int(0) NOT NULL COMMENT 'type (0, healthy, 1
unhealthy)',
`weight` int(0) NOT NULL COMMENT 'the weight for lists',
`props` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT
'the other field (json)',
`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',
PRIMARY KEY (`id`) USING BTREE,
- UNIQUE KEY `discovery_upstream_discovery_handler_id_IDX`
(`discovery_handler_id`,`url`) USING BTREE
+ UNIQUE KEY `discovery_upstream_discovery_handler_id_IDX`
(`discovery_handler_id`,`upstream_url`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci
ROW_FORMAT = Dynamic;
-- shenyu.discovery_upstream definition
diff --git a/db/init/ob/schema.sql b/db/init/ob/schema.sql
index 6a98e306e7..af8844e1eb 100644
--- a/db/init/ob/schema.sql
+++ b/db/init/ob/schema.sql
@@ -2290,14 +2290,14 @@ CREATE TABLE `discovery_upstream`
`discovery_handler_id` varchar(128) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'the discovery handler id',
`namespace_id` varchar(50) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'namespace id',
`protocol` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci COMMENT 'for http, https, tcp, ws',
- `url` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'ip:port',
- `status` int(0) NOT NULL COMMENT 'type (0, healthy, 1 unhealthy)',
+ `upstream_url` varchar(64) CHARACTER SET utf8mb4 COLLATE
utf8mb4_unicode_ci NOT NULL COMMENT 'ip:port',
+ `upstream_status` int(0) NOT NULL COMMENT 'type (0, healthy, 1
unhealthy)',
`weight` int(0) NOT NULL COMMENT 'the weight for lists',
`props` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT
'the other field (json)',
`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',
PRIMARY KEY (`id`) USING BTREE,
- UNIQUE KEY `discovery_upstream_discovery_handler_id_IDX`
(`discovery_handler_id`,`url`) USING BTREE
+ UNIQUE KEY `discovery_upstream_discovery_handler_id_IDX`
(`discovery_handler_id`,`upstream_url`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci
ROW_FORMAT = Dynamic;
-- shenyu.discovery_upstream definition
diff --git a/db/init/og/create-table.sql b/db/init/og/create-table.sql
index 563c4653c0..dab3540cdd 100644
--- a/db/init/og/create-table.sql
+++ b/db/init/og/create-table.sql
@@ -2490,8 +2490,8 @@ CREATE TABLE "public"."discovery_upstream"
"discovery_handler_id" varchar(128) COLLATE "pg_catalog"."default" NOT
NULL,
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
"protocol" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "url" varchar(128) COLLATE "pg_catalog"."default",
- "status" int4 NOT NULL,
+ "upstream_url" varchar(128) COLLATE "pg_catalog"."default",
+ "upstream_status" int4 NOT NULL,
"weight" int4 NOT NULL,
"props" text COLLATE "pg_catalog"."default",
"date_created" timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -2502,14 +2502,14 @@ COMMENT ON COLUMN "public"."discovery_upstream"."id" IS
'primary key id';
COMMENT ON COLUMN "public"."discovery_upstream"."discovery_handler_id" IS 'the
discovery handler id';
COMMENT ON COLUMN "public"."discovery_upstream"."namespace_id" IS 'namespace
id';
COMMENT ON COLUMN "public"."discovery_upstream"."protocol" IS 'for http,
https, tcp, ws';
-COMMENT ON COLUMN "public"."discovery_upstream"."url" IS 'ip:port';
-COMMENT ON COLUMN "public"."discovery_upstream"."status" IS 'type (0, healthy,
1 unhealthy)';
+COMMENT ON COLUMN "public"."discovery_upstream"."upstream_url" IS 'ip:port';
+COMMENT ON COLUMN "public"."discovery_upstream"."upstream_status" IS 'type (0,
healthy, 1 unhealthy)';
COMMENT ON COLUMN "public"."discovery_upstream"."weight" IS 'the weight for
lists';
COMMENT ON COLUMN "public"."discovery_upstream"."props" IS 'the other field
(json)';
COMMENT ON COLUMN "public"."discovery_upstream"."date_created" IS 'create
time';
COMMENT ON COLUMN "public"."discovery_upstream"."date_updated" IS 'update
time';
CREATE INDEX "unique_discovery_upstream_discovery_handler_id" ON
"public"."discovery_upstream" USING btree (
- "discovery_handler_id" , "url"
+ "discovery_handler_id" , "upstream_url"
);
diff --git a/db/init/oracle/schema.sql b/db/init/oracle/schema.sql
index d47e306224..94abe6e059 100644
--- a/db/init/oracle/schema.sql
+++ b/db/init/oracle/schema.sql
@@ -2614,15 +2614,15 @@ create table discovery_upstream
discovery_handler_id VARCHAR2(128) not null,
namespace_id VARCHAR2(50) not null,
protocol VARCHAR2(64),
- url VARCHAR2(64) not null,
- status NUMBER(10) not null,
+ upstream_url VARCHAR2(64) not null,
+ upstream_status NUMBER(10) not null,
weight NUMBER(10) not null,
props CLOB,
date_created timestamp(3) default SYSDATE not null,
date_updated timestamp(3) default SYSDATE not null,
PRIMARY KEY (id)
);
-CREATE UNIQUE INDEX discovery_upstream_idx ON discovery_upstream
(discovery_handler_id, url);
+CREATE UNIQUE INDEX discovery_upstream_idx ON discovery_upstream
(discovery_handler_id, upstream_url);
-- Add comments to the columns
comment on column DISCOVERY_UPSTREAM.id
@@ -2633,9 +2633,9 @@ comment on column DISCOVERY_UPSTREAM.namespace_id
is 'namespace id';
comment on column DISCOVERY_UPSTREAM.protocol
is 'for http, https, tcp, ws';
-comment on column DISCOVERY_UPSTREAM.url
+comment on column DISCOVERY_UPSTREAM.upstream_url
is 'ip:port';
-comment on column DISCOVERY_UPSTREAM.status
+comment on column DISCOVERY_UPSTREAM.upstream_status
is 'type (0, healthy, 1 unhealthy)';
comment on column DISCOVERY_UPSTREAM.weight
is 'the weight for lists';
diff --git a/db/init/pg/create-table.sql b/db/init/pg/create-table.sql
index f7d7f55294..fe6dddb901 100644
--- a/db/init/pg/create-table.sql
+++ b/db/init/pg/create-table.sql
@@ -2617,8 +2617,8 @@ CREATE TABLE "public"."discovery_upstream"
"discovery_handler_id" varchar(128) COLLATE "pg_catalog"."default" NOT
NULL,
"namespace_id" varchar(50) COLLATE "pg_catalog"."default" NOT NULL,
"protocol" varchar(128) COLLATE "pg_catalog"."default" NOT NULL,
- "url" varchar(128) COLLATE "pg_catalog"."default",
- "status" int4 NOT NULL,
+ "upstream_url" varchar(128) COLLATE "pg_catalog"."default",
+ "upstream_status" int4 NOT NULL,
"weight" int4 NOT NULL,
"props" text COLLATE "pg_catalog"."default",
"date_created" timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -2629,14 +2629,14 @@ COMMENT ON COLUMN "public"."discovery_upstream"."id" IS
'primary key id';
COMMENT ON COLUMN "public"."discovery_upstream"."discovery_handler_id" IS 'the
discovery handler id';
COMMENT ON COLUMN "public"."discovery_upstream"."namespace_id" IS 'the
namespace id';
COMMENT ON COLUMN "public"."discovery_upstream"."protocol" IS 'for http,
https, tcp, ws';
-COMMENT ON COLUMN "public"."discovery_upstream"."url" IS 'ip:port';
-COMMENT ON COLUMN "public"."discovery_upstream"."status" IS 'type (0, healthy,
1 unhealthy)';
+COMMENT ON COLUMN "public"."discovery_upstream"."upstream_url" IS 'ip:port';
+COMMENT ON COLUMN "public"."discovery_upstream"."upstream_status" IS 'type (0,
healthy, 1 unhealthy)';
COMMENT ON COLUMN "public"."discovery_upstream"."weight" IS 'the weight for
lists';
COMMENT ON COLUMN "public"."discovery_upstream"."props" IS 'the other field
(json)';
COMMENT ON COLUMN "public"."discovery_upstream"."date_created" IS 'create
time';
COMMENT ON COLUMN "public"."discovery_upstream"."date_updated" IS 'update
time';
-CREATE UNIQUE INDEX discovery_upstream_discovery_handler_id_IDX ON
"public"."discovery_upstream" USING btree ("discovery_handler_id","url");
+CREATE UNIQUE INDEX discovery_upstream_discovery_handler_id_IDX ON
"public"."discovery_upstream" USING btree
("discovery_handler_id","upstream_url");
-- ----------------------------
-- Table structure for alert_template
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 206e46c9a9..9a600251b9 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
@@ -280,3 +280,5 @@ 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_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 0a1da3257d..5f24de28f8 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
@@ -274,4 +274,6 @@ ALTER TABLE `selector` CHANGE COLUMN `sort` `sort_code`
int(0) NOT NULL COMMENT
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';
+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)';
\ 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 e8b752f459..8477fb75dc 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
@@ -299,4 +299,6 @@ 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";
+ALTER TABLE "public"."discovery_upstream" RENAME COLUMN "url" TO
"upstream_url";
+ALTER TABLE "public"."discovery_upstream" RENAME COLUMN "status" TO
"upstream_status";
\ No newline at end of file
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 355fb43db3..0925b3ebd2 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
@@ -588,3 +588,5 @@ 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_upstream RENAME COLUMN "url" TO "upstream_url";
+ALTER TABLE discovery_upstream RENAME COLUMN "status" TO "upstream_status";
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 642ad20e63..8973d36445 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
@@ -296,3 +296,5 @@ 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_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 9187e62406..0fded04b04 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
@@ -184,10 +184,10 @@ public abstract class AbstractDiscoveryProcessor
implements DiscoveryProcessor,
}).collect(Collectors.toList());
Set<String> urlList =
discoveryUpstreamDataList.stream().map(DiscoveryUpstreamData::getUrl).collect(Collectors.toSet());
List<DiscoveryUpstreamDO> discoveryUpstreamDOS =
discoveryUpstreamMapper.selectByDiscoveryHandlerId(discoveryHandlerDTO.getId());
- Set<String> dbUrlList =
discoveryUpstreamDOS.stream().map(DiscoveryUpstreamDO::getUrl).collect(Collectors.toSet());
+ Set<String> dbUrlList =
discoveryUpstreamDOS.stream().map(DiscoveryUpstreamDO::getUpstreamUrl).collect(Collectors.toSet());
List<String> deleteIds = new ArrayList<>();
for (DiscoveryUpstreamDO discoveryUpstreamDO :
discoveryUpstreamDOS) {
- if (!urlList.contains(discoveryUpstreamDO.getUrl())) {
+ if (!urlList.contains(discoveryUpstreamDO.getUpstreamUrl())) {
deleteIds.add(discoveryUpstreamDO.getId());
}
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java
index a1c8b2f5c5..a3bb277243 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/discovery/DiscoveryDataChangedEventSyncListener.java
@@ -120,7 +120,7 @@ public class DiscoveryDataChangedEventSyncListener
implements DataChangedEventLi
upstreamDataList.stream().map(DiscoveryTransfer.INSTANCE::mapToDo).forEach(discoveryUpstreamDO
-> {
discoveryUpstreamDO.setDiscoveryHandlerId(discoveryHandlerId);
int effect =
discoveryUpstreamMapper.updateDiscoveryHandlerIdAndUrl(discoveryUpstreamDO);
- LOG.info("[DiscoveryDataChangedEventSyncListener] UPDATE
Upstream {}, effect = {} ", discoveryUpstreamDO.getUrl(), effect);
+ LOG.info("[DiscoveryDataChangedEventSyncListener] UPDATE
Upstream {}, effect = {} ", discoveryUpstreamDO.getUpstreamUrl(), effect);
});
break;
case DELETED:
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapper.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapper.java
index 19d552edd1..ad049bcc79 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapper.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapper.java
@@ -138,19 +138,19 @@ public interface DiscoveryUpstreamMapper extends
ExistProvider {
* deleteByUrl.
*
* @param discoveryHandlerId discoveryHandlerId
- * @param url url
+ * @param upstreamUrl upstreamUrl
* @return rows int
*/
- int deleteByUrl(@Param("discoveryHandlerId") String discoveryHandlerId,
@Param("url") String url);
+ int deleteByUrl(@Param("discoveryHandlerId") String discoveryHandlerId,
@Param("upstreamUrl") String upstreamUrl);
/**
* selectByDiscoveryHandlerIdAndUrl.
*
* @param discoveryHandlerId discoveryHandlerId
- * @param url url
+ * @param upstreamUrl upstreamUrl
* @return DiscoveryUpstreamDO
*/
- DiscoveryUpstreamDO
selectByDiscoveryHandlerIdAndUrl(@Param("discoveryHandlerId") String
discoveryHandlerId, @Param("url") String url);
+ DiscoveryUpstreamDO
selectByDiscoveryHandlerIdAndUrl(@Param("discoveryHandlerId") String
discoveryHandlerId, @Param("upstreamUrl") String upstreamUrl);
/**
* updateDiscoveryHandlerIdAndUrl.
@@ -163,11 +163,11 @@ public interface DiscoveryUpstreamMapper extends
ExistProvider {
/**
* updateStatusByUrl.
*
- * @param discoveryHandlerId discoveryHandlerId
- * @param url url
- * @param status status 0 healthy 1 unhealthy
+ * @param discoveryHandlerId discoveryHandlerId
+ * @param upstreamUrl url
+ * @param upstreamStatus status 0 healthy 1 unhealthy
* @return effect
*/
- int updateStatusByUrl(@Param("discoveryHandlerId") String
discoveryHandlerId, @Param("url") String url, int status);
+ int updateStatusByUrl(@Param("discoveryHandlerId") String
discoveryHandlerId, @Param("upstreamUrl") String upstreamUrl,
@Param("upstreamStatus") int upstreamStatus);
}
diff --git
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryUpstreamDO.java
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryUpstreamDO.java
index e3762a6416..93f899b8cc 100644
---
a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryUpstreamDO.java
+++
b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/DiscoveryUpstreamDO.java
@@ -44,12 +44,12 @@ public class DiscoveryUpstreamDO extends BaseDO {
/**
* url.
*/
- private String url;
+ private String upstreamUrl;
/**
* status.
*/
- private int status;
+ private int upstreamStatus;
/**
* weight.
@@ -78,18 +78,18 @@ public class DiscoveryUpstreamDO extends BaseDO {
*
* @param discoveryHandlerId discoveryHandlerId
* @param protocol protocol
- * @param url url
- * @param status status
+ * @param upstreamUrl url
+ * @param upstreamStatus status
* @param weight weight
* @param props props
*/
- public DiscoveryUpstreamDO(final String discoveryHandlerId, final String
protocol, final String url, final int status,
+ public DiscoveryUpstreamDO(final String discoveryHandlerId, final String
protocol, final String upstreamUrl, final int upstreamStatus,
final int weight, final String props) {
this.discoveryHandlerId = discoveryHandlerId;
this.protocol = protocol;
- this.url = url;
- this.status = status;
+ this.upstreamUrl = upstreamUrl;
+ this.upstreamStatus = upstreamStatus;
this.weight = weight;
this.props = props;
}
@@ -139,19 +139,19 @@ public class DiscoveryUpstreamDO extends BaseDO {
*
* @return url
*/
- public String getUrl() {
+ public String getUpstreamUrl() {
- return url;
+ return upstreamUrl;
}
/**
* setUrl.
*
- * @param url url
+ * @param upstreamUrl url
*/
- public void setUrl(final String url) {
+ public void setUpstreamUrl(final String upstreamUrl) {
- this.url = url;
+ this.upstreamUrl = upstreamUrl;
}
/**
@@ -159,19 +159,19 @@ public class DiscoveryUpstreamDO extends BaseDO {
*
* @return status
*/
- public int getStatus() {
+ public int getUpstreamStatus() {
- return status;
+ return upstreamStatus;
}
/**
* setStatus.
*
- * @param status status
+ * @param upstreamStatus status
*/
- public void setStatus(final int status) {
+ public void setUpstreamStatus(final int upstreamStatus) {
- this.status = status;
+ this.upstreamStatus = upstreamStatus;
}
/**
@@ -457,8 +457,8 @@ public class DiscoveryUpstreamDO extends BaseDO {
discoveryUpstreamDO.setId(this.id);
discoveryUpstreamDO.setDiscoveryHandlerId(this.discoveryHandlerId);
discoveryUpstreamDO.setProtocol(this.protocol);
- discoveryUpstreamDO.setUrl(this.url);
- discoveryUpstreamDO.setStatus(this.status);
+ discoveryUpstreamDO.setUpstreamUrl(this.url);
+ discoveryUpstreamDO.setUpstreamStatus(this.status);
discoveryUpstreamDO.setWeight(this.weight);
discoveryUpstreamDO.setProps(this.props);
discoveryUpstreamDO.setNamespaceId(this.namespaceId);
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 2f1e9be86c..14104d16c4 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
@@ -125,7 +125,7 @@ public class DiscoveryUpstreamServiceImpl implements
DiscoveryUpstreamService {
if (StringUtils.hasLength(discoveryUpstreamDTO.getId())) {
discoveryUpstreamMapper.updateSelective(discoveryUpstreamDO);
} else {
- DiscoveryUpstreamDO existingRecord =
discoveryUpstreamMapper.selectByDiscoveryHandlerIdAndUrl(discoveryUpstreamDO.getDiscoveryHandlerId(),
discoveryUpstreamDO.getUrl());
+ DiscoveryUpstreamDO existingRecord =
discoveryUpstreamMapper.selectByDiscoveryHandlerIdAndUrl(discoveryUpstreamDO.getDiscoveryHandlerId(),
discoveryUpstreamDO.getUpstreamUrl());
if (Objects.isNull(existingRecord)) {
discoveryUpstreamMapper.insert(discoveryUpstreamDO);
}
@@ -268,7 +268,7 @@ public class DiscoveryUpstreamServiceImpl implements
DiscoveryUpstreamService {
Set<String> existsUpstreamUrlSet = discoveryHandlerUpstreamMap
.getOrDefault(discoveryHandlerId, Lists.newArrayList())
.stream()
- .map(DiscoveryUpstreamDO::getUrl)
+ .map(DiscoveryUpstreamDO::getUpstreamUrl)
.collect(Collectors.toSet());
if (existsUpstreamUrlSet.contains(url)) {
errorMsgBuilder
@@ -307,7 +307,7 @@ public class DiscoveryUpstreamServiceImpl implements
DiscoveryUpstreamService {
Set<String> existsUpstreamUrlSet = discoveryHandlerUpstreamMap
.getOrDefault(discoveryHandlerId, Lists.newArrayList())
.stream()
- .map(DiscoveryUpstreamDO::getUrl)
+ .map(DiscoveryUpstreamDO::getUpstreamUrl)
.collect(Collectors.toSet());
if (existsUpstreamUrlSet.contains(url)) {
errorMsgBuilder
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 9209248e2d..068b8eca81 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
@@ -94,8 +94,8 @@ public enum DiscoveryTransfer {
vo.setId(data.getId());
vo.setDiscoveryHandlerId(data.getDiscoveryHandlerId());
vo.setProtocol(data.getProtocol());
- vo.setUrl(data.getUrl());
- vo.setStatus(data.getStatus());
+ vo.setUrl(data.getUpstreamUrl());
+ vo.setStatus(data.getUpstreamStatus());
vo.setWeight(data.getWeight());
vo.setProps(data.getProps());
vo.setStartupTime(String.valueOf(data.getDateCreated().getTime()));
@@ -181,8 +181,8 @@ public enum DiscoveryTransfer {
DiscoveryUpstreamData discoveryUpstreamData = new
DiscoveryUpstreamData();
discoveryUpstreamData.setId(data.getId());
discoveryUpstreamData.setProtocol(data.getProtocol());
- discoveryUpstreamData.setUrl(data.getUrl());
- discoveryUpstreamData.setStatus(data.getStatus());
+ discoveryUpstreamData.setUrl(data.getUpstreamUrl());
+ discoveryUpstreamData.setStatus(data.getUpstreamStatus());
discoveryUpstreamData.setDiscoveryHandlerId(data.getDiscoveryHandlerId());
discoveryUpstreamData.setWeight(data.getWeight());
discoveryUpstreamData.setProps(data.getProps());
@@ -324,8 +324,8 @@ public enum DiscoveryTransfer {
return Optional.ofNullable(discoveryUpstreamDO).map(data -> {
DiscoveryUpstreamDTO discoveryUpstreamDTO = new
DiscoveryUpstreamDTO();
discoveryUpstreamDTO.setProps(data.getProps());
- discoveryUpstreamDTO.setStatus(data.getStatus());
- discoveryUpstreamDTO.setUrl(data.getUrl());
+ discoveryUpstreamDTO.setStatus(data.getUpstreamStatus());
+ discoveryUpstreamDTO.setUrl(data.getUpstreamUrl());
discoveryUpstreamDTO.setDiscoveryHandlerId(data.getDiscoveryHandlerId());
discoveryUpstreamDTO.setProtocol(data.getProtocol());
discoveryUpstreamDTO.setId(data.getId());
diff --git
a/shenyu-admin/src/main/resources/mappers/discovery-upstream-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/discovery-upstream-sqlmap.xml
index d7f9d13ecf..7b17d713fd 100644
--- a/shenyu-admin/src/main/resources/mappers/discovery-upstream-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/discovery-upstream-sqlmap.xml
@@ -25,8 +25,8 @@
<result column="discovery_handler_id" jdbcType="VARCHAR"
property="discoveryHandlerId"/>
<result column="namespace_id" jdbcType="VARCHAR"
property="namespaceId"/>
<result column="protocol" jdbcType="VARCHAR" property="protocol"/>
- <result column="url" jdbcType="VARCHAR" property="url"/>
- <result column="status" jdbcType="INTEGER" property="status"/>
+ <result column="upstream_url" jdbcType="VARCHAR"
property="upstreamUrl"/>
+ <result column="upstream_status" jdbcType="INTEGER"
property="upstreamStatus"/>
<result column="weight" jdbcType="INTEGER" property="weight"/>
<result column="props" jdbcType="VARCHAR" property="props"/>
</resultMap>
@@ -38,8 +38,8 @@
discovery_handler_id,
namespace_id,
protocol,
- url,
- status,
+ upstream_url,
+ upstream_status,
weight,
props
</sql>
@@ -56,8 +56,8 @@
discovery_handler_id,
namespace_id,
protocol,
- url,
- status,
+ upstream_url,
+ upstream_status,
weight,
props,
date_created,
@@ -67,8 +67,8 @@
#{discoveryHandlerId,jdbcType=VARCHAR},
#{namespaceId, jdbcType=VARCHAR},
#{protocol,jdbcType=VARCHAR},
- #{url,jdbcType=VARCHAR},
- #{status,jdbcType=INTEGER},
+ #{upstreamUrl,jdbcType=VARCHAR},
+ #{upstreamStatus,jdbcType=INTEGER},
#{weight,jdbcType=INTEGER},
#{props,jdbcType=VARCHAR},
#{dateCreated, jdbcType=TIMESTAMP},
@@ -80,8 +80,8 @@
SET
discovery_handler_id=#{discoveryHandlerId, jdbcType=VARCHAR},
protocol=#{protocol,jdbcType=VARCHAR},
- url=#{url,jdbcType=VARCHAR},
- status=#{status,jdbcType=INTEGER},
+ upstream_url=#{upstreamUrl,jdbcType=VARCHAR},
+ upstream_status=#{upstreamStatus,jdbcType=INTEGER},
weight=#{weight,jdbcType=INTEGER},
props=#{props,jdbcType=VARCHAR},
date_updated=#{dateUpdated, jdbcType=TIMESTAMP}
@@ -97,11 +97,11 @@
<if test="protocol != null">
protocol=#{protocol,jdbcType=VARCHAR},
</if>
- <if test="url != null">
- url=#{url,jdbcType=VARCHAR},
+ <if test="upstreamUrl != null">
+ upstream_url=#{upstreamUrl,jdbcType=VARCHAR},
</if>
- <if test="status != null">
- status=#{status,jdbcType=INTEGER},
+ <if test="upstreamStatus != null">
+ upstream_status=#{upstreamStatus,jdbcType=INTEGER},
</if>
<if test="weight != null">
weight=#{weight,jdbcType=INTEGER},
@@ -119,11 +119,11 @@
UPDATE discovery_upstream
SET
protocol=#{protocol,jdbcType=VARCHAR},
- status=#{status,jdbcType=INTEGER},
+ upstream_status=#{upstreamStatus,jdbcType=INTEGER},
weight=#{weight,jdbcType=INTEGER},
props=#{props,jdbcType=VARCHAR},
date_updated=#{dateUpdated, jdbcType=TIMESTAMP}
- WHERE discovery_handler_id=#{id, jdbcType=VARCHAR} and url =#{url}
+ WHERE discovery_handler_id=#{id, jdbcType=VARCHAR} and upstream_url
=#{upstreamUrl}
</update>
<select id="selectAll" resultMap="BaseResultMap">
@@ -177,8 +177,8 @@
du.date_updated,
du.discovery_handler_id,
du.protocol,
- du.url,
- du.status,
+ du.upstream_url,
+ du.upstream_status,
du.weight,
du.props
FROM discovery_upstream du
@@ -187,7 +187,7 @@
<select id="selectByDiscoveryHandlerIdAndUrl"
resultType="org.apache.shenyu.admin.model.entity.DiscoveryUpstreamDO">
- SELECT <include refid="Base_Column_List"/> from discovery_upstream
where discovery_handler_id = #{discoveryHandlerId} and url = #{url} for update
+ SELECT <include refid="Base_Column_List"/> from discovery_upstream
where discovery_handler_id = #{discoveryHandlerId} and upstream_url =
#{upstreamUrl} for update
</select>
<delete id="deleteByIds" parameterType="java.util.List">
@@ -203,8 +203,8 @@
discovery_handler_id,
namespace_id,
protocol,
- url,
- status,
+ upstream_url,
+ upstream_status,
weight,
props,
date_created,
@@ -215,8 +215,8 @@
#{item.discoveryHandlerId,jdbcType=VARCHAR},
#{item.namespaceId,jdbcType=VARCHAR},
#{item.protocol,jdbcType=VARCHAR},
- #{item.url,jdbcType=VARCHAR},
- #{item.status,jdbcType=INTEGER},
+ #{item.upstreamUrl,jdbcType=VARCHAR},
+ #{item.upstreamStatus,jdbcType=INTEGER},
#{item.weight,jdbcType=INTEGER},
#{item.props,jdbcType=VARCHAR},
#{item.dateCreated, jdbcType=TIMESTAMP},
@@ -230,13 +230,13 @@
</delete>
<delete id="deleteByUrl">
- DELETE FROM discovery_upstream WHERE discovery_handler_id =
#{discoveryHandlerId} and url = #{url}
+ DELETE FROM discovery_upstream WHERE discovery_handler_id =
#{discoveryHandlerId} and upstream_url = #{upstreamUrl}
</delete>
<update id="updateStatusByUrl">
UPDATE discovery_upstream
- SET status = #{status}
- WHERE discovery_handler_id = #{discoveryHandlerId} and url = #{url}
+ SET upstream_status = #{upstreamStatus}
+ WHERE discovery_handler_id = #{discoveryHandlerId} and upstream_url =
#{upstreamUrl}
</update>
</mapper>
diff --git a/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
b/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
index 3db339dc89..352f785399 100644
--- a/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
+++ b/shenyu-admin/src/main/resources/mappers/tag-sqlmap.xml
@@ -128,7 +128,7 @@
#{dateUpdated, jdbcType=TIMESTAMP},
</if>
<if test="tagName != null">
- #{tag_name, jdbcType=VARCHAR},
+ #{tagName, jdbcType=VARCHAR},
</if>
<if test="tagDesc != null">
#{tagDesc, 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 0e5254d78e..a15878ad26 100644
--- a/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
+++ b/shenyu-admin/src/main/resources/sql-script/h2/schema.sql
@@ -1223,14 +1223,14 @@ CREATE TABLE IF NOT EXISTS `discovery_upstream`
`discovery_handler_id` varchar(128) NOT NULL COMMENT 'the discovery
handler id',
`namespace_id` varchar(50) NOT NULL COMMENT 'namespace id',
`protocol` varchar(64) COMMENT 'for http, https, tcp, ws',
- `url` varchar(64) NOT NULL COMMENT 'ip:port',
- `status` int(0) NOT NULL COMMENT 'type (0, healthy, 1 unhealthy)',
+ `upstream_url` varchar(64) NOT NULL COMMENT 'ip:port',
+ `upstream_status` int(0) NOT NULL COMMENT 'type (0, healthy, 1
unhealthy)',
`weight` int(0) NOT NULL COMMENT 'the weight for lists',
`props` text COMMENT 'the other field (json)',
`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',
PRIMARY KEY (`id`),
- UNIQUE KEY `discovery_upstream_discovery_handler_id_IDX`
(`discovery_handler_id`,`url`)
+ UNIQUE KEY `discovery_upstream_discovery_handler_id_IDX`
(`discovery_handler_id`,`upstream_url`)
);
-- ----------------------------
diff --git
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapperTest.java
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapperTest.java
index 8c0687317d..78dd58dd12 100644
---
a/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapperTest.java
+++
b/shenyu-admin/src/test/java/org/apache/shenyu/admin/mapper/DiscoveryUpstreamMapperTest.java
@@ -93,10 +93,10 @@ class DiscoveryUpstreamMapperTest extends
AbstractSpringIntegrationTest {
DiscoveryUpstreamDO discoveryUpstreamDO = new DiscoveryUpstreamDO();
discoveryUpstreamDO.setId(UUIDUtils.getInstance().generateShortUuid());
discoveryUpstreamDO.setDiscoveryHandlerId("1");
- discoveryUpstreamDO.setStatus(1);
+ discoveryUpstreamDO.setUpstreamStatus(1);
discoveryUpstreamDO.setWeight(1);
discoveryUpstreamDO.setProps("test");
- discoveryUpstreamDO.setUrl("test");
+ discoveryUpstreamDO.setUpstreamUrl("test");
discoveryUpstreamDO.setProtocol("test");
discoveryUpstreamDO.setNamespaceId(SYS_DEFAULT_NAMESPACE_ID);
discoveryUpstreamDO.setDateCreated(new
Timestamp(System.currentTimeMillis()));
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 236822a339..3703267c1a 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
@@ -223,7 +223,7 @@ public final class DiscoveryUpstreamServiceTest {
private DiscoveryUpstreamDO buildDiscoveryUpstreamDO(final String id) {
DiscoveryUpstreamDO discoveryUpstreamDO = new DiscoveryUpstreamDO();
discoveryUpstreamDO.setId(id);
- discoveryUpstreamDO.setStatus(1);
+ discoveryUpstreamDO.setUpstreamStatus(1);
discoveryUpstreamDO.setWeight(50);
discoveryUpstreamDO.setDiscoveryHandlerId("123");
Timestamp now = Timestamp.valueOf(LocalDateTime.now());
@@ -235,9 +235,9 @@ public final class DiscoveryUpstreamServiceTest {
private DiscoveryUpstreamDO buildDiscoveryUpstreamDO(final String id,
final String discoveryHandlerId, final String url) {
DiscoveryUpstreamDO discoveryUpstreamDO = new DiscoveryUpstreamDO();
discoveryUpstreamDO.setId(id);
- discoveryUpstreamDO.setStatus(1);
+ discoveryUpstreamDO.setUpstreamStatus(1);
discoveryUpstreamDO.setWeight(50);
- discoveryUpstreamDO.setUrl(url);
+ discoveryUpstreamDO.setUpstreamUrl(url);
discoveryUpstreamDO.setDiscoveryHandlerId(discoveryHandlerId);
Timestamp now = Timestamp.valueOf(LocalDateTime.now());
discoveryUpstreamDO.setDateCreated(now);
