Skip to content

Commit 74669ce

Browse files
author
smallchill
committed
🎉 4.3.0.RELEASE 多租户支持线程模式指定租户ID与忽略租户
1 parent 35f70db commit 74669ce

File tree

239 files changed

+443
-408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+443
-408
lines changed

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ Thumbs.db
2525
*.war
2626
*.ear
2727
/target
28+
29+
# Flattened pom
30+
.flattened-pom.xml
31+
/**/.flattened-pom.xml

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<p align="center">
2-
<img src="https://img.shields.io/badge/Release-V4.2.0-green.svg" alt="Downloads">
2+
<img src="https://img.shields.io/badge/Release-V4.3.0-green.svg" alt="Downloads">
33
<img src="https://img.shields.io/badge/JDK-17+-green.svg" alt="Build Status">
44
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
55
<img src="https://img.shields.io/badge/Spring%20Cloud-2023-blue.svg" alt="Coverage Status">
@@ -33,12 +33,12 @@
3333
|----------------------|------------|
3434
| Java | 17+ |
3535
| NodeJS | 18+ |
36-
| Spring | 6.1.12 |
37-
| Spring Boot | 3.2.9 |
36+
| Spring | 6.1.14 |
37+
| Spring Boot | 3.2.10 |
3838
| Spring Cloud | 2023.0.3 |
39-
| Spring Cloud Alibaba | 2023.0.1.0 |
39+
| Spring Cloud Alibaba | 2023.0.1.2 |
4040
| Nacos Alibaba | 2.3.2 |
41-
| Mybatis Plus | 3.5.7 |
41+
| Mybatis Plus | 3.5.8 |
4242

4343

4444
## 工程结构

‎blade-auth/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# 网络问题无法下载可以改为阿里云镜像
2+
# FROM registry.cn-hangzhou.aliyuncs.com/bladex-repo/alpine-java:openjdk17_cn_slim
13
FROM bladex/alpine-java:openjdk17_cn_slim
24

35
MAINTAINER [email protected]
@@ -10,6 +12,6 @@ EXPOSE 8010
1012

1113
ADD ./target/blade-auth.jar ./app.jar
1214

