From 0427a86c6d90950eeafa4bc8f36f44a8909cbc3c Mon Sep 17 00:00:00 2001 From: liyabing Date: Wed, 22 Jan 2025 16:11:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=8D=E7=A7=B0=E7=A9=BA?= =?UTF-8?q?=E9=97=B4=E5=88=A0=E9=99=A4=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/upgrade/2.7.0-upgrade-2.7.1-mysql.sql | 8 ++++- .../shenyu/admin/model/entity/AuthPathDO.java | 35 ++++++++++++++++--- .../resources/mappers/auth-path-sqlmap.xml | 1 + 3 files changed, 39 insertions(+), 5 deletions(-) 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 7e4a8d5c5389..7a352583ce2a 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 @@ -15,4 +15,10 @@ -- limitations under the License. -- this file works for MySQL. -INSERT INTO `plugin_handle` VALUES ('1722804548510507032', '19', 'handleType', 'handleType', 2, 3, 1, '{"required":"0","rule":""}', '2025-01-02 17:20:50.233', '2025-01-02 17:20:50.233'); \ No newline at end of file +INSERT INTO `plugin_handle` VALUES ('1722804548510507032', '19', 'handleType', 'handleType', 2, 3, 1, '{"required":"0","rule":""}', '2025-01-02 17:20:50.233', '2025-01-02 17:20:50.233'); + +ALTER TABLE `auth_path` ADD COLUMN `namespace_id` varchar(50) NOT NULL COMMENT 'namespaceId' AFTER `path`; + +UPDATE auth_path +SET namespace_id = '649330b6-c2d7-4edc-be8e-8a54df9eb385' +WHERE namespace_id IS NULL; \ No newline at end of file diff --git a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthPathDO.java b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthPathDO.java index f21c07669746..c15fef99703b 100644 --- a/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthPathDO.java +++ b/shenyu-admin/src/main/java/org/apache/shenyu/admin/model/entity/AuthPathDO.java @@ -37,14 +37,17 @@ public final class AuthPathDO extends BaseDO { private Boolean enabled; + private String namespaceId; + public AuthPathDO() { } - public AuthPathDO(final String authId, final String appName, final String path, final Boolean enabled) { + public AuthPathDO(final String authId, final String appName, final String path, final Boolean enabled, final String namespaceId) { this.authId = authId; this.appName = appName; this.path = path; this.enabled = enabled; + this.namespaceId= namespaceId; } /** @@ -119,6 +122,15 @@ public void setEnabled(final Boolean enabled) { this.enabled = enabled; } + /** + * set namespaceId. + * + * @param namespaceId namespaceId + */ + public void setNamespaceId(final String namespaceId) { + this.namespaceId = namespaceId; + } + /** * Build AuthPathDO object with given params. * @@ -127,7 +139,7 @@ public void setEnabled(final Boolean enabled) { * @param appName {@linkplain String} * @return {@linkplain AuthPathDO} */ - public static AuthPathDO create(final String path, final String authId, final String appName) { + public static AuthPathDO create(final String path, final String authId, final String appName,final String namespaceId) { Timestamp currentTime = new Timestamp(System.currentTimeMillis()); return AuthPathDO.builder() .id(UUIDUtils.getInstance().generateShortUuid()) @@ -135,6 +147,7 @@ public static AuthPathDO create(final String path, final String authId, final St .appName(appName) .path(path) .enabled(true) + .namespaceId(namespaceId) .dateCreated(currentTime) .dateUpdated(currentTime) .build(); @@ -152,12 +165,12 @@ public boolean equals(final Object o) { return false; } AuthPathDO that = (AuthPathDO) o; - return Objects.equals(authId, that.authId) && Objects.equals(appName, that.appName) && Objects.equals(path, that.path) && Objects.equals(enabled, that.enabled); + return Objects.equals(authId, that.authId) && Objects.equals(appName, that.appName) && Objects.equals(path, that.path) && Objects.equals(namespaceId, that.namespaceId) && Objects.equals(enabled, that.enabled); } @Override public int hashCode() { - return Objects.hash(super.hashCode(), authId, appName, path, enabled); + return Objects.hash(super.hashCode(), authId, appName, path, enabled,namespaceId); } /** @@ -179,6 +192,8 @@ public static final class AuthPathDOBuilder { private Boolean enabled; + private String namespaceId; + private String id; private Timestamp dateCreated; @@ -243,6 +258,17 @@ public AuthPathDOBuilder id(final String id) { return this; } + /** + * namespaceId. + * + * @param namespaceId namespaceId + * @return AppAuthDOBuilder + */ + public AuthPathDOBuilder namespaceId(final String namespaceId) { + this.namespaceId = namespaceId; + return this; + } + /** * dateCreated. * @@ -277,6 +303,7 @@ public AuthPathDO build() { authPathDO.setPath(path); authPathDO.setEnabled(enabled); authPathDO.setId(id); + authPathDO.setNamespaceId(namespaceId); authPathDO.setDateCreated(dateCreated); authPathDO.setDateUpdated(dateUpdated); return authPathDO; diff --git a/shenyu-admin/src/main/resources/mappers/auth-path-sqlmap.xml b/shenyu-admin/src/main/resources/mappers/auth-path-sqlmap.xml index d33c02543be1..a6de9f92b803 100644 --- a/shenyu-admin/src/main/resources/mappers/auth-path-sqlmap.xml +++ b/shenyu-admin/src/main/resources/mappers/auth-path-sqlmap.xml @@ -23,6 +23,7 @@ +