Skip to content

Commit 0868801

Browse files
authored
v5.8.9
v5.8.9
2 parents f10136c + 2035f4b commit 0868801

File tree

2,393 files changed

+135812
-14636
lines changed

Some content is hidden

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

2,393 files changed

+135812
-14636
lines changed

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
3-
<img src="https://img.shields.io/badge/maven--central-v5.8.6-blue.svg?label=Maven%20Central" />
3+
<img src="https://img.shields.io/badge/maven--central-v5.8.9-blue.svg?label=Maven%20Central" />
44
</a>
55
<a target="_blank" href="https://travis-ci.org/aoju/bus">
66
<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
@@ -51,6 +51,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
5151
|------| ------ | ------- |
5252
|[]|bus-all|为微服务提供统一的pom管理,以及通用组件|
5353
|[]|bus-base|基础功能及base相关功能,实体类(Entity),服务(Service),接口(Controller)|
54+
|[]|bus-bom|包含所有组建信息,当然可以通过配置按需加载等|
5455
|[ × ]|bus-cache|缓存服务及工具,支持redis,memcached,ehcache,hession等|
5556
|[]|bus-core|核心功能及工具类,包括常量、线程、类加载器、字符集编码、反射、集合、日期等常用工具|
5657
|[]|bus-cron|定时器及定时任务等功能|
@@ -59,12 +60,14 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
5960
|[]|bus-forest|jar加解密,杜绝源码泄漏或被反编译,支持springboot项目加解密|
6061
|[]|bus-health|应用服务器健康信息,软件硬件信息采集等|
6162
|[]|bus-http|HTTP功能封装,根据业务场景可使用 Httpd/Httpx/Httpz 不同的处理方式|
63+
|[]|bus-image|影像应用服务,解析预览等|
6264
|[ × ]|bus-limiter|请求限流,根据不同业务设置不同限流策略|
6365
|[]|bus-logger|日志信息及功能,动态检测日志实现的方式,使日志使用个更加便利灵活简单|
6466
|[]|bus-mapper|数据操作,在 MyBatis 的基础上只做增强不做改变,为简化开发、提高效率而生|
6567
|[]|bus-oauth|第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)|
6668
|[]|bus-pager|数据分页,mybatis|
6769
|[]|bus-office|office等相关转换及处理,POI封装实现,使Java操作Excel等文件变得更加简单|
70+
|[]|bus-opencv|图像识别及分析,提供丰富的徒刑图像处理算法,跨平台支持等|
6871
|[]|bus-proxy|公共代理,使动态代理变得简单|
6972
|[]|bus-sensitive|敏感数据脱敏,对应用和使用者透明,业务逻辑无感知,通过配置集成,改动代码量小|
7073
|[]|bus-setting|设置工具类, 用于支持设置/配置|
@@ -92,13 +95,13 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
9295
<dependency>
9396
<groupId>org.aoju</groupId>
9497
<artifactId>bus-all</artifactId>
95-
<version>5.8.6</version>
98+
<version>5.8.9</version>
9699
</dependency>
97100
```
98101

99102
### Gradle
100103
```
101-
implementation 'org.aoju:bus-all:5.8.6'
104+
implementation 'org.aoju:bus-all:5.8.9'
102105
```
103106

104107
### Downlad

bus-all/pom.xml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-all</artifactId>
9-
<version>5.8.6</version>
9+
<version>5.8.9</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -80,6 +80,12 @@
8080
<version>${project.version}</version>
8181
<optional>true</optional>
8282
</dependency>
83+
<dependency>
84+
<groupId>${project.groupId}</groupId>
85+
<artifactId>bus-image</artifactId>
86+
<version>${project.version}</version>
87+
<optional>true</optional>
88+
</dependency>
8389
<dependency>
8490
<groupId>${project.groupId}</groupId>
8591
<artifactId>bus-limiter</artifactId>
@@ -140,6 +146,12 @@
140146
<version>${project.version}</version>
141147
<optional>true</optional>
142148
</dependency>
149+
<dependency>
150+
<groupId>${project.groupId}</groupId>
151+
<artifactId>bus-shade</artifactId>
152+
<version>${project.version}</version>
153+
<optional>true</optional>
154+
</dependency>
143155
<dependency>
144156
<groupId>${project.groupId}</groupId>
145157
<artifactId>bus-socket</artifactId>
@@ -211,7 +223,7 @@
211223
<plugin>
212224
<groupId>org.apache.maven.plugins</groupId>
213225
<artifactId>maven-javadoc-plugin</artifactId>
214-
<version>3.1.1</version>
226+
<version>3.2.0</version>
215227
<executions>
216228
<execution>
217229
<id>attach-javadocs</id>
@@ -245,7 +257,7 @@
245257
<plugin>
246258
<groupId>org.apache.maven.plugins</groupId>
247259
<artifactId>maven-source-plugin</artifactId>
248-
<version>3.1.0</version>
260+
<version>3.2.0</version>
249261
<executions>
250262
<execution>
251263
<id>attach-sources</id>
@@ -258,7 +270,7 @@
258270
<plugin>
259271
<groupId>org.apache.maven.plugins</groupId>
260272
<artifactId>maven-shade-plugin</artifactId>
261-
<version>3.2.1</version>
273+
<version>3.2.3</version>
262274
<executions>
263275
<execution>
264276
<phase>package</phase>

bus-all/src/main/java/org/aoju/bus/Bus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
* </p>
4343
*
4444
* @author Kimi Liu
45-
* @version 5.8.6
45+
* @version 5.8.9
4646
* @since JDK 1.8+
4747
*/
4848
public class Bus extends Version {

bus-base/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-base</artifactId>
9-
<version>5.8.6</version>
9+
<version>5.8.9</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -168,7 +168,7 @@
168168
<plugin>
169169
<groupId>org.apache.maven.plugins</groupId>
170170
<artifactId>maven-javadoc-plugin</artifactId>
171-
<version>3.1.1</version>
171+
<version>3.2.0</version>
172172
<executions>
173173
<execution>
174174
<id>attach-javadocs</id>
@@ -202,7 +202,7 @@
202202
<plugin>
203203
<groupId>org.apache.maven.plugins</groupId>
204204
<artifactId>maven-source-plugin</artifactId>
205-
<version>3.1.0</version>
205+
<version>3.2.0</version>
206206
<executions>
207207
<execution>
208208
<id>attach-sources</id>

bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.aoju.bus.core.lang.exception.InstrumentException;
3232
import org.aoju.bus.core.lang.exception.ValidateException;
3333
import org.aoju.bus.core.utils.RuntimeUtils;
34+
import org.aoju.bus.core.utils.StringUtils;
3435
import org.aoju.bus.logger.Logger;
3536
import org.springframework.http.HttpStatus;
3637
import org.springframework.ui.Model;
@@ -46,7 +47,7 @@
4647
* 异常信息拦截处理
4748
*
4849
* @author Kimi Liu
49-
* @version 5.8.6
50+
* @version 5.8.9
5051
* @since JDK 1.8+
5152
*/
5253
@ControllerAdvice
@@ -112,6 +113,9 @@ public Object instrumentException(InstrumentException e) {
112113
@ExceptionHandler(value = BusinessException.class)
113114
public Object businessException(BusinessException e) {
114115
Logger.error(RuntimeUtils.getStackTrace(e));
116+
if (StringUtils.isBlank(e.getErrcode())) {
117+
return write(ErrorCode.EM_100513, e.getMessage());
118+
}
115119
return write(e.getErrcode());
116120
}
117121

bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* 公共常量
3232
*
3333
* @author Kimi Liu
34-
* @version 5.8.6
34+
* @version 5.8.9
3535
* @since JDK 1.8+
3636
*/
3737
public class Consts extends Normal {

bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* 系统响应码
3535
*
3636
* @author Kimi Liu
37-
* @version 5.8.6
37+
* @version 5.8.9
3838
* @since JDK 1.8+
3939
*/
4040
public class ErrorCode {

bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* Entity 基本信息.
4141
*
4242
* @author Kimi Liu
43-
* @version 5.8.6
43+
* @version 5.8.9
4444
* @since JDK 1.8+
4545
*/
4646
@Data

bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* Entity 实体
3535
*
3636
* @author Kimi Liu
37-
* @version 5.8.6
37+
* @version 5.8.9
3838
* @since JDK 1.8+
3939
*/
4040
@Data

bus-base/src/main/java/org/aoju/bus/base/entity/Message.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* 返回值公用类
3434
*
3535
* @author Kimi Liu
36-
* @version 5.8.6
36+
* @version 5.8.9
3737
* @since JDK 1.8+
3838
*/
3939
@Data

0 commit comments

Comments
 (0)