Skip to content

Commit

Permalink
Merge pull request #84 from aoju/develop
Browse files Browse the repository at this point in the history
v5.3.5
  • Loading branch information
839128 authored Dec 19, 2019
2 parents 4d8ee89 + 481fee0 commit a4eed21
Show file tree
Hide file tree
Showing 1,714 changed files with 1,930 additions and 1,915 deletions.
66 changes: 33 additions & 33 deletions README.md
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.3.3-blue.svg?label=Maven%20Central" ></img>
<img src="https://img.shields.io/badge/maven--central-v5.3.5-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 @@ -48,36 +48,36 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
目标期望能努力打造一套从 基础框架 - 分布式微服务架构 - 持续集成 - 自动化部署 -系统监测等,快速实现业务需求的全栈式技术解决方案。

## 组件信息
| 模块信息 | 描述信息 |
| ------ | ------- |
|bus-all|为微服务提供统一的pom管理,以及通用组件|
|bus-base|基础功能及base相关功能,实体类(Entity),服务(Service),接口(Controller)|
|bus-cache|缓存服务及工具,支持redis,memcached,ehcache,hession等|
|bus-core|核心功能及工具类,包括常量、线程、类加载器、字符集编码、反射、集合、日期、等各种常用工具|
|bus-cron|定时器及定时任务等功能|
|bus-crypto|加密解密,支持支持AES/DES/REA/MD5等常用加密算法|
|bus-extra|扩展功能及文件操作|
|bus-forest|jar加解密,杜绝源码泄漏或被反编译|
|bus-health|应用服务器健康信息|
|bus-http|HTTP功能封装|
|bus-limiter|请求限流|
|bus-logger|日志信息及功能,动态检测日志实现的方式,使日志使用个更加便利灵活简单|
|bus-mapper|数据操作,在 MyBatis 的基础上只做增强不做改变,为简化开发、提高效率而生|
|bus-oauth|第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)|
|bus-pager|数据分页,mybatis|
|bus-office|office等相关转换及处理,POI封装实现,使Java操作Excel等文件变得更加简单|
|bus-proxy|公共代理,使动态代理变得简单|
|bus-sensitive|敏感数据脱敏,对应用和使用者透明,业务逻辑无感知,通过配置集成,改动代码量小|
|bus-setting|设置工具类, 用于支持设置/配置|
|bus-shade|Entity,Service,Mapper等相关代码生成工具|
|bus-socket|基础NIO/AIO通讯,Socket封装,支持TCP/UDP服务端|
|bus-spring|spring相关配置|
|bus-starter|SpringBoot starter,启动及相关配置文件信息|
|bus-storage|文件存储组件,,支持阿里云、七牛,提供了工厂模式和注入两种集成方式|
|bus-swagger|API调用及测试|
|bus-tracer|轻量级分布式链路跟踪监控,日志及访问流程追踪以及内部调用链追踪|
|bus-validate|参数校验,会默认拦截所有的标记有`@Valid`的方法或类|

| 完成 |模块 | 描述信息 |
|------| ------ | ------- |
|[]|bus-all|为微服务提供统一的pom管理,以及通用组件|
|[]|bus-base|基础功能及base相关功能,实体类(Entity),服务(Service),接口(Controller)|
|[ × ]|bus-cache|缓存服务及工具,支持redis,memcached,ehcache,hession等|
|[]|bus-core|核心功能及工具类,包括常量、线程、类加载器、字符集编码、反射、集合、日期等常用工具|
|[]|bus-cron|定时器及定时任务等功能|
|[]|bus-crypto|加密解密,支持支持AES/DES/REA/MD5等常用加密算法|
|[]|bus-extra|扩展功能及文件操作|
|[]|bus-forest|jar加解密,杜绝源码泄漏或被反编译|
|[]|bus-health|应用服务器健康信息|
|[]|bus-http|HTTP功能封装|
|[ × ]|bus-limiter|请求限流|
|[]|bus-logger|日志信息及功能,动态检测日志实现的方式,使日志使用个更加便利灵活简单|
|[]|bus-mapper|数据操作,在 MyBatis 的基础上只做增强不做改变,为简化开发、提高效率而生|
|[]|bus-oauth|第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)|
|[]|bus-pager|数据分页,mybatis|
|[]|bus-office|office等相关转换及处理,POI封装实现,使Java操作Excel等文件变得更加简单|
|[]|bus-proxy|公共代理,使动态代理变得简单|
|[]|bus-sensitive|敏感数据脱敏,对应用和使用者透明,业务逻辑无感知,通过配置集成,改动代码量小|
|[]|bus-setting|设置工具类, 用于支持设置/配置|
|[]|bus-shade|Entity,Service,Mapper等相关代码生成工具|
|[]|bus-socket|基础NIO/AIO通讯,Socket封装,支持TCP/UDP服务端|
|[]|bus-spring|spring相关配置|
|[]|bus-starter|SpringBoot starter,启动及相关配置文件信息|
|[]|bus-storage|文件存储组件,,支持阿里云、七牛,提供了工厂模式和注入两种集成方式|
|[]|bus-swagger|API调用及测试|
|[ × ]|bus-tracer|轻量级分布式链路跟踪监控,日志及访问流程追踪以及内部调用链追踪|
|[]|bus-validate|参数校验,会默认拦截所有的标记有`@Valid`的方法或类|

