Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
SpringBlade
提交
c4d85f05
S
SpringBlade
项目概览
int
/
SpringBlade
10 个月 前同步成功
通知
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 搜索 >>
提交
c4d85f05
编写于
8月 04, 2019
作者:
S
smallchill
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🎉
2.4.0.RELEASE
上级
37890342
变更
49
隐藏空白更改
内联
并排
Showing
49 changed file
with
111 addition
and
110 deletion
+111
-110
blade-auth/pom.xml
blade-auth/pom.xml
+1
-1
blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java
.../java/org/springblade/auth/controller/AuthController.java
+3
-3
blade-auth/src/main/java/org/springblade/auth/granter/PasswordTokenGranter.java
...va/org/springblade/auth/granter/PasswordTokenGranter.java
+4
-4
blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
...h/src/main/java/org/springblade/auth/utils/TokenUtil.java
+2
-2
blade-common/pom.xml
blade-common/pom.xml
+1
-1
blade-gateway/pom.xml
blade-gateway/pom.xml
+4
-3
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/pom.xml
blade-ops/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/Dept.java
...api/src/main/java/org/springblade/system/entity/Dept.java
+3
-3
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java
...api/src/main/java/org/springblade/system/entity/Role.java
+3
-3
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
+3
-3
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
+2
-2
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java
...rg/springblade/system/user/feign/IUserClientFallback.java
+1
-1
blade-service-api/pom.xml
blade-service-api/pom.xml
+2
-2
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
+1
-1
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
...ava/org/springblade/system/controller/DeptController.java
+4
-4
blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
...ava/org/springblade/system/controller/RoleController.java
+4
-4
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
...a/org/springblade/system/controller/TenantController.java
+3
-3
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
...c/main/java/org/springblade/system/mapper/DeptMapper.java
+2
-2
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
...rc/main/java/org/springblade/system/mapper/DeptMapper.xml
+1
-1
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java
...c/main/java/org/springblade/system/mapper/RoleMapper.java
+2
-2
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml
...rc/main/java/org/springblade/system/mapper/RoleMapper.xml
+1
-1
blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
...ain/java/org/springblade/system/service/IDeptService.java
+2
-2
blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java
...ain/java/org/springblade/system/service/IRoleService.java
+2
-2
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
.../org/springblade/system/service/impl/DeptServiceImpl.java
+2
-2
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
.../org/springblade/system/service/impl/MenuServiceImpl.java
+1
-1
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
.../org/springblade/system/service/impl/RoleServiceImpl.java
+2
-2
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
...rg/springblade/system/service/impl/TenantServiceImpl.java
+7
-7
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/controller/UserController.java
...rg/springblade/system/user/controller/UserController.java
+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
+2
-2
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
...n/java/org/springblade/system/user/mapper/UserMapper.java
+2
-2
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
...in/java/org/springblade/system/user/mapper/UserMapper.xml
+2
-2
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
...ava/org/springblade/system/user/service/IUserService.java
+2
-2
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
...springblade/system/user/service/impl/UserServiceImpl.java
+3
-3
blade-service/pom.xml
blade-service/pom.xml
+2
-2
doc/nacos/blade.yaml
doc/nacos/blade.yaml
+1
-1
doc/sql/blade-saber-mysql.sql
doc/sql/blade-saber-mysql.sql
+8
-8
doc/sql/blade-sword-mysql.sql
doc/sql/blade-sword-mysql.sql
+8
-8
pom.xml
pom.xml
+5
-5
script/docker/.env
script/docker/.env
+1
-1
未找到文件。
blade-auth/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -8,7 +8,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<artifactId>
blade-auth
</artifactId>
...
...
blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java
浏览文件 @
c4d85f05
...
...
@@ -43,17 +43,17 @@ import org.springframework.web.bind.annotation.RestController;
public
class
AuthController
{
@PostMapping
(
"token"
)
@ApiOperation
(
value
=
"获取认证token"
,
notes
=
"传入租户
编号:tenantCode
,账号:account,密码:password"
)
@ApiOperation
(
value
=
"获取认证token"
,
notes
=
"传入租户
ID:tenantId
,账号:account,密码:password"
)
public
R
<
AuthInfo
>
token
(
@ApiParam
(
value
=
"授权类型"
,
required
=
true
)
@RequestParam
(
defaultValue
=
"password"
,
required
=
false
)
String
grantType
,
@ApiParam
(
value
=
"刷新令牌"
)
@RequestParam
(
required
=
false
)
String
refreshToken
,
@ApiParam
(
value
=
"租户
编号"
,
required
=
true
)
@RequestParam
(
defaultValue
=
"000000"
,
required
=
false
)
String
tenantCode
,
@ApiParam
(
value
=
"租户
ID"
,
required
=
true
)
@RequestParam
(
defaultValue
=
"000000"
,
required
=
false
)
String
tenantId
,
@ApiParam
(
value
=
"账号"
)
@RequestParam
(
required
=
false
)
String
account
,
@ApiParam
(
value
=
"密码"
)
@RequestParam
(
required
=
false
)
String
password
)
{
String
userType
=
Func
.
toStr
(
WebUtil
.
getRequest
().
getHeader
(
TokenUtil
.
USER_TYPE_HEADER_KEY
),
TokenUtil
.
DEFAULT_USER_TYPE
);
TokenParameter
tokenParameter
=
new
TokenParameter
();
tokenParameter
.
getArgs
().
set
(
"tenant
Code"
,
tenantCode
).
set
(
"account"
,
account
).
set
(
"password"
,
password
).
set
(
"grantType"
,
grantType
).
set
(
"refreshToken"
,
refreshToken
).
set
(
"userType"
,
userType
);
tokenParameter
.
getArgs
().
set
(
"tenant
Id"
,
tenantId
).
set
(
"account"
,
account
).
set
(
"password"
,
password
).
set
(
"grantType"
,
grantType
).
set
(
"refreshToken"
,
refreshToken
).
set
(
"userType"
,
userType
);
ITokenGranter
granter
=
TokenGranterBuilder
.
getGranter
(
grantType
);
UserInfo
userInfo
=
granter
.
grant
(
tokenParameter
);
...
...
blade-auth/src/main/java/org/springblade/auth/granter/PasswordTokenGranter.java
浏览文件 @
c4d85f05
...
...
@@ -39,7 +39,7 @@ public class PasswordTokenGranter implements ITokenGranter {
@Override
public
UserInfo
grant
(
TokenParameter
tokenParameter
)
{
String
tenant
Code
=
tokenParameter
.
getArgs
().
getStr
(
"tenantCode
"
);
String
tenant
Id
=
tokenParameter
.
getArgs
().
getStr
(
"tenantId
"
);
String
account
=
tokenParameter
.
getArgs
().
getStr
(
"account"
);
String
password
=
tokenParameter
.
getArgs
().
getStr
(
"password"
);
UserInfo
userInfo
=
null
;
...
...
@@ -49,11 +49,11 @@ public class PasswordTokenGranter implements ITokenGranter {
R
<
UserInfo
>
result
;
// 根据不同用户类型调用对应的接口返回数据,用户可自行拓展
if
(
userType
.
equals
(
BladeUserEnum
.
WEB
.
getName
()))
{
result
=
userClient
.
userInfo
(
tenant
Code
,
account
,
DigestUtil
.
encrypt
(
password
));
result
=
userClient
.
userInfo
(
tenant
Id
,
account
,
DigestUtil
.
encrypt
(
password
));
}
else
if
(
userType
.
equals
(
BladeUserEnum
.
APP
.
getName
()))
{
result
=
userClient
.
userInfo
(
tenant
Code
,
account
,
DigestUtil
.
encrypt
(
password
));
result
=
userClient
.
userInfo
(
tenant
Id
,
account
,
DigestUtil
.
encrypt
(
password
));
}
else
{
result
=
userClient
.
userInfo
(
tenant
Code
,
account
,
DigestUtil
.
encrypt
(
password
));
result
=
userClient
.
userInfo
(
tenant
Id
,
account
,
DigestUtil
.
encrypt
(
password
));
}
userInfo
=
result
.
isSuccess
()
?
result
.
getData
()
:
null
;
}
...
...
blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java
浏览文件 @
c4d85f05
...
...
@@ -33,7 +33,7 @@ import java.util.Map;
*/
public
class
TokenUtil
{
public
final
static
String
TENANT_HEADER_KEY
=
"Tenant-
Code
"
;
public
final
static
String
TENANT_HEADER_KEY
=
"Tenant-
Id
"
;
public
final
static
String
DEFAULT_TENANT_ID
=
"000000"
;
public
final
static
String
USER_TYPE_HEADER_KEY
=
"User-Type"
;
public
final
static
String
DEFAULT_USER_TYPE
=
"web"
;
...
...
@@ -54,7 +54,7 @@ public class TokenUtil {
//设置jwt参数
Map
<
String
,
String
>
param
=
new
HashMap
<>(
16
);
param
.
put
(
TokenConstant
.
TOKEN_TYPE
,
TokenConstant
.
ACCESS_TOKEN
);
param
.
put
(
TokenConstant
.
TENANT_
CODE
,
user
.
getTenantCode
());
param
.
put
(
TokenConstant
.
TENANT_
ID
,
user
.
getTenantId
());
param
.
put
(
TokenConstant
.
USER_ID
,
Func
.
toStr
(
user
.
getId
()));
param
.
put
(
TokenConstant
.
ROLE_ID
,
user
.
getRoleId
());
param
.
put
(
TokenConstant
.
ACCOUNT
,
user
.
getAccount
());
...
...
blade-common/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-gateway/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
@@ -66,13 +66,14 @@
</exclusion>
</exclusions>
</dependency>
<!-- Nacos -->
<dependency>
<groupId>
org.springframework
.cloud
</groupId>
<groupId>
com.alibaba
.cloud
</groupId>
<artifactId>
spring-cloud-starter-alibaba-nacos-discovery
</artifactId>
<version>
${alibaba.cloud.version}
</version>
</dependency>
<dependency>
<groupId>
org.springframework
.cloud
</groupId>
<groupId>
com.alibaba
.cloud
</groupId>
<artifactId>
spring-cloud-starter-alibaba-nacos-config
</artifactId>
<version>
${alibaba.cloud.version}
</version>
</dependency>
...
...
blade-ops/blade-admin/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-develop/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
org.springblade
</groupId>
<artifactId>
blade-ops
</artifactId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/blade-resource/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-ops
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-ops/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-desk-api/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-dict-api/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-system-api/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Dept.java
浏览文件 @
c4d85f05
...
...
@@ -45,10 +45,10 @@ public class Dept implements Serializable {
private
Integer
id
;
/**
* 租户
编号
* 租户
ID
*/
@ApiModelProperty
(
value
=
"租户
编号
"
)
private
String
tenant
Code
;
@ApiModelProperty
(
value
=
"租户
ID
"
)
private
String
tenant
Id
;
/**
* 父主键
...
...
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Role.java
浏览文件 @
c4d85f05
...
...
@@ -45,10 +45,10 @@ public class Role implements Serializable {
private
Integer
id
;
/**
* 租户
编号
* 租户
ID
*/
@ApiModelProperty
(
value
=
"租户
编号
"
)
private
String
tenant
Code
;
@ApiModelProperty
(
value
=
"租户
ID
"
)
private
String
tenant
Id
;
/**
* 父主键
...
...
blade-service-api/blade-system-api/src/main/java/org/springblade/system/entity/Tenant.java
浏览文件 @
c4d85f05
...
...
@@ -45,10 +45,10 @@ public class Tenant extends BaseEntity {
private
Integer
id
;
/**
* 租户
编号
* 租户
ID
*/
@ApiModelProperty
(
value
=
"租户
编号
"
)
private
String
tenant
Code
;
@ApiModelProperty
(
value
=
"租户
ID
"
)
private
String
tenant
Id
;
/**
* 租户名称
*/
...
...
blade-service-api/blade-user-api/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service-api
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java
浏览文件 @
c4d85f05
...
...
@@ -48,12 +48,12 @@ public interface IUserClient {
/**
* 获取用户信息
*
* @param tenant
Code 租户编号
* @param tenant
Id 租户ID
* @param account 账号
* @param password 密码
* @return
*/
@GetMapping
(
API_PREFIX
+
"/user-info"
)
R
<
UserInfo
>
userInfo
(
@RequestParam
(
"tenant
Code"
)
String
tenantCode
,
@RequestParam
(
"account"
)
String
account
,
@RequestParam
(
"password"
)
String
password
);
R
<
UserInfo
>
userInfo
(
@RequestParam
(
"tenant
Id"
)
String
tenantId
,
@RequestParam
(
"account"
)
String
account
,
@RequestParam
(
"password"
)
String
password
);
}
blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClientFallback.java
浏览文件 @
c4d85f05
...
...
@@ -33,7 +33,7 @@ public class IUserClientFallback implements IUserClient {
}
@Override
public
R
<
UserInfo
>
userInfo
(
String
tenant
Code
,
String
account
,
String
password
)
{
public
R
<
UserInfo
>
userInfo
(
String
tenant
Id
,
String
account
,
String
password
)
{
return
R
.
fail
(
"未获取到账号信息"
);
}
}
blade-service-api/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,13 +5,13 @@
<parent>
<artifactId>
SpringBlade
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
blade-service-api
</artifactId>
<name>
${project.artifactId}
</name>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
<packaging>
pom
</packaging>
<description>
SpringBlade 微服务API集合
</description>
...
...
blade-service/blade-desk/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -6,7 +6,7 @@
<parent>
<groupId>
org.springblade
</groupId>
<artifactId>
blade-service
</artifactId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-log/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-system/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
浏览文件 @
c4d85f05
...
...
@@ -72,7 +72,7 @@ public class DeptController extends BladeController {
@ApiOperation
(
value
=
"列表"
,
notes
=
"传入dept"
)
public
R
<
List
<
INode
>>
list
(
@ApiIgnore
@RequestParam
Map
<
String
,
Object
>
dept
,
BladeUser
bladeUser
)
{
QueryWrapper
<
Dept
>
queryWrapper
=
Condition
.
getQueryWrapper
(
dept
,
Dept
.
class
);
List
<
Dept
>
list
=
deptService
.
list
((!
bladeUser
.
getTenant
Code
().
equals
(
BladeConstant
.
ADMIN_TENANT_CODE
))
?
queryWrapper
.
lambda
().
eq
(
Dept:
:
getTenantCode
,
bladeUser
.
getTenantCode
())
:
queryWrapper
);
List
<
Dept
>
list
=
deptService
.
list
((!
bladeUser
.
getTenant
Id
().
equals
(
BladeConstant
.
ADMIN_TENANT_ID
))
?
queryWrapper
.
lambda
().
eq
(
Dept:
:
getTenantId
,
bladeUser
.
getTenantId
())
:
queryWrapper
);
return
R
.
data
(
DeptWrapper
.
build
().
listNodeVO
(
list
));
}
...
...
@@ -84,8 +84,8 @@ public class DeptController extends BladeController {
@GetMapping
(
"/tree"
)
@ApiOperationSupport
(
order
=
3
)
@ApiOperation
(
value
=
"树形结构"
,
notes
=
"树形结构"
)
public
R
<
List
<
DeptVO
>>
tree
(
String
tenant
Code
,
BladeUser
bladeUser
)
{
List
<
DeptVO
>
tree
=
deptService
.
tree
(
Func
.
toStr
(
tenant
Code
,
bladeUser
.
getTenantCode
()));
public
R
<
List
<
DeptVO
>>
tree
(
String
tenant
Id
,
BladeUser
bladeUser
)
{
List
<
DeptVO
>
tree
=
deptService
.
tree
(
Func
.
toStr
(
tenant
Id
,
bladeUser
.
getTenantId
()));
return
R
.
data
(
tree
);
}
...
...
@@ -97,7 +97,7 @@ public class DeptController extends BladeController {
@ApiOperation
(
value
=
"新增或修改"
,
notes
=
"传入dept"
)
public
R
submit
(
@Valid
@RequestBody
Dept
dept
,
BladeUser
user
)
{
if
(
Func
.
isEmpty
(
dept
.
getId
()))
{
dept
.
setTenant
Code
(
user
.
getTenantCode
());
dept
.
setTenant
Id
(
user
.
getTenantId
());
}
return
R
.
status
(
deptService
.
saveOrUpdate
(
dept
));
}
...
...
blade-service/blade-system/src/main/java/org/springblade/system/controller/RoleController.java
浏览文件 @
c4d85f05
...
...
@@ -72,7 +72,7 @@ public class RoleController extends BladeController {
@ApiOperation
(
value
=
"列表"
,
notes
=
"传入role"
)
public
R
<
List
<
INode
>>
list
(
@ApiIgnore
@RequestParam
Map
<
String
,
Object
>
role
,
BladeUser
bladeUser
)
{
QueryWrapper
<
Role
>
queryWrapper
=
Condition
.
getQueryWrapper
(
role
,
Role
.
class
);
List
<
Role
>
list
=
roleService
.
list
((!
bladeUser
.
getTenant
Code
().
equals
(
BladeConstant
.
ADMIN_TENANT_CODE
))
?
queryWrapper
.
lambda
().
eq
(
Role:
:
getTenantCode
,
bladeUser
.
getTenantCode
())
:
queryWrapper
);
List
<
Role
>
list
=
roleService
.
list
((!
bladeUser
.
getTenant
Id
().
equals
(
BladeConstant
.
ADMIN_TENANT_ID
))
?
queryWrapper
.
lambda
().
eq
(
Role:
:
getTenantId
,
bladeUser
.
getTenantId
())
:
queryWrapper
);
return
R
.
data
(
RoleWrapper
.
build
().
listNodeVO
(
list
));
}
...
...
@@ -82,8 +82,8 @@ public class RoleController extends BladeController {
@GetMapping
(
"/tree"
)
@ApiOperationSupport
(
order
=
3
)
@ApiOperation
(
value
=
"树形结构"
,
notes
=
"树形结构"
)
public
R
<
List
<
RoleVO
>>
tree
(
String
tenant
Code
,
BladeUser
bladeUser
)
{
List
<
RoleVO
>
tree
=
roleService
.
tree
(
Func
.
toStr
(
tenant
Code
,
bladeUser
.
getTenantCode
()));
public
R
<
List
<
RoleVO
>>
tree
(
String
tenant
Id
,
BladeUser
bladeUser
)
{
List
<
RoleVO
>
tree
=
roleService
.
tree
(
Func
.
toStr
(
tenant
Id
,
bladeUser
.
getTenantId
()));
return
R
.
data
(
tree
);
}
...
...
@@ -95,7 +95,7 @@ public class RoleController extends BladeController {
@ApiOperation
(
value
=
"新增或修改"
,
notes
=
"传入role"
)
public
R
submit
(
@Valid
@RequestBody
Role
role
,
BladeUser
user
)
{
if
(
Func
.
isEmpty
(
role
.
getId
()))
{
role
.
setTenant
Code
(
user
.
getTenantCode
());
role
.
setTenant
Id
(
user
.
getTenantId
());
}
return
R
.
status
(
roleService
.
saveOrUpdate
(
role
));
}
...
...
blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
浏览文件 @
c4d85f05
...
...
@@ -64,14 +64,14 @@ public class TenantController extends BladeController {
*/
@GetMapping
(
"/list"
)
@ApiImplicitParams
({
@ApiImplicitParam
(
name
=
"tenant
Code
"
,
value
=
"参数名称"
,
paramType
=
"query"
,
dataType
=
"string"
),
@ApiImplicitParam
(
name
=
"tenant
Id
"
,
value
=
"参数名称"
,
paramType
=
"query"
,
dataType
=
"string"
),
@ApiImplicitParam
(
name
=
"tenantName"
,
value
=
"角色别名"
,
paramType
=
"query"
,
dataType
=
"string"
),
@ApiImplicitParam
(
name
=
"contactNumber"
,
value
=
"联系电话"
,
paramType
=
"query"
,
dataType
=
"string"
)
})
@ApiOperation
(
value
=
"分页"
,
notes
=
"传入tenant"
)
public
R
<
IPage
<
Tenant
>>
list
(
@ApiIgnore
@RequestParam
Map
<
String
,
Object
>
tenant
,
Query
query
,
BladeUser
bladeUser
)
{
QueryWrapper
<
Tenant
>
queryWrapper
=
Condition
.
getQueryWrapper
(
tenant
,
Tenant
.
class
);
IPage
<
Tenant
>
pages
=
tenantService
.
page
(
Condition
.
getPage
(
query
),
(!
bladeUser
.
getTenant
Code
().
equals
(
BladeConstant
.
ADMIN_TENANT_CODE
))
?
queryWrapper
.
lambda
().
eq
(
Tenant:
:
getTenantCode
,
bladeUser
.
getTenantCode
())
:
queryWrapper
);
IPage
<
Tenant
>
pages
=
tenantService
.
page
(
Condition
.
getPage
(
query
),
(!
bladeUser
.
getTenant
Id
().
equals
(
BladeConstant
.
ADMIN_TENANT_ID
))
?
queryWrapper
.
lambda
().
eq
(
Tenant:
:
getTenantId
,
bladeUser
.
getTenantId
())
:
queryWrapper
);
return
R
.
data
(
pages
);
}
...
...
@@ -82,7 +82,7 @@ public class TenantController extends BladeController {
@ApiOperation
(
value
=
"下拉数据源"
,
notes
=
"传入tenant"
)
public
R
<
List
<
Tenant
>>
select
(
Tenant
tenant
,
BladeUser
bladeUser
)
{
QueryWrapper
<
Tenant
>
queryWrapper
=
Condition
.
getQueryWrapper
(
tenant
);
List
<
Tenant
>
list
=
tenantService
.
list
((!
bladeUser
.
getTenant
Code
().
equals
(
BladeConstant
.
ADMIN_TENANT_CODE
))
?
queryWrapper
.
lambda
().
eq
(
Tenant:
:
getTenantCode
,
bladeUser
.
getTenantCode
())
:
queryWrapper
);
List
<
Tenant
>
list
=
tenantService
.
list
((!
bladeUser
.
getTenant
Id
().
equals
(
BladeConstant
.
ADMIN_TENANT_ID
))
?
queryWrapper
.
lambda
().
eq
(
Tenant:
:
getTenantId
,
bladeUser
.
getTenantId
())
:
queryWrapper
);
return
R
.
data
(
list
);
}
...
...
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
浏览文件 @
c4d85f05
...
...
@@ -41,9 +41,9 @@ public interface DeptMapper extends BaseMapper<Dept> {
/**
* 获取树形节点
*
* @param tenant
Code
* @param tenant
Id
* @return
*/
List
<
DeptVO
>
tree
(
String
tenant
Code
);
List
<
DeptVO
>
tree
(
String
tenant
Id
);
}
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
浏览文件 @
c4d85f05
...
...
@@ -34,7 +34,7 @@
<select
id=
"tree"
resultMap=
"treeNodeResultMap"
>
select id, parent_id, dept_name as title, id as 'value', id as 'key' from blade_dept where is_deleted = 0
<if
test=
"_parameter!=null"
>
and tenant_
code
= #{_parameter}
and tenant_
id
= #{_parameter}
</if>
</select>
...
...
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java
浏览文件 @
c4d85f05
...
...
@@ -41,10 +41,10 @@ public interface RoleMapper extends BaseMapper<Role> {
/**
* 获取树形节点
*
* @param tenant
Code
* @param tenant
Id
* @param excludeRole
* @return
*/
List
<
RoleVO
>
tree
(
String
tenant
Code
,
String
excludeRole
);
List
<
RoleVO
>
tree
(
String
tenant
Id
,
String
excludeRole
);
}
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml
浏览文件 @
c4d85f05
...
...
@@ -33,7 +33,7 @@
<select
id=
"tree"
resultMap=
"treeNodeResultMap"
>
select id, parent_id, role_name as title, id as 'value', id as 'key' from blade_role where is_deleted = 0
<if
test=
"param1!=null"
>
and tenant_
code
= #{param1}
and tenant_
id
= #{param1}
</if>
<if
test=
"param2!=null"
>
and role_alias
<>
#{param2}
...
...
blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
浏览文件 @
c4d85f05
...
...
@@ -41,9 +41,9 @@ public interface IDeptService extends IService<Dept> {
/**
* 树形结构
*
* @param tenant
Code
* @param tenant
Id
* @return
*/
List
<
DeptVO
>
tree
(
String
tenant
Code
);
List
<
DeptVO
>
tree
(
String
tenant
Id
);
}
blade-service/blade-system/src/main/java/org/springblade/system/service/IRoleService.java
浏览文件 @
c4d85f05
...
...
@@ -42,10 +42,10 @@ public interface IRoleService extends IService<Role> {
/**
* 树形结构
*
* @param tenant
Code
* @param tenant
Id
* @return
*/
List
<
RoleVO
>
tree
(
String
tenant
Code
);
List
<
RoleVO
>
tree
(
String
tenant
Id
);
/**
* 权限配置
...
...
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
浏览文件 @
c4d85f05
...
...
@@ -40,8 +40,8 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
}
@Override
public
List
<
DeptVO
>
tree
(
String
tenant
Code
)
{
return
ForestNodeMerger
.
merge
(
baseMapper
.
tree
(
tenant
Code
));
public
List
<
DeptVO
>
tree
(
String
tenant
Id
)
{
return
ForestNodeMerger
.
merge
(
baseMapper
.
tree
(
tenant
Id
));
}
}
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/MenuServiceImpl.java
浏览文件 @
c4d85f05
...
...
@@ -87,7 +87,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
@Override
public
List
<
MenuVO
>
grantTree
(
BladeUser
user
)
{
return
ForestNodeMerger
.
merge
(
user
.
getTenant
Code
().
equals
(
BladeConstant
.
ADMIN_TENANT_CODE
)
?
baseMapper
.
grantTree
()
:
baseMapper
.
grantTreeByRole
(
Func
.
toIntList
(
user
.
getRoleId
())));
return
ForestNodeMerger
.
merge
(
user
.
getTenant
Id
().
equals
(
BladeConstant
.
ADMIN_TENANT_ID
)
?
baseMapper
.
grantTree
()
:
baseMapper
.
grantTreeByRole
(
Func
.
toIntList
(
user
.
getRoleId
())));
}
@Override
...
...
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
浏览文件 @
c4d85f05
...
...
@@ -55,13 +55,13 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
}
@Override
public
List
<
RoleVO
>
tree
(
String
tenant
Code
)
{
public
List
<
RoleVO
>
tree
(
String
tenant
Id
)
{
String
userRole
=
SecureUtil
.
getUserRole
();
String
excludeRole
=
null
;
if
(!
CollectionUtil
.
contains
(
Func
.
toStrArray
(
userRole
),
RoleConstant
.
ADMIN
))
{
excludeRole
=
RoleConstant
.
ADMIN
;
}
return
ForestNodeMerger
.
merge
(
baseMapper
.
tree
(
tenant
Code
,
excludeRole
));
return
ForestNodeMerger
.
merge
(
baseMapper
.
tree
(
tenant
Id
,
excludeRole
));
}
@Override
...
...
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
浏览文件 @
c4d85f05
...
...
@@ -58,12 +58,12 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
public
boolean
saveTenant
(
Tenant
tenant
)
{
if
(
Func
.
isEmpty
(
tenant
.
getId
()))
{
List
<
Tenant
>
tenants
=
baseMapper
.
selectList
(
Wrappers
.<
Tenant
>
query
().
lambda
().
eq
(
Tenant:
:
getIsDeleted
,
BladeConstant
.
DB_NOT_DELETED
));
List
<
String
>
codes
=
tenants
.
stream
().
map
(
Tenant:
:
getTenant
Code
).
collect
(
Collectors
.
toList
());
String
tenant
Code
=
getTenantCode
(
codes
);
tenant
.
setTenant
Code
(
tenantCode
);
List
<
String
>
codes
=
tenants
.
stream
().
map
(
Tenant:
:
getTenant
Id
).
collect
(
Collectors
.
toList
());
String
tenant
Id
=
getTenantId
(
codes
);
tenant
.
setTenant
Id
(
tenantId
);
// 新建租户对应的默认角色
Role
role
=
new
Role
();
role
.
setTenant
Code
(
tenantCode
);
role
.
setTenant
Id
(
tenantId
);
role
.
setParentId
(
0
);
role
.
setRoleName
(
"管理员"
);
role
.
setRoleAlias
(
"admin"
);
...
...
@@ -72,7 +72,7 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
roleMapper
.
insert
(
role
);
// 新建租户对应的默认部门
Dept
dept
=
new
Dept
();
dept
.
setTenant
Code
(
tenantCode
);
dept
.
setTenant
Id
(
tenantId
);
dept
.
setParentId
(
0
);
dept
.
setDeptName
(
tenant
.
getTenantName
());
dept
.
setFullName
(
tenant
.
getTenantName
());
...
...
@@ -83,10 +83,10 @@ public class TenantServiceImpl extends BaseServiceImpl<TenantMapper, Tenant> imp
return
super
.
saveOrUpdate
(
tenant
);
}
private
String
getTenant
Code
(
List
<
String
>
codes
)
{
private
String
getTenant
Id
(
List
<
String
>
codes
)
{
String
code
=
tenantId
.
generate
();
if
(
codes
.
contains
(
code
))
{
return
getTenant
Code
(
codes
);
return
getTenant
Id
(
codes
);
}
return
code
;
}
...
...
blade-service/blade-user/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<parent>
<artifactId>
blade-service
</artifactId>
<groupId>
org.springblade
</groupId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
浏览文件 @
c4d85f05
...
...
@@ -71,7 +71,7 @@ public class UserController {
@ApiOperation
(
value
=
"列表"
,
notes
=
"传入account和realName"
)
public
R
<
IPage
<
UserVO
>>
list
(
@ApiIgnore
@RequestParam
Map
<
String
,
Object
>
user
,
Query
query
,
BladeUser
bladeUser
)
{
QueryWrapper
<
User
>
queryWrapper
=
Condition
.
getQueryWrapper
(
user
,
User
.
class
);
IPage
<
User
>
pages
=
userService
.
page
(
Condition
.
getPage
(
query
),
(!
bladeUser
.
getTenant
Code
().
equals
(
BladeConstant
.
ADMIN_TENANT_CODE
))
?
queryWrapper
.
lambda
().
eq
(
User:
:
getTenantCode
,
bladeUser
.
getTenantCode
())
:
queryWrapper
);
IPage
<
User
>
pages
=
userService
.
page
(
Condition
.
getPage
(
query
),
(!
bladeUser
.
getTenant
Id
().
equals
(
BladeConstant
.
ADMIN_TENANT_ID
))
?
queryWrapper
.
lambda
().
eq
(
User:
:
getTenantId
,
bladeUser
.
getTenantId
())
:
queryWrapper
);
return
R
.
data
(
UserWrapper
.
build
().
pageVO
(
pages
));
}
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java
浏览文件 @
c4d85f05
...
...
@@ -41,8 +41,8 @@ public class UserClient implements IUserClient {
@Override
@GetMapping
(
API_PREFIX
+
"/user-info"
)
public
R
<
UserInfo
>
userInfo
(
String
tenant
Code
,
String
account
,
String
password
)
{
return
R
.
data
(
service
.
userInfo
(
tenant
Code
,
account
,
password
));
public
R
<
UserInfo
>
userInfo
(
String
tenant
Id
,
String
account
,
String
password
)
{
return
R
.
data
(
service
.
userInfo
(
tenant
Id
,
account
,
password
));
}
}
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
浏览文件 @
c4d85f05
...
...
@@ -40,12 +40,12 @@ public interface UserMapper extends BaseMapper<User> {
/**
* 获取用户
*
* @param tenant
Code
* @param tenant
Id
* @param account
* @param password
* @return
*/
User
getUser
(
String
tenant
Code
,
String
account
,
String
password
);
User
getUser
(
String
tenant
Id
,
String
account
,
String
password
);
/**
* 获取角色名
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
浏览文件 @
c4d85f05
...
...
@@ -5,7 +5,7 @@
<!-- 通用查询映射结果 -->
<resultMap
id=
"userResultMap"
type=
"org.springblade.system.user.entity.User"
>
<result
column=
"id"
property=
"id"
/>
<result
column=
"tenant_
code"
property=
"tenantCode
"
/>
<result
column=
"tenant_
id"
property=
"tenantId
"
/>
<result
column=
"create_user"
property=
"createUser"
/>
<result
column=
"create_time"
property=
"createTime"
/>
<result
column=
"update_user"
property=
"updateUser"
/>
...
...
@@ -46,7 +46,7 @@
FROM
blade_user
WHERE
tenant_
code
= #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
tenant_
id
= #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
</select>
<select
id=
"getRoleName"
resultType=
"java.lang.String"
>
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
浏览文件 @
c4d85f05
...
...
@@ -58,12 +58,12 @@ public interface IUserService extends BaseService<User> {
/**
* 用户信息
*
* @param tenant
Code
* @param tenant
Id
* @param account
* @param password
* @return
*/
UserInfo
userInfo
(
String
tenant
Code
,
String
account
,
String
password
);
UserInfo
userInfo
(
String
tenant
Id
,
String
account
,
String
password
);
/**
* 给用户设置角色
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
浏览文件 @
c4d85f05
...
...
@@ -45,7 +45,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
if
(
Func
.
isNotEmpty
(
user
.
getPassword
()))
{
user
.
setPassword
(
DigestUtil
.
encrypt
(
user
.
getPassword
()));
}
Integer
cnt
=
baseMapper
.
selectCount
(
Wrappers
.<
User
>
query
().
lambda
().
eq
(
User:
:
getTenant
Code
,
user
.
getTenantCode
()).
eq
(
User:
:
getAccount
,
user
.
getAccount
()));
Integer
cnt
=
baseMapper
.
selectCount
(
Wrappers
.<
User
>
query
().
lambda
().
eq
(
User:
:
getTenant
Id
,
user
.
getTenantId
()).
eq
(
User:
:
getAccount
,
user
.
getAccount
()));
if
(
cnt
>
0
)
{
throw
new
ApiException
(
"当前用户已存在!"
);
}
...
...
@@ -70,9 +70,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
}
@Override
public
UserInfo
userInfo
(
String
tenant
Code
,
String
account
,
String
password
)
{
public
UserInfo
userInfo
(
String
tenant
Id
,
String
account
,
String
password
)
{
UserInfo
userInfo
=
new
UserInfo
();
User
user
=
baseMapper
.
getUser
(
tenant
Code
,
account
,
password
);
User
user
=
baseMapper
.
getUser
(
tenant
Id
,
account
,
password
);
userInfo
.
setUser
(
user
);
if
(
Func
.
isNotEmpty
(
user
))
{
List
<
String
>
roleAlias
=
baseMapper
.
getRoleAlias
(
Func
.
toStrArray
(
user
.
getRoleId
()));
...
...
blade-service/pom.xml
浏览文件 @
c4d85f05
...
...
@@ -7,12 +7,12 @@
<parent>
<groupId>
org.springblade
</groupId>
<artifactId>
SpringBlade
</artifactId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
</parent>
<artifactId>
blade-service
</artifactId>
<name>
${project.artifactId}
</name>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
<packaging>
pom
</packaging>
<description>
SpringBlade 微服务集合
</description>
...
...
doc/nacos/blade.yaml
浏览文件 @
c4d85f05
...
...
@@ -84,7 +84,7 @@ blade:
path-patterns
:
-
/saber/**
tenant
:
column
:
tenant_
code
column
:
tenant_
id
tables
:
-
blade_notice
doc/sql/blade-saber-mysql.sql
浏览文件 @
c4d85f05
...
...
@@ -81,7 +81,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_dept`
;
CREATE
TABLE
`blade_dept`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`parent_id`
int
(
11
)
NULL
DEFAULT
0
COMMENT
'父主键'
,
`dept_name`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'部门名'
,
`full_name`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'部门全称'
,
...
...
@@ -127,7 +127,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_log_api`
;
CREATE
TABLE
`blade_log_api`
(
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'编号'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`service_id`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务ID'
,
`server_host`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器名'
,
`server_ip`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器IP地址'
,
...
...
@@ -153,7 +153,7 @@ CREATE TABLE `blade_log_api` (
DROP
TABLE
IF
EXISTS
`blade_log_error`
;
CREATE
TABLE
`blade_log_error`
(
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'编号'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`service_id`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务ID'
,
`server_host`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器名'
,
`server_ip`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器IP地址'
,
...
...
@@ -182,7 +182,7 @@ CREATE TABLE `blade_log_error` (
DROP
TABLE
IF
EXISTS
`blade_log_usual`
;
CREATE
TABLE
`blade_log_usual`
(
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'编号'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`service_id`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务ID'
,
`server_host`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器名'
,
`server_ip`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器IP地址'
,
...
...
@@ -237,7 +237,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_notice`
;
CREATE
TABLE
`blade_notice`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`title`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'标题'
,
`category`
int
(
11
)
NULL
DEFAULT
NULL
COMMENT
'类型'
,
`release_time`
datetime
(
0
)
NULL
DEFAULT
NULL
COMMENT
'发布时间'
,
...
...
@@ -290,7 +290,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_role`
;
CREATE
TABLE
`blade_role`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`parent_id`
int
(
11
)
NULL
DEFAULT
0
COMMENT
'父主键'
,
`role_name`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'角色名'
,
`sort`
int
(
11
)
NULL
DEFAULT
NULL
COMMENT
'排序'
,
...
...
@@ -330,7 +330,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_tenant`
;
CREATE
TABLE
`blade_tenant`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户编号
'
,
`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
'租户名称'
,
`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
'联系电话'
,
...
...
@@ -357,7 +357,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_user`
;
CREATE
TABLE
`blade_user`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`account`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'账号'
,
`password`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'密码'
,
`name`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'昵称'
,
...
...
doc/sql/blade-sword-mysql.sql
浏览文件 @
c4d85f05
...
...
@@ -81,7 +81,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_dept`
;
CREATE
TABLE
`blade_dept`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`parent_id`
int
(
11
)
NULL
DEFAULT
0
COMMENT
'父主键'
,
`dept_name`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'部门名'
,
`full_name`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'部门全称'
,
...
...
@@ -127,7 +127,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_log_api`
;
CREATE
TABLE
`blade_log_api`
(
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'编号'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`service_id`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务ID'
,
`server_host`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器名'
,
`server_ip`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器IP地址'
,
...
...
@@ -153,7 +153,7 @@ CREATE TABLE `blade_log_api` (
DROP
TABLE
IF
EXISTS
`blade_log_error`
;
CREATE
TABLE
`blade_log_error`
(
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'编号'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`service_id`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务ID'
,
`server_host`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器名'
,
`server_ip`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器IP地址'
,
...
...
@@ -182,7 +182,7 @@ CREATE TABLE `blade_log_error` (
DROP
TABLE
IF
EXISTS
`blade_log_usual`
;
CREATE
TABLE
`blade_log_usual`
(
`id`
bigint
(
64
)
NOT
NULL
COMMENT
'编号'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`service_id`
varchar
(
32
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务ID'
,
`server_host`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器名'
,
`server_ip`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'服务器IP地址'
,
...
...
@@ -237,7 +237,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_notice`
;
CREATE
TABLE
`blade_notice`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`title`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'标题'
,
`category`
int
(
11
)
NULL
DEFAULT
NULL
COMMENT
'类型'
,
`release_time`
datetime
(
0
)
NULL
DEFAULT
NULL
COMMENT
'发布时间'
,
...
...
@@ -290,7 +290,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_role`
;
CREATE
TABLE
`blade_role`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`parent_id`
int
(
11
)
NULL
DEFAULT
0
COMMENT
'父主键'
,
`role_name`
varchar
(
255
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'角色名'
,
`sort`
int
(
11
)
NULL
DEFAULT
NULL
COMMENT
'排序'
,
...
...
@@ -330,7 +330,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_tenant`
;
CREATE
TABLE
`blade_tenant`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NOT
NULL
COMMENT
'租户编号
'
,
`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
'租户名称'
,
`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
'联系电话'
,
...
...
@@ -357,7 +357,7 @@ COMMIT;
DROP
TABLE
IF
EXISTS
`blade_user`
;
CREATE
TABLE
`blade_user`
(
`id`
int
(
11
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键'
,
`tenant_
code`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户编号
'
,
`tenant_
id`
varchar
(
12
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
'000000'
COMMENT
'租户ID
'
,
`account`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'账号'
,
`password`
varchar
(
45
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'密码'
,
`name`
varchar
(
20
)
CHARACTER
SET
utf8mb4
COLLATE
utf8mb4_general_ci
NULL
DEFAULT
NULL
COMMENT
'昵称'
,
...
...
pom.xml
浏览文件 @
c4d85f05
...
...
@@ -5,22 +5,22 @@
<groupId>
org.springblade
</groupId>
<artifactId>
SpringBlade
</artifactId>
<version>
2.
3.3
</version>
<version>
2.
4.0
</version>
<packaging>
pom
</packaging>
<properties>
<blade.tool.version>
2.
3.3
</blade.tool.version>
<blade.project.version>
2.
3.3
</blade.project.version>
<blade.tool.version>
2.
4.0
</blade.tool.version>
<blade.project.version>
2.
4.0
</blade.project.version>
<java.version>
1.8
</java.version>
<swagger.version>
2.9.2
</swagger.version>
<swagger.models.version>
1.5.21
</swagger.models.version>
<swagger.bootstrapui.version>
1.9.
4
</swagger.bootstrapui.version>
<swagger.bootstrapui.version>
1.9.
5
</swagger.bootstrapui.version>
<mybatis.plus.version>
3.1.2
</mybatis.plus.version>
<curator.framework.version>
4.0.1
</curator.framework.version>
<protostuff.version>
1.6.0
</protostuff.version>
<mica.auto.version>
1.1.0
</mica.auto.version>
<alibaba.cloud.version>
0.9
.0.RELEASE
</alibaba.cloud.version>
<alibaba.cloud.version>
2.1
.0.RELEASE
</alibaba.cloud.version>
<spring.boot.admin.version>
2.1.5
</spring.boot.admin.version>
<spring.boot.version>
2.1.6.RELEASE
</spring.boot.version>
...
...
script/docker/.env
浏览文件 @
c4d85f05
REGISTER=192.168.0.157/blade
TAG=2.
3.3
TAG=2.
4.0
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录