Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
SpringBlade
提交
7233595d
S
SpringBlade
项目概览
int
/
SpringBlade
9 个月 前同步成功
通知
16
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SpringBlade
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
7233595d
编写于
9月 11, 2020
作者:
S
smallchill
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🎉
2.7.3.RELEASE 增强多租户功能
上级
72ffd928
变更
35
隐藏空白更改
内联
并排
Showing
35 changed file
with
124 addition
and
48 deletion
+124
-48
README.md
README.md
+2
-2
blade-auth/pom.xml
blade-auth/pom.xml
+1
-1
blade-common/pom.xml
blade-common/pom.xml
+1
-1
blade-gateway/pom.xml
blade-gateway/pom.xml
+1
-1
blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java
...n/java/org/springblade/gateway/provider/AuthProvider.java
+1
-0
blade-ops/blade-admin/pom.xml
blade-ops/blade-admin/pom.xml
+1
-1
blade-ops/blade-develop/pom.xml
blade-ops/blade-develop/pom.xml
+1
-1
blade-ops/blade-resource/pom.xml
blade-ops/blade-resource/pom.xml
+1
-1
blade-ops/blade-seata-order/pom.xml
blade-ops/blade-seata-order/pom.xml
+1
-1
blade-ops/blade-seata-storage/pom.xml
blade-ops/blade-seata-storage/pom.xml
+1
-1
blade-ops/pom.xml
blade-ops/pom.xml
+1
-1
blade-service-api/blade-demo-api/pom.xml
blade-service-api/blade-demo-api/pom.xml
+1
-1
blade-service-api/blade-desk-api/pom.xml
blade-service-api/blade-desk-api/pom.xml
+1
-1
blade-service-api/blade-dict-api/pom.xml
blade-service-api/blade-dict-api/pom.xml
+1
-1
blade-service-api/blade-system-api/pom.xml
blade-service-api/blade-system-api/pom.xml
+1
-1
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
...i/src/main/java/org/springblade/system/entity/Tenant.java
+5
-0
blade-service-api/blade-user-api/pom.xml
blade-service-api/blade-user-api/pom.xml
+1
-1
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
...n/java/org/springblade/system/user/feign/IUserClient.java
+10
-0
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java
...rg/springblade/system/user/feign/IUserClientFallback.java
+6
-0
blade-service-api/pom.xml
blade-service-api/pom.xml
+2
-2
blade-service/blade-demo/pom.xml
blade-service/blade-demo/pom.xml
+1
-1
blade-service/blade-desk/pom.xml
blade-service/blade-desk/pom.xml
+1
-1
blade-service/blade-log/pom.xml
blade-service/blade-log/pom.xml
+1
-1
blade-service/blade-system/pom.xml
blade-service/blade-system/pom.xml
+6
-1
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
...a/org/springblade/system/controller/TenantController.java
+18
-0
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
...rg/springblade/system/service/impl/TenantServiceImpl.java
+37
-0
blade-service/blade-user/pom.xml
blade-service/blade-user/pom.xml
+1
-1
blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
...in/java/org/springblade/system/user/feign/UserClient.java
+7
-0
blade-service/pom.xml
blade-service/pom.xml
+2
-2
doc/sql/blade/blade-saber-mysql.sql
doc/sql/blade/blade-saber-mysql.sql
+2
-1
doc/sql/blade/blade-sword-mysql.sql
doc/sql/blade/blade-sword-mysql.sql
+2
-1
doc/sql/blade/blade-update-2.7.1~2.7.2.sql
doc/sql/blade/blade-update-2.7.1~2.7.2.sql
+0
-17
doc/sql/blade/blade-update-2.7.2~2.7.3.sql
doc/sql/blade/blade-update-2.7.2~2.7.3.sql
+2
-0
pom.xml
pom.xml
+3
-3
script/docker/.env
script/docker/.env
+1
-1
未找到文件。
README.md
浏览文件 @
7233595d
<p
align=
"center"
>
<p
align=
"center"
>
<img
src=
"https://img.shields.io/badge/Release-V2.7.
2
-green.svg"
alt=
"Downloads"
>
<img
src=
"https://img.shields.io/badge/Release-V2.7.
3
-green.svg"
alt=
"Downloads"
>
<img
src=
"https://img.shields.io/badge/JDK-1.8+-green.svg"
alt=
"Build Status"
>
<img
src=
"https://img.shields.io/badge/JDK-1.8+-green.svg"
alt=
"Build Status"
>
<img
src=
"https://img.shields.io/badge/license-Apache%202-blue.svg"
alt=
"Build Status"
>
<img
src=
"https://img.shields.io/badge/license-Apache%202-blue.svg"
alt=
"Build Status"
>
<img
src=
"https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR
7
-blue.svg"
alt=
"Coverage Status"
>
<img
src=
"https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR
8
-blue.svg"
alt=
"Coverage Status"
>
<img
src=
"https://img.shields.io/badge/Spring%20Boot-2.2.9.RELEASE-blue.svg"
alt=
"Downloads"
>
<img
src=
"https://img.shields.io/badge/Spring%20Boot-2.2.9.RELEASE-blue.svg"
alt=
"Downloads"
>
<a
target=
"_blank"
href=
"https://bladex.vip"
>
<a
target=
"_blank"
href=
"https://bladex.vip"
>
<img
src=
"https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg"
alt=
"Downloads"
>
<img
src=
"https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg"
alt=
"Downloads"
>
...
...
blade-auth/pom.xml
浏览文件 @
7233595d
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
<parent>
<parent>
<artifactId>
SpringBlade
</artifactId>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<artifactId>
blade-auth
</artifactId>
<artifactId>
blade-auth
</artifactId>
...
...
blade-common/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
SpringBlade
</artifactId>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-gateway/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
SpringBlade
</artifactId>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-gateway/src/main/java/org/springblade/gateway/provider/AuthProvider.java
浏览文件 @
7233595d
...
@@ -44,6 +44,7 @@ public class AuthProvider {
...
@@ -44,6 +44,7 @@ public class AuthProvider {
defaultSkipUrl
.
add
(
"/log/**"
);
defaultSkipUrl
.
add
(
"/log/**"
);
defaultSkipUrl
.
add
(
"/menu/routes"
);
defaultSkipUrl
.
add
(
"/menu/routes"
);
defaultSkipUrl
.
add
(
"/menu/auth-routes"
);
defaultSkipUrl
.
add
(
"/menu/auth-routes"
);
defaultSkipUrl
.
add
(
"/tenant/info"
);
defaultSkipUrl
.
add
(
"/order/create/**"
);
defaultSkipUrl
.
add
(
"/order/create/**"
);
defaultSkipUrl
.
add
(
"/storage/deduct/**"
);
defaultSkipUrl
.
add
(
"/storage/deduct/**"
);
defaultSkipUrl
.
add
(
"/error/**"
);
defaultSkipUrl
.
add
(
"/error/**"
);
...
...
blade-ops/blade-admin/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-ops
</artifactId>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-develop/pom.xml
浏览文件 @
7233595d
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<parent>
<parent>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<artifactId>
blade-ops
</artifactId>
<artifactId>
blade-ops
</artifactId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-resource/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-ops
</artifactId>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-seata-order/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-ops
</artifactId>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-seata-storage/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-ops
</artifactId>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
SpringBlade
</artifactId>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-demo-api/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service-api
</artifactId>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-desk-api/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service-api
</artifactId>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-dict-api/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service-api
</artifactId>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-system-api/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service-api
</artifactId>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
浏览文件 @
7233595d
...
@@ -57,6 +57,11 @@ public class Tenant extends BaseEntity {
...
@@ -57,6 +57,11 @@ public class Tenant extends BaseEntity {
*/
*/
@ApiModelProperty
(
value
=
"租户名称"
)
@ApiModelProperty
(
value
=
"租户名称"
)
private
String
tenantName
;
private
String
tenantName
;
/**
* 域名地址
*/
@ApiModelProperty
(
value
=
"域名地址"
)
private
String
domain
;
/**
/**
* 联系人
* 联系人
*/
*/
...
...
blade-service-api/blade-user-api/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service-api
</artifactId>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
浏览文件 @
7233595d
...
@@ -18,6 +18,7 @@ package org.springblade.system.user.feign;
...
@@ -18,6 +18,7 @@ package org.springblade.system.user.feign;
import
org.springblade.core.launch.constant.AppConstant
;
import
org.springblade.core.launch.constant.AppConstant
;
import
org.springblade.core.tool.api.R
;
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.UserInfo
;
import
org.springblade.system.user.entity.UserOauth
;
import
org.springblade.system.user.entity.UserOauth
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.cloud.openfeign.FeignClient
;
...
@@ -68,4 +69,13 @@ public interface IUserClient {
...
@@ -68,4 +69,13 @@ public interface IUserClient {
@PostMapping
(
API_PREFIX
+
"/user-auth-info"
)
@PostMapping
(
API_PREFIX
+
"/user-auth-info"
)
R
<
UserInfo
>
userAuthInfo
(
@RequestBody
UserOauth
userOauth
);
R
<
UserInfo
>
userAuthInfo
(
@RequestBody
UserOauth
userOauth
);
/**
* 新建用户
*
* @param user 用户实体
* @return
*/
@PostMapping
(
API_PREFIX
+
"/save-user"
)
R
<
Boolean
>
saveUser
(
@RequestBody
User
user
);
}
}
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java
浏览文件 @
7233595d
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
package
org.springblade.system.user.feign
;
package
org.springblade.system.user.feign
;
import
org.springblade.core.tool.api.R
;
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.UserInfo
;
import
org.springblade.system.user.entity.UserOauth
;
import
org.springblade.system.user.entity.UserOauth
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
...
@@ -42,4 +43,9 @@ public class IUserClientFallback implements IUserClient {
...
@@ -42,4 +43,9 @@ public class IUserClientFallback implements IUserClient {
public
R
<
UserInfo
>
userAuthInfo
(
UserOauth
userOauth
)
{
public
R
<
UserInfo
>
userAuthInfo
(
UserOauth
userOauth
)
{
return
R
.
fail
(
"未获取到账号信息"
);
return
R
.
fail
(
"未获取到账号信息"
);
}
}
@Override
public
R
<
Boolean
>
saveUser
(
User
user
)
{
return
R
.
fail
(
"创建用户失败"
);
}
}
}
blade-service-api/pom.xml
浏览文件 @
7233595d
...
@@ -5,13 +5,13 @@
...
@@ -5,13 +5,13 @@
<parent>
<parent>
<artifactId>
SpringBlade
</artifactId>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
blade-service-api
</artifactId>
<artifactId>
blade-service-api
</artifactId>
<name>
${project.artifactId}
</name>
<name>
${project.artifactId}
</name>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<description>
SpringBlade 微服务API集合
</description>
<description>
SpringBlade 微服务API集合
</description>
...
...
blade-service/blade-demo/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service
</artifactId>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-desk/pom.xml
浏览文件 @
7233595d
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<parent>
<parent>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<artifactId>
blade-service
</artifactId>
<artifactId>
blade-service
</artifactId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-log/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service
</artifactId>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-system/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service
</artifactId>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
@@ -30,6 +30,11 @@
...
@@ -30,6 +30,11 @@
<artifactId>
blade-system-api
</artifactId>
<artifactId>
blade-system-api
</artifactId>
<version>
${blade.project.version}
</version>
<version>
${blade.project.version}
</version>
</dependency>
</dependency>
<dependency>
<groupId>
org.springblade
</groupId>
<artifactId>
blade-user-api
</artifactId>
<version>
${blade.project.version}
</version>
</dependency>
<!--Zipkin-->
<!--Zipkin-->
<!--<dependency>
<!--<dependency>
<groupId>org.springframework.cloud</groupId>
<groupId>org.springframework.cloud</groupId>
...
...
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
浏览文件 @
7233595d
...
@@ -17,6 +17,7 @@ package org.springblade.system.controller;
...
@@ -17,6 +17,7 @@ package org.springblade.system.controller;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
io.swagger.annotations.*
;
import
io.swagger.annotations.*
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
org.springblade.core.boot.ctrl.BladeController
;
import
org.springblade.core.boot.ctrl.BladeController
;
...
@@ -25,6 +26,7 @@ import org.springblade.core.mp.support.Query;
...
@@ -25,6 +26,7 @@ import org.springblade.core.mp.support.Query;
import
org.springblade.core.secure.BladeUser
;
import
org.springblade.core.secure.BladeUser
;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.constant.BladeConstant
;
import
org.springblade.core.tool.constant.BladeConstant
;
import
org.springblade.core.tool.support.Kv
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.system.entity.Tenant
;
import
org.springblade.system.entity.Tenant
;
import
org.springblade.system.service.ITenantService
;
import
org.springblade.system.service.ITenantService
;
...
@@ -115,5 +117,21 @@ public class TenantController extends BladeController {
...
@@ -115,5 +117,21 @@ public class TenantController extends BladeController {
return
R
.
status
(
tenantService
.
deleteLogic
(
Func
.
toLongList
(
ids
)));
return
R
.
status
(
tenantService
.
deleteLogic
(
Func
.
toLongList
(
ids
)));
}
}
/**
* 根据域名查询信息
*
* @param domain 域名
*/
@GetMapping
(
"/info"
)
@ApiOperation
(
value
=
"配置信息"
,
notes
=
"传入domain"
)
public
R
<
Kv
>
info
(
String
domain
)
{
Tenant
tenant
=
tenantService
.
getOne
(
Wrappers
.<
Tenant
>
query
().
lambda
().
eq
(
Tenant:
:
getDomain
,
domain
));
Kv
kv
=
Kv
.
init
();
if
(
tenant
!=
null
)
{
kv
.
set
(
"tenantId"
,
tenant
.
getTenantId
()).
set
(
"domain"
,
tenant
.
getDomain
());
}
return
R
.
data
(
kv
);
}
}
}
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
浏览文件 @
7233595d
...
@@ -19,19 +19,27 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
...
@@ -19,19 +19,27 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
org.springblade.core.boot.tenant.TenantId
;
import
org.springblade.core.boot.tenant.TenantId
;
import
org.springblade.core.log.exception.ServiceException
;
import
org.springblade.core.mp.base.BaseServiceImpl
;
import
org.springblade.core.mp.base.BaseServiceImpl
;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.constant.BladeConstant
;
import
org.springblade.core.tool.constant.BladeConstant
;
import
org.springblade.core.tool.utils.DigestUtil
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.system.entity.Dept
;
import
org.springblade.system.entity.Dept
;
import
org.springblade.system.entity.Post
;
import
org.springblade.system.entity.Role
;
import
org.springblade.system.entity.Role
;
import
org.springblade.system.entity.Tenant
;
import
org.springblade.system.entity.Tenant
;
import
org.springblade.system.mapper.DeptMapper
;
import
org.springblade.system.mapper.DeptMapper
;
import
org.springblade.system.mapper.PostMapper
;
import
org.springblade.system.mapper.RoleMapper
;
import
org.springblade.system.mapper.RoleMapper
;
import
org.springblade.system.mapper.TenantMapper
;
import
org.springblade.system.mapper.TenantMapper
;
import
org.springblade.system.service.ITenantService
;
import
org.springblade.system.service.ITenantService
;
import
org.springblade.system.user.entity.User
;
import
org.springblade.system.user.feign.IUserClient
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -47,6 +55,8 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
...
@@ -47,6 +55,8 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
private
final
TenantId
tenantId
;
private
final
TenantId
tenantId
;
private
final
RoleMapper
roleMapper
;
private
final
RoleMapper
roleMapper
;
private
final
DeptMapper
deptMapper
;
private
final
DeptMapper
deptMapper
;
private
final
PostMapper
postMapper
;
private
final
IUserClient
userClient
;
@Override
@Override
public
IPage
<
Tenant
>
selectTenantPage
(
IPage
<
Tenant
>
page
,
Tenant
tenant
)
{
public
IPage
<
Tenant
>
selectTenantPage
(
IPage
<
Tenant
>
page
,
Tenant
tenant
)
{
...
@@ -84,6 +94,33 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
...
@@ -84,6 +94,33 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
dept
.
setSort
(
2
);
dept
.
setSort
(
2
);
dept
.
setIsDeleted
(
0
);
dept
.
setIsDeleted
(
0
);
deptMapper
.
insert
(
dept
);
deptMapper
.
insert
(
dept
);
// 新建租户对应的默认岗位
Post
post
=
new
Post
();
post
.
setTenantId
(
tenantId
);
post
.
setCategory
(
1
);
post
.
setPostCode
(
"ceo"
);
post
.
setPostName
(
"首席执行官"
);
post
.
setSort
(
1
);
postMapper
.
insert
(
post
);
// 新建租户对应的默认管理用户
User
user
=
new
User
();
user
.
setTenantId
(
tenantId
);
user
.
setName
(
"admin"
);
user
.
setRealName
(
"admin"
);
user
.
setAccount
(
"admin"
);
user
.
setPassword
(
DigestUtil
.
encrypt
(
"admin"
));
user
.
setRoleId
(
String
.
valueOf
(
role
.
getId
()));
user
.
setDeptId
(
String
.
valueOf
(
dept
.
getId
()));
user
.
setPostId
(
String
.
valueOf
(
post
.
getId
()));
user
.
setBirthday
(
new
Date
());
user
.
setSex
(
1
);
user
.
setIsDeleted
(
BladeConstant
.
DB_NOT_DELETED
);
boolean
temp
=
super
.
saveOrUpdate
(
tenant
);
R
<
Boolean
>
result
=
userClient
.
saveUser
(
user
);
if
(!
result
.
isSuccess
())
{
throw
new
ServiceException
(
result
.
getMsg
());
}
return
temp
;
}
}
return
super
.
saveOrUpdate
(
tenant
);
return
super
.
saveOrUpdate
(
tenant
);
}
}
...
...
blade-service/blade-user/pom.xml
浏览文件 @
7233595d
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
blade-service
</artifactId>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
浏览文件 @
7233595d
...
@@ -17,6 +17,7 @@ package org.springblade.system.user.feign;
...
@@ -17,6 +17,7 @@ package org.springblade.system.user.feign;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
import
org.springblade.core.tool.api.R
;
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.UserInfo
;
import
org.springblade.system.user.entity.UserOauth
;
import
org.springblade.system.user.entity.UserOauth
;
import
org.springblade.system.user.service.IUserService
;
import
org.springblade.system.user.service.IUserService
;
...
@@ -52,4 +53,10 @@ public class UserClient implements IUserClient {
...
@@ -52,4 +53,10 @@ public class UserClient implements IUserClient {
return
R
.
data
(
service
.
userInfo
(
userOauth
));
return
R
.
data
(
service
.
userInfo
(
userOauth
));
}
}
@Override
@PostMapping
(
API_PREFIX
+
"/save-user"
)
public
R
<
Boolean
>
saveUser
(
User
user
)
{
return
R
.
data
(
service
.
save
(
user
));
}
}
}
blade-service/pom.xml
浏览文件 @
7233595d
...
@@ -7,12 +7,12 @@
...
@@ -7,12 +7,12 @@
<parent>
<parent>
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<artifactId>
SpringBlade
</artifactId>
<artifactId>
SpringBlade
</artifactId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
</parent>
</parent>
<artifactId>
blade-service
</artifactId>
<artifactId>
blade-service
</artifactId>
<name>
${project.artifactId}
</name>
<name>
${project.artifactId}
</name>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<description>
SpringBlade 微服务集合
</description>
<description>
SpringBlade 微服务集合
</description>
...
...
doc/sql/blade/blade-saber-mysql.sql
浏览文件 @
7233595d
...
@@ -430,6 +430,7 @@ CREATE TABLE `blade_tenant` (
...
@@ -430,6 +430,7 @@ CREATE TABLE `blade_tenant` (
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'主键'
,
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'主键'
,
`tenant_id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户ID'
,
`tenant_id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户ID'
,
`tenant_name`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户名称'
,
`tenant_name`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户名称'
,
`domain`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'域名地址'
,
`linkman`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系人'
,
`linkman`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系人'
,
`contact_number`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系电话'
,
`contact_number`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系电话'
,
`address`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系地址'
,
`address`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系地址'
,
...
@@ -446,7 +447,7 @@ CREATE TABLE `blade_tenant` (
...
@@ -446,7 +447,7 @@ CREATE TABLE `blade_tenant` (
-- Records of blade_tenant
-- Records of blade_tenant
-- ----------------------------
-- ----------------------------
BEGIN
;
BEGIN
;
INSERT
INTO
`blade_tenant`
VALUES
(
1123598820738675201
,
'000000'
,
'管理组'
,
'admin'
,
'666666'
,
'管理组'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1
,
0
);
INSERT
INTO
`blade_tenant`
VALUES
(
1123598820738675201
,
'000000'
,
'管理组'
,
'
'
,
'
admin'
,
'666666'
,
'管理组'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1
,
0
);
COMMIT
;
COMMIT
;
-- ----------------------------
-- ----------------------------
...
...
doc/sql/blade/blade-sword-mysql.sql
浏览文件 @
7233595d
...
@@ -430,6 +430,7 @@ CREATE TABLE `blade_tenant` (
...
@@ -430,6 +430,7 @@ CREATE TABLE `blade_tenant` (
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'主键'
,
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'主键'
,
`tenant_id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户ID'
,
`tenant_id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户ID'
,
`tenant_name`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户名称'
,
`tenant_name`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户名称'
,
`domain`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'域名地址'
,
`linkman`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系人'
,
`linkman`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系人'
,
`contact_number`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系电话'
,
`contact_number`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系电话'
,
`address`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系地址'
,
`address`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'联系地址'
,
...
@@ -446,7 +447,7 @@ CREATE TABLE `blade_tenant` (
...
@@ -446,7 +447,7 @@ CREATE TABLE `blade_tenant` (
-- Records of blade_tenant
-- Records of blade_tenant
-- ----------------------------
-- ----------------------------
BEGIN
;
BEGIN
;
INSERT
INTO
`blade_tenant`
VALUES
(
1123598820738675201
,
'000000'
,
'管理组'
,
'admin'
,
'666666'
,
'管理组'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1
,
0
);
INSERT
INTO
`blade_tenant`
VALUES
(
1123598820738675201
,
'000000'
,
'管理组'
,
'
'
,
'
admin'
,
'666666'
,
'管理组'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1123598821738675201
,
'2019-01-01 00:00:39'
,
1
,
0
);
COMMIT
;
COMMIT
;
-- ----------------------------
-- ----------------------------
...
...
doc/sql/blade/blade-update-2.7.1~2.7.2.sql
已删除
100644 → 0
浏览文件 @
72ffd928
CREATE
TABLE
`blade_user_oauth`
(
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'主键'
,
`tenant_id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'租户ID'
,
`uuid`
varchar
(
64
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'第三方系统用户ID'
,
`user_id`
bigint
(
64
)
NULL
DEFAULT
NULL
COMMENT
'用户ID'
,
`username`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'账号'
,
`nickname`
varchar
(
64
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'用户名'
,
`avatar`
varchar
(
1000
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'头像'
,
`blog`
varchar
(
50
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'应用主页'
,
`company`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'公司名'
,
`location`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'地址'
,
`email`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'邮件'
,
`remark`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'备注'
,
`gender`
varchar
(
16
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'性别'
,
`source`
varchar
(
16
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'来源'
,
PRIMARY
KEY
(
`id`
)
)
COMMENT
=
'用户第三方认证表'
;
doc/sql/blade/blade-update-2.7.2~2.7.3.sql
0 → 100644
浏览文件 @
7233595d
ALTER
TABLE
`blade_tenant`
ADD
COLUMN
`domain`
varchar
(
255
)
NULL
COMMENT
'域名地址'
AFTER
`tenant_name`
;
pom.xml
浏览文件 @
7233595d
...
@@ -5,12 +5,12 @@
...
@@ -5,12 +5,12 @@
<groupId>
org.springblade
</groupId>
<groupId>
org.springblade
</groupId>
<artifactId>
SpringBlade
</artifactId>
<artifactId>
SpringBlade
</artifactId>
<version>
2.7.
2
</version>
<version>
2.7.
3
</version>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<properties>
<properties>
<blade.tool.version>
2.7.
2
</blade.tool.version>
<blade.tool.version>
2.7.
3
</blade.tool.version>
<blade.project.version>
2.7.
2
</blade.project.version>
<blade.project.version>
2.7.
3
</blade.project.version>
<java.version>
1.8
</java.version>
<java.version>
1.8
</java.version>
<maven.plugin.version>
3.8.1
</maven.plugin.version>
<maven.plugin.version>
3.8.1
</maven.plugin.version>
...
...
script/docker/.env
浏览文件 @
7233595d
REGISTER=192.168.0.157/blade
REGISTER=192.168.0.157/blade
TAG=2.7.
2
TAG=2.7.
3
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录