## 功能概述

Expand All @@ -95,13 +95,13 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav
<dependency>
<groupId>org.aoju</groupId>
<artifactId>bus-all</artifactId>
<version>5.3.3</version>
<version>5.3.5</version>
</dependency>
```

### Gradle
```
implementation 'org.aoju:bus-all:5.3.3'
implementation 'org.aoju:bus-all:5.3.5'
```

### Other
Expand Down
2 changes: 1 addition & 1 deletion bus-all/pom.xml
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.3.3</version>
<version>5.3.5</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion bus-base/pom.xml
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.3.3</version>
<version>5.3.5</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class Consts extends Normal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* 系统响应码
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class ErrorCode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Data
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public interface BaseMapper<T> extends Mapper<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public interface Mapper<T> extends org.aoju.bus.mapper.common.Mapper<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public interface BaseService<T> extends Service {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public interface Service {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class BaseServiceImpl<Mapper extends BaseMapper<T>, T extends BaseEntity>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* </p>
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@ControllerAdvice
Expand Down Expand Up @@ -148,7 +148,6 @@ public Object validateException(ValidateException e) {
@ResponseBody
@ExceptionHandler(value = HttpRequestMethodNotSupportedException.class)
public Object httpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException e) {
Logger.error(RuntimeUtils.getStackTrace(e));
return write(ErrorCode.EM_100507);
}

Expand All @@ -161,7 +160,6 @@ public Object httpRequestMethodNotSupportedException(HttpRequestMethodNotSupport
@ResponseBody
@ExceptionHandler(value = HttpMediaTypeNotSupportedException.class)
public Object httpMediaTypeNotSupportedException(HttpMediaTypeNotSupportedException e) {
Logger.error(RuntimeUtils.getStackTrace(e));
return write(ErrorCode.EM_100508);
}

Expand All @@ -175,7 +173,6 @@ public Object httpMediaTypeNotSupportedException(HttpMediaTypeNotSupportedExcept
@ResponseStatus(HttpStatus.NOT_FOUND)
@ExceptionHandler(value = NoHandlerFoundException.class)
public Object noHandlerFoundException(NoHandlerFoundException e) {
Logger.error(RuntimeUtils.getStackTrace(e));
return write(ErrorCode.EM_100509);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* 基础请求封装
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class BaseController<Service extends BaseService<T>, T> extends Controller {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* 基础输出封装
*
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class Controller {
Expand Down
2 changes: 1 addition & 1 deletion bus-bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-bom</artifactId>
<version>5.3.3</version>
<version>5.3.5</version>
<packaging>pom</packaging>

<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Object func(@CacheKey("#arg0[#i]") List<Long> ids) {
<dependency>
<groupId>org.aoju.bus</groupId>
<artifactId>bus-cache</artifactId>
<version>5.3.3</version>
<version>5.3.5</version>
</dependency>
```
- XML注册
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-cache</artifactId>
<version>5.3.3</version>
<version>5.3.5</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Aspectj.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Aspect
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Complex.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Singleton
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Context.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class Context {
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Manage.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Singleton
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Module.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class Module extends AbstractModule {
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Provider.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public interface Provider {
Expand Down
2 changes: 1 addition & 1 deletion bus-cache/src/main/java/org/aoju/bus/cache/Registry.java
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
public class Registry<T> implements FactoryBean<T> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Documented
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Documented
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

/**
* @author Kimi Liu
* @version 5.3.3
* @version 5.3.5
* @since JDK 1.8+
*/
@Documented
Expand Down
Loading

0 comments on commit a4eed21

Please sign in to comment.