13-
ENTRYPOINT ["java", "--add-opens java.base/java.lang.reflect=ALL-UNNAMED", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
15+
ENTRYPOINT ["java", "--add-opens", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
1416

1517
CMD ["--spring.profiles.active=test"]

‎blade-auth/pom.xml

+1-10
Original file line numberDiff line numberDiff line change
@@ -8,56 +8,47 @@
88
<parent>
99
<artifactId>SpringBlade</artifactId>
1010
<groupId>org.springblade</groupId>
11-
<version>4.2.0</version>
11+
<version>${revision}</version>
1212
</parent>
1313

1414
<artifactId>blade-auth</artifactId>
1515
<name>${project.artifactId}</name>
16-
<version>${blade.project.version}</version>
1716
<packaging>jar</packaging>
1817

1918
<dependencies>
2019
<!--Blade-->
2120
<dependency>
2221
<groupId>org.springblade</groupId>
2322
<artifactId>blade-common</artifactId>
24-
<version>${blade.project.version}</version>
2523
</dependency>
2624
<dependency>
2725
<groupId>org.springblade</groupId>
2826
<artifactId>blade-core-cloud</artifactId>
29-
<version>${blade.tool.version}</version>
3027
</dependency>
3128
<dependency>
3229
<groupId>org.springblade</groupId>
3330
<artifactId>blade-core-secure</artifactId>
34-
<version>${blade.tool.version}</version>
3531
</dependency>
3632
<dependency>
3733
<groupId>org.springblade</groupId>
3834
<artifactId>blade-starter-log</artifactId>
39-
<version>${blade.tool.version}</version>
4035
</dependency>
4136
<dependency>
4237
<groupId>org.springblade</groupId>
4338
<artifactId>blade-starter-social</artifactId>
44-
<version>${blade.tool.version}</version>
4539
</dependency>
4640
<dependency>
4741
<groupId>org.springblade</groupId>
4842
<artifactId>blade-user-api</artifactId>
49-
<version>${blade.project.version}</version>
5043
</dependency>
5144
<dependency>
5245
<groupId>org.springblade</groupId>
5346
<artifactId>blade-starter-swagger</artifactId>
54-
<version>${blade.tool.version}</version>
5547
</dependency>
5648
<!-- Captcha -->
5749
<dependency>
5850
<groupId>com.github.whvcse</groupId>
5951
<artifactId>easy-captcha</artifactId>
60-
<version>${captcha.version}</version>
6152
</dependency>
6253
<!-- MySQL -->
6354
<dependency>

‎blade-auth/src/main/java/org/springblade/auth/AuthApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/controller/AuthController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/controller/SocialController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/enums/BladeUserEnum.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/granter/CaptchaTokenGranter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/granter/ITokenGranter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/granter/PasswordTokenGranter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/granter/RefreshTokenGranter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/granter/SocialTokenGranter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/granter/TokenGranterBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/granter/TokenParameter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-common/pom.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,26 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.2.0</version>
8+
<version>${revision}</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>blade-common</artifactId>
1313
<name>${project.artifactId}</name>
14-
<version>${blade.project.version}</version>
1514
<packaging>jar</packaging>
1615

1716
<dependencies>
1817
<dependency>
1918
<groupId>org.springblade</groupId>
2019
<artifactId>blade-core-launch</artifactId>
21-
<version>${blade.tool.version}</version>
2220
</dependency>
2321
<dependency>
2422
<groupId>org.springblade</groupId>
2523
<artifactId>blade-starter-loadbalancer</artifactId>
26-
<version>${blade.tool.version}</version>
2724
</dependency>
2825
<dependency>
2926
<groupId>net.dreamlu</groupId>
3027
<artifactId>mica-auto</artifactId>
31-
<version>${mica.auto.version}</version>
3228
<scope>provided</scope>
3329
</dependency>
3430
</dependencies>

‎blade-common/src/main/java/org/springblade/common/cache/CacheNames.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-common/src/main/java/org/springblade/common/config/BladeCommonConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-common/src/main/java/org/springblade/common/launch/LauncherServiceImpl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-common/src/main/java/org/springblade/common/tool/CommonUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-common/src/main/java/org/springblade/common/tool/PropsUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ EXPOSE 80
1010

1111
ADD ./target/blade-gateway.jar ./app.jar
1212

13-
ENTRYPOINT ["java", "--add-opens java.base/java.lang.reflect=ALL-UNNAMED", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
13+
ENTRYPOINT ["java", "--add-opens", "java.base/java.lang=ALL-UNNAMED", "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
1414

1515
CMD ["--spring.profiles.active=test"]

‎blade-gateway/pom.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,19 @@
55
<parent>
66
<artifactId>SpringBlade</artifactId>
77
<groupId>org.springblade</groupId>
8-
<version>4.2.0</version>
8+
<version>${revision}</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<artifactId>blade-gateway</artifactId>
1313
<name>${project.artifactId}</name>
14-
<version>${blade.project.version}</version>
1514
<packaging>jar</packaging>
1615

1716
<dependencies>
1817
<!--Blade-->
1918
<dependency>
2019
<groupId>org.springblade</groupId>
2120
<artifactId>blade-core-launch</artifactId>
22-
<version>${blade.tool.version}</version>
2321
<exclusions>
2422
<exclusion>
2523
<groupId>org.springframework.boot</groupId>
@@ -34,7 +32,6 @@
3432
<dependency>
3533
<groupId>org.springblade</groupId>
3634
<artifactId>blade-common</artifactId>
37-
<version>${blade.project.version}</version>
3835
<exclusions>
3936
<exclusion>
4037
<groupId>org.springblade</groupId>
@@ -54,7 +51,6 @@
5451
<dependency>
5552
<groupId>de.codecentric</groupId>
5653
<artifactId>spring-boot-admin-starter-client</artifactId>
57-
<version>${spring.boot.admin.version}</version>
5854
</dependency>
5955
<dependency>
6056
<groupId>org.springframework.cloud</groupId>
@@ -78,12 +74,10 @@
7874
<dependency>
7975
<groupId>io.jsonwebtoken</groupId>
8076
<artifactId>jjwt-impl</artifactId>
81-
<version>0.11.2</version>
8277
</dependency>
8378
<dependency>
8479
<groupId>io.jsonwebtoken</groupId>
8580
<artifactId>jjwt-jackson</artifactId>
86-
<version>0.11.2</version>
8781
</dependency>
8882
</dependencies>
8983

‎blade-gateway/src/main/java/org/springblade/gateway/GateWayApplication.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/src/main/java/org/springblade/gateway/config/JwtConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/src/main/java/org/springblade/gateway/config/RouterFunctionConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/src/main/java/org/springblade/gateway/controller/DiscoveryClientController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/src/main/java/org/springblade/gateway/filter/AuthFilter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/src/main/java/org/springblade/gateway/handler/ErrorExceptionHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/src/main/java/org/springblade/gateway/props/AuthProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright (c) 2018-2028, Chill Zhuang 庄骞 (smallchill@163.com).
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 (bladejava@qq.com).
33
* <p>
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

‎blade-gateway/src/main/java/org/springblade/gateway/props/JwtProperties.java

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
/*
2-
* Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
3-
*
4-
* Redistribution and use in source and binary forms, with or without
5-
* modification, are permitted provided that the following conditions are met:
6-
*
7-
* Redistributions of source code must retain the above copyright notice,
8-
* this list of conditions and the following disclaimer.
9-
* Redistributions in binary form must reproduce the above copyright
10-
* notice, this list of conditions and the following disclaimer in the
11-
* documentation and/or other materials provided with the distribution.
12-
* Neither the name of the dreamlu.net developer nor the names of its
13-
* contributors may be used to endorse or promote products derived from
14-
* this software without specific prior written permission.
15-
* Author: Chill 庄骞 ([email protected])
1+
/**
2+
* Copyright (c) 2018-2099, Chill Zhuang 庄骞 ([email protected]).
3+
* <p>
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
* <p>
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
* <p>
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
1615
*/
1716
package org.springblade.gateway.props;
1817

0 commit comments

Comments
 (0)