From 503c853062462d1edb79fffd7e527a64a5cc6b27 Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 14 Sep 2020 14:51:31 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=202.7.3.RELEASE=20=E5=A2=9E=E5=BC=BA?= =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +- blade-auth/pom.xml | 2 +- blade-common/pom.xml | 2 +- blade-gateway/pom.xml | 2 +- .../gateway/provider/AuthProvider.java | 1 + blade-ops/blade-admin/pom.xml | 2 +- blade-ops/blade-develop/pom.xml | 2 +- blade-ops/blade-resource/pom.xml | 2 +- blade-ops/blade-seata-order/pom.xml | 2 +- blade-ops/blade-seata-storage/pom.xml | 2 +- blade-ops/pom.xml | 2 +- blade-service-api/blade-demo-api/pom.xml | 2 +- blade-service-api/blade-desk-api/pom.xml | 2 +- blade-service-api/blade-dict-api/pom.xml | 2 +- blade-service-api/blade-system-api/pom.xml | 2 +- .../org/springblade/system/entity/Tenant.java | 5 +++ blade-service-api/blade-user-api/pom.xml | 2 +- .../system/user/feign/IUserClient.java | 10 +++++ .../user/feign/IUserClientFallback.java | 6 +++ blade-service-api/pom.xml | 4 +- blade-service/blade-demo/pom.xml | 2 +- blade-service/blade-desk/pom.xml | 2 +- blade-service/blade-log/pom.xml | 2 +- blade-service/blade-system/pom.xml | 7 +++- .../system/controller/TenantController.java | 18 +++++++++ .../service/impl/TenantServiceImpl.java | 37 +++++++++++++++++++ blade-service/blade-user/pom.xml | 2 +- .../system/user/feign/UserClient.java | 7 ++++ blade-service/pom.xml | 4 +- doc/sql/blade/blade-saber-mysql.sql | 3 +- doc/sql/blade/blade-sword-mysql.sql | 3 +- doc/sql/blade/blade-update-2.7.1~2.7.2.sql | 17 --------- doc/sql/blade/blade-update-2.7.2~2.7.3.sql | 2 + pom.xml | 6 +-- script/docker/.env | 2 +- 35 files changed, 124 insertions(+), 48 deletions(-) delete mode 100644 doc/sql/blade/blade-update-2.7.1~2.7.2.sql create mode 100644 doc/sql/blade/blade-update-2.7.2~2.7.3.sql diff --git a/README.md b/README.md index 8f6ba28..080b12d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@

