Skip to content

Commit

Permalink
v5.5.1
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@839128
839128 authored Jan 8, 2020
2 parents 6430904 + 01a87be commit d757679
Show file tree
Hide file tree
Showing 1,893 changed files with 17,539 additions and 4,580 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright © 2017 aoju.org All rights reserved.
Copyright © 2020 aoju.org All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
24 changes: 9 additions & 15 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p align="center">
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
<img src="https://img.shields.io/badge/maven--central-v5.5.0-blue.svg?label=Maven%20Central" ></img>
<img src="https://img.shields.io/badge/maven--central-v5.5.1-blue.svg?label=Maven%20Central" ></img>
</a>
<a target="_blank" href="https://travis-ci.org/aoju/bus">
<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
Expand Down Expand Up @@ -28,11 +28,6 @@
</a>
</p>

<p align="center">
-- QQ群①：<a href="https://shang.qq.com/wpa/qunwpa?idkey=17fadd02891457034c6536c984f0d7db29b73ea14c9b86bba39ce18ed7a90e18">839128</a> --
-- QQ群②：<a href="https://shang.qq.com/wpa/qunwpa?idkey=c207666cbc107d03d368bde8fc15605bb883ebc482e28d440de149e3e2217460">839120</a> --
</p>

---

## 项目说明
Expand All @@ -56,11 +51,11 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
|[ √ ]|bus-core|核心功能及工具类,包括常量、线程、类加载器、字符集编码、反射、集合、日期等常用工具|
|[ √ ]|bus-cron|定时器及定时任务等功能|
|[ √ ]|bus-crypto|加密解密，支持支持AES/DES/REA/MD5等常用加密算法|
|[ √ ]|bus-extra|扩展功能及文件操作|
|[ √ ]|bus-forest|jar加解密,杜绝源码泄漏或被反编译|
|[ √ ]|bus-health|应用服务器健康信息|
|[ √ ]|bus-http|HTTP功能封装|
|[ × ]|bus-limiter|请求限流|
|[ √ ]|bus-extra|扩展功能及文件操作,FTP/文件/二维码/短信相关支持|
|[ √ ]|bus-forest|jar加解密,杜绝源码泄漏或被反编译，支持springboot项目加解密|
|[ √ ]|bus-health|应用服务器健康信息，软件硬件信息采集等|
|[ √ ]|bus-http|HTTP功能封装,根据业务场景可使用 Httpd/Httpx/Httpz 不同的处理方式|
|[ × ]|bus-limiter|请求限流,根据不同业务设置不同限流策略|
|[ √ ]|bus-logger|日志信息及功能，动态检测日志实现的方式，使日志使用个更加便利灵活简单|
|[ √ ]|bus-mapper|数据操作,在 MyBatis 的基础上只做增强不做改变，为简化开发、提高效率而生|
|[ √ ]|bus-oauth|第三方登录,已集成十多家第三方平台（国内外常用的基本都已包含）|
Expand All @@ -71,8 +66,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
|[ √ ]|bus-setting|设置工具类， 用于支持设置/配置|
|[ √ ]|bus-shade|Entity,Service,Mapper等相关代码生成工具|
|[ × ]|bus-socket|基础NIO/AIO通讯,Socket封装，支持TCP/UDP服务端|
|[ √ ]|bus-spring|spring相关配置|
|[ √ ]|bus-starter|SpringBoot starter，启动及相关配置文件信息|
|[ √ ]|bus-starter|SpringBoot starter，spring相关配置，启动及相关配置文件信息|
|[ √ ]|bus-storage|文件存储组件,,支持阿里云、七牛，提供了工厂模式和注入两种集成方式|
|[ × ]|bus-tracer|轻量级分布式链路跟踪监控，日志及访问流程追踪以及内部调用链追踪|
|[ √ ]|bus-validate|参数校验，会默认拦截所有的标记有`@Valid`的方法或类|
Expand All @@ -94,13 +88,13 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
<dependency>
<groupId>org.aoju</groupId>
<artifactId>bus-all</artifactId>
<version>5.5.0</version>
<version>5.5.1</version>
</dependency>
```

### Gradle
```
implementation 'org.aoju:bus-all:5.5.0'
implementation 'org.aoju:bus-all:5.5.1'
```

### Other
Expand Down
4 changes: 2 additions & 2 deletions bus-all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-all</artifactId>
<version>5.5.0</version>
<version>5.5.1</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -87,7 +87,7 @@
<!--bus-shade-->
<freemarker.version>2.3.28</freemarker.version>
<!--bus-socket-->
<netty.version>4.1.42.Final</netty.version>
<netty.version>4.1.44.Final</netty.version>
<!--bus-spring-->
<dubbo.version>2.7.3</dubbo.version>
<!--bus-storage-->
Expand Down
2 changes: 1 addition & 1 deletion bus-base/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-base</artifactId>
<version>5.5.0</version>
<version>5.5.1</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
20 changes: 18 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -33,8 +33,10 @@
import org.aoju.bus.logger.Logger;
import org.springframework.http.HttpStatus;
import org.springframework.ui.Model;
import org.springframework.validation.BindException;
import org.springframework.web.HttpMediaTypeNotSupportedException;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.NoHandlerFoundException;
Expand All @@ -45,7 +47,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
@ControllerAdvice
Expand Down Expand Up @@ -177,4 +179,18 @@ public Object noHandlerFoundException(NoHandlerFoundException e) {
return write(ErrorCode.EM_100509);
}

/**
* 参数绑定异常
*
* @param e 异常信息
* @return 异常提示
*/
@ResponseBody
@ResponseStatus(HttpStatus.BAD_REQUEST)
@ExceptionHandler({MethodArgumentNotValidException.class, BindException.class})
public Object handleBodyValidException(MethodArgumentNotValidException e) {
Logger.error(e.getBindingResult().getFieldErrors().get(0).getDefaultMessage());
return write(ErrorCode.EM_100511);
}

}
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -32,7 +32,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public class Consts extends Normal {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"); to deal
Expand Down Expand Up @@ -33,7 +33,7 @@
* 系统响应码
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public class ErrorCode {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -40,7 +40,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
@Data
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
@Data
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Message.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -32,7 +32,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
@Data
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
@Data
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Result.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -36,7 +36,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
@Data
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
@Data
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public interface BaseMapper<T> extends Mapper<T> {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public interface Mapper<T> extends org.aoju.bus.mapper.common.Mapper<T> {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -33,7 +33,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public interface BaseService<T> extends Service {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/service/Service.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public interface Service {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -44,7 +44,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public class BaseServiceImpl<Mapper extends BaseMapper<T>, T extends BaseEntity>
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* The MIT License
*
* Copyright (c) 2017 aoju.org All rights reserved.
* Copyright (c) 2020 aoju.org All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -35,7 +35,7 @@
* 基础请求封装
*
* @author Kimi Liu
* @version 5.5.0
* @version 5.5.1
* @since JDK 1.8+
*/
public class BaseController<Service extends BaseService<T>, T> extends Controller {
Expand Down
Loading

0 comments on commit d757679

Please sign in to comment.