Skip to content

Commit f4f598a

Browse files
839536839536
authored
v6.5.8
v6.5.8
2 parents 9e31c62 + 32ae351 commit f4f598a

File tree

339 files changed

+2939
-2544
lines changed

Some content is hidden

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

339 files changed

+2939
-2544
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</p>
77
<p align="center">
88
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
9-
<img src="https://img.shields.io/badge/maven--central-v6.5.6-blue.svg?label=Maven%20Central" />
9+
<img src="https://img.shields.io/badge/maven--central-v6.5.8-blue.svg?label=Maven%20Central" />
1010
</a>
1111
<a target="_blank" href="https://travis-ci.org/aoju/bus">
1212
<img src="https://travis-ci.com/aoju/bus.svg?branch=main">
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java17
9797
<dependency>
9898
<groupId>org.aoju</groupId>
9999
<artifactId>bus-all</artifactId>
100-
<version>6.5.6</version>
100+
<version>6.5.8</version>
101101
</dependency>
102102
```
103103

‎bus-all/pom.xml‎

Lines changed: 1 addition & 1 deletion
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>6.5.6</version>
9+
<version>6.5.8</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>

‎bus-base/pom.xml‎

Lines changed: 2 additions & 2 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>6.5.6</version>
9+
<version>6.5.8</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -42,7 +42,7 @@
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4444
<project.compiler.version>17</project.compiler.version>
45-
<spring.boot.version>2.7.2</spring.boot.version>
45+
<spring.boot.version>2.7.3</spring.boot.version>
4646
<lombok.version>1.18.24</lombok.version>
4747
<persistence.version>2.2</persistence.version>
4848
</properties>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.aoju.bus.base.spring.Controller;
3030
import org.aoju.bus.core.exception.BusinessException;
3131
import org.aoju.bus.core.exception.CrontabException;
32-
import org.aoju.bus.core.exception.InstrumentException;
32+
import org.aoju.bus.core.exception.InternalException;
3333
import org.aoju.bus.core.exception.ValidateException;
3434
import org.aoju.bus.core.instance.Instances;
3535
import org.aoju.bus.core.toolkit.StringKit;
@@ -97,8 +97,8 @@ public Object defaultException(Exception e) {
9797
* @return 异常提示
9898
*/
9999
@ResponseBody
100-
@ExceptionHandler(value = InstrumentException.class)
101-
public Object instrumentException(InstrumentException e) {
100+
@ExceptionHandler(value = InternalException.class)
101+
public Object InternalException(InternalException e) {
102102
this.defaultExceptionHandler(e);
103103
if (StringKit.isBlank(e.getErrcode())) {
104104
return write(ErrorCode.EM_100510);

‎bus-base/src/main/java/org/aoju/bus/base/advice/ErrorAdvice.java‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@
2626
package org.aoju.bus.base.advice;
2727

2828
import org.aoju.bus.base.service.ErrorService;
29-
import org.aoju.bus.core.toolkit.RuntimeKit;
30-
import org.aoju.bus.logger.Logger;
31-
import org.aoju.bus.spring.SpringBuilder;
29+
30+
import java.util.ServiceLoader;
3231

3332
/**
3433
* 异常信息处理
@@ -47,19 +46,21 @@ public class ErrorAdvice {
4746
* @return 如果执行链应该继续执行, 则为:true 否则:false
4847
*/
4948
public boolean handler(Exception ex) {
50-
ErrorService errorService = null;
51-
try {
52-
errorService = SpringBuilder.getBean(ErrorService.class);
53-
} catch (RuntimeException ignore) {
54-
55-
}
56-
if (null != errorService) {
57-
errorService.before(ex);
58-
errorService.after(ex);
59-
} else {
60-
Logger.error(RuntimeKit.getStackTrace(ex));
49+
final ServiceLoader<ErrorService> loader = ServiceLoader.load(ErrorService.class);
50+
for (ErrorService service : loader) {
51+
if (service instanceof ErrorService) {
52+
if (loader.stream().count() > 1) {
53+
if (!service.getClass().getName().equals(ErrorService.class.getName())) {
54+
service.before(ex);
55+
service.after(ex);
56+
}
57+
} else {
58+
service.before(ex);
59+
service.after(ex);
60+
}
61+
}
6162
}
6263
return true;
6364
}
6465

65-
}
66+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
********************************************************************************/
2626
package org.aoju.bus.base.consts;
2727

28-
import org.aoju.bus.core.exception.InstrumentException;
28+
import org.aoju.bus.core.exception.InternalException;
2929
import org.aoju.bus.core.lang.Symbol;
3030

3131
import java.util.Map;
@@ -301,7 +301,7 @@ public class ErrorCode {
301301
*/
302302
public static void register(String key, String value) {
303303
if (ERRORCODE_CACHE.containsKey(key)) {
304-
throw new InstrumentException("重复注册同名称的错误码：" + key);
304+
throw new InternalException("重复注册同名称的错误码：" + key);
305305
}
306306
ERRORCODE_CACHE.putIfAbsent(key, value);
307307
}

‎bus-base/src/main/java/org/aoju/bus/base/service/ErrorService.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,33 @@
2525
********************************************************************************/
2626
package org.aoju.bus.base.service;
2727

28+
import lombok.NoArgsConstructor;
2829
import org.aoju.bus.core.toolkit.RuntimeKit;
2930
import org.aoju.bus.logger.Logger;
3031

3132
/**
3233
* 异常信息处理
3334
* 此类未找到实现的情况下，采用默认实现
34-
* 可以根据不同业务需求，实现对应逻辑即可
35+
* 可以根据不同业务需求，继承此类实现对应业务逻辑即可
36+
* 项目中可通过SPI自定义接入
37+
* 例：META-INF/services/org.aoju.bus.base.service.ErrorService
38+
* <code>
39+
* org.aoju.bus.xxx.ErrorService
40+
* </code>
3541
*
3642
* @author Kimi Liu
3743
* @since Java 17+
3844
*/
39-
public interface ErrorService {
45+
@NoArgsConstructor
46+
public class ErrorService {
4047

4148
/**
4249
* 完成请求处理前调用
4350
*
4451
* @param ex 对象参数
4552
* @return 如果执行链应该继续执行, 则为:true 否则:false
4653
*/
47-
default boolean before(Exception ex) {
54+
public boolean before(Exception ex) {
4855
Logger.error(RuntimeKit.getStackTrace(ex));
4956
return true;
5057
}
@@ -55,8 +62,8 @@ default boolean before(Exception ex) {
5562
* @param ex 对象参数
5663
* @return 如果执行链应该继续执行, 则为:true 否则:false
5764
*/
58-
default boolean after(Exception ex) {
65+
public boolean after(Exception ex) {
5966
return true;
6067
}
6168

62-
}
69+
}

‎bus-base/src/main/resources/META-INF/services/org.aoju.bus.base.service.ErrorService‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.aoju.bus.base.service.ErrorService

‎bus-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-bom</artifactId>
9-
<version>6.5.6</version>
9+
<version>6.5.8</version>
1010
<packaging>pom</packaging>
1111

1212
<name>${project.artifactId}</name>

‎bus-cache/pom.xml‎

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

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-cache</artifactId>
9-
<version>6.5.6</version>
9+
<version>6.5.8</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -42,7 +42,7 @@
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4444
<project.compiler.version>17</project.compiler.version>
45-
<spring.boot.version>2.7.2</spring.boot.version>
45+
<spring.boot.version>2.7.3</spring.boot.version>
4646
<lombok.version>1.18.24</lombok.version>
4747
<guice.version>5.1.0</guice.version>
4848
<jedis.version>4.2.3</jedis.version>

0 commit comments

Comments
 (0)