- Downloads + Downloads Build Status Build Status - Coverage Status + Coverage Status Downloads Downloads diff --git a/blade-auth/pom.xml b/blade-auth/pom.xml index 3fb5cb5..4c18ef4 100644 --- a/blade-auth/pom.xml +++ b/blade-auth/pom.xml @@ -8,7 +8,7 @@ SpringBlade org.springblade - 2.7.2 + 2.7.3 blade-auth diff --git a/blade-common/pom.xml b/blade-common/pom.xml index 34837d1..b1eec1c 100644 --- a/blade-common/pom.xml +++ b/blade-common/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-gateway/pom.xml b/blade-gateway/pom.xml index ff88f7d..de19282 100644 --- a/blade-gateway/pom.xml +++ b/blade-gateway/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java b/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java index dcd9104..4fdc027 100644 --- a/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java +++ b/blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java @@ -44,6 +44,7 @@ public class AuthProvider { defaultSkipUrl.add("/log/**"); defaultSkipUrl.add("/menu/routes"); defaultSkipUrl.add("/menu/auth-routes"); + defaultSkipUrl.add("/tenant/info"); defaultSkipUrl.add("/order/create/**"); defaultSkipUrl.add("/storage/deduct/**"); defaultSkipUrl.add("/error/**"); diff --git a/blade-ops/blade-admin/pom.xml b/blade-ops/blade-admin/pom.xml index 66b43aa..4b6e9f8 100644 --- a/blade-ops/blade-admin/pom.xml +++ b/blade-ops/blade-admin/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-ops/blade-develop/pom.xml b/blade-ops/blade-develop/pom.xml index a204487..d28a39c 100644 --- a/blade-ops/blade-develop/pom.xml +++ b/blade-ops/blade-develop/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-ops - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-ops/blade-resource/pom.xml b/blade-ops/blade-resource/pom.xml index ffaa170..267b886 100644 --- a/blade-ops/blade-resource/pom.xml +++ b/blade-ops/blade-resource/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-ops/blade-seata-order/pom.xml b/blade-ops/blade-seata-order/pom.xml index 6117071..2384e43 100644 --- a/blade-ops/blade-seata-order/pom.xml +++ b/blade-ops/blade-seata-order/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-ops/blade-seata-storage/pom.xml b/blade-ops/blade-seata-storage/pom.xml index 6f9c309..cbf29a6 100644 --- a/blade-ops/blade-seata-storage/pom.xml +++ b/blade-ops/blade-seata-storage/pom.xml @@ -5,7 +5,7 @@ blade-ops org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-ops/pom.xml b/blade-ops/pom.xml index b10a71a..803666a 100644 --- a/blade-ops/pom.xml +++ b/blade-ops/pom.xml @@ -5,7 +5,7 @@ SpringBlade org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service-api/blade-demo-api/pom.xml b/blade-service-api/blade-demo-api/pom.xml index 6b8b413..670586e 100644 --- a/blade-service-api/blade-demo-api/pom.xml +++ b/blade-service-api/blade-demo-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 616fda5..b8494a9 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service-api/blade-dict-api/pom.xml b/blade-service-api/blade-dict-api/pom.xml index 70519c6..5a4531e 100644 --- a/blade-service-api/blade-dict-api/pom.xml +++ b/blade-service-api/blade-dict-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service-api/blade-system-api/pom.xml b/blade-service-api/blade-system-api/pom.xml index f10cb38..88d3db5 100644 --- a/blade-service-api/blade-system-api/pom.xml +++ b/blade-service-api/blade-system-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java index adad110..a9b6915 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java @@ -57,6 +57,11 @@ public class Tenant extends BaseEntity { */ @ApiModelProperty(value = "租户名称") private String tenantName; + /** + * 域名地址 + */ + @ApiModelProperty(value = "域名地址") + private String domain; /** * 联系人 */ diff --git a/blade-service-api/blade-user-api/pom.xml b/blade-service-api/blade-user-api/pom.xml index baade0a..6ecbd3d 100644 --- a/blade-service-api/blade-user-api/pom.xml +++ b/blade-service-api/blade-user-api/pom.xml @@ -5,7 +5,7 @@ blade-service-api org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java index d4521ad..d23693a 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java @@ -18,6 +18,7 @@ package org.springblade.system.user.feign; import org.springblade.core.launch.constant.AppConstant; import org.springblade.core.tool.api.R; +import org.springblade.system.user.entity.User; import org.springblade.system.user.entity.UserInfo; import org.springblade.system.user.entity.UserOauth; import org.springframework.cloud.openfeign.FeignClient; @@ -68,4 +69,13 @@ public interface IUserClient { @PostMapping(API_PREFIX + "/user-auth-info") R userAuthInfo(@RequestBody UserOauth userOauth); + /** + * 新建用户 + * + * @param user 用户实体 + * @return + */ + @PostMapping(API_PREFIX + "/save-user") + R saveUser(@RequestBody User user); + } diff --git a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java index 82c9fc2..25a2851 100644 --- a/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java +++ b/blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java @@ -16,6 +16,7 @@ package org.springblade.system.user.feign; import org.springblade.core.tool.api.R; +import org.springblade.system.user.entity.User; import org.springblade.system.user.entity.UserInfo; import org.springblade.system.user.entity.UserOauth; import org.springframework.stereotype.Component; @@ -42,4 +43,9 @@ public class IUserClientFallback implements IUserClient { public R userAuthInfo(UserOauth userOauth) { return R.fail("未获取到账号信息"); } + + @Override + public R saveUser(User user) { + return R.fail("创建用户失败"); + } } diff --git a/blade-service-api/pom.xml b/blade-service-api/pom.xml index 710ce79..b4771d5 100644 --- a/blade-service-api/pom.xml +++ b/blade-service-api/pom.xml @@ -5,13 +5,13 @@ SpringBlade org.springblade - 2.7.2 + 2.7.3 4.0.0 blade-service-api ${project.artifactId} - 2.7.2 + 2.7.3 pom SpringBlade 微服务API集合 diff --git a/blade-service/blade-demo/pom.xml b/blade-service/blade-demo/pom.xml index 1febf83..9889851 100644 --- a/blade-service/blade-demo/pom.xml +++ b/blade-service/blade-demo/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service/blade-desk/pom.xml b/blade-service/blade-desk/pom.xml index 6de212d..743b4e4 100644 --- a/blade-service/blade-desk/pom.xml +++ b/blade-service/blade-desk/pom.xml @@ -6,7 +6,7 @@ org.springblade blade-service - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service/blade-log/pom.xml b/blade-service/blade-log/pom.xml index f2b7d54..00dec19 100644 --- a/blade-service/blade-log/pom.xml +++ b/blade-service/blade-log/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.7.2 + 2.7.3 4.0.0 diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml index 0345b3b..ae9ee40 100644 --- a/blade-service/blade-system/pom.xml +++ b/blade-service/blade-system/pom.xml @@ -5,7 +5,7 @@ blade-service org.springblade - 2.7.2 + 2.7.3 4.0.0 @@ -30,6 +30,11 @@ blade-system-api ${blade.project.version} + + org.springblade + blade-user-api + ${blade.project.version} +