Merge pull request #96 from aoju/develop

v.5.5.6

README.md

@@ -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.5-blue.svg?label=Maven%20Central" ></img>
+		<img src="https://img.shields.io/badge/maven--central-v5.5.6-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">
@@ -58,7 +58,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 |[ × ]|bus-limiter|请求限流,根据不同业务设置不同限流策略|
 |[ √ ]|bus-logger|日志信息及功能，动态检测日志实现的方式，使日志使用个更加便利灵活简单|
 |[ √ ]|bus-mapper|数据操作,在 MyBatis 的基础上只做增强不做改变，为简化开发、提高效率而生|
-|[ √ ]|bus-metric|接口开放平台，平台封装了常用的参数校验、结果返回等功能|
+|[ × ]|bus-metric|接口开放平台，平台封装了常用的参数校验、结果返回等功能|
 |[ √ ]|bus-oauth|第三方登录,已集成十多家第三方平台（国内外常用的基本都已包含）|
 |[ √ ]|bus-pager|数据分页,mybatis|
 |[ √ ]|bus-office|office等相关转换及处理,POI封装实现，使Java操作Excel等文件变得更加简单|
@@ -89,24 +89,31 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>5.5.5</version>
+    <version>5.5.6</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-implementation 'org.aoju:bus-all:5.5.5'
+implementation 'org.aoju:bus-all:5.5.6'
 ```
 
-### Other
+### Downlad
 
 点击以下任一链接，下载`bus-*-x.x.x.jar`即可：
 
 - [Maven中央库①](https://repo1.maven.org/maven2/org/aoju)
 - [Maven中央库②](http://repo2.maven.org/maven2/org/aoju)
 
+### 测试&使用
+
+为确保项目编译效率及相关规则，本项目所有单元测试及使用请参考`abarth`项目：
+
+- 地址: [https://github.com/aoju/abarth](https://github.com/aoju/abarth) 
+
+
 > 注意
-> Bus项目支持JDK8+，对Android平台部分模块没有测试，不能保证所有工具类获工具方法可用。
+> Bus项目支持JDK8+，对Android平台部分模块没有测试，不能保证所有工具类或工具方法可用。
 
 ## 分支说明
 

bus-all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>5.5.5</version>
+    <version>5.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-base/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>5.5.5</version>
+    <version>5.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

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

@@ -47,7 +47,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @ControllerAdvice

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

@@ -32,7 +32,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class Consts extends Normal {

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

@@ -33,7 +33,7 @@
  * 系统响应码
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class ErrorCode {

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

@@ -40,7 +40,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Data

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

@@ -35,7 +35,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Data

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

@@ -32,7 +32,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Data

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

@@ -35,7 +35,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Data

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

@@ -36,7 +36,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Data

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

@@ -35,7 +35,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Data

bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java

@@ -29,7 +29,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public interface BaseMapper<T> extends Mapper<T> {

bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java

@@ -29,7 +29,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public interface Mapper<T> extends org.aoju.bus.mapper.common.Mapper<T> {

bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java

@@ -33,7 +33,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public interface BaseService<T> extends Service {

bus-base/src/main/java/org/aoju/bus/base/service/Service.java

@@ -29,7 +29,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public interface Service {

bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java

@@ -44,7 +44,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class BaseServiceImpl<Mapper extends BaseMapper<T>, T extends BaseEntity>

bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java

@@ -35,7 +35,7 @@
  * 基础请求封装
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class BaseController<Service extends BaseService<T>, T> extends Controller {

bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java

@@ -32,7 +32,7 @@
  * 基础输出封装
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class Controller {

bus-bom/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-bom</artifactId>
-    <version>5.5.5</version>
+    <version>5.5.6</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>

bus-cache/README.md

@@ -57,7 +57,7 @@ Object func(@CacheKey("#arg0[#i]") List<Long> ids) {
 <dependency>
     <groupId>org.aoju.bus</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>5.5.5</version>
+    <version>5.5.6</version>
 </dependency>
 ```
 - XML注册

bus-cache/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>5.5.5</version>
+    <version>5.5.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java

@@ -30,7 +30,7 @@
  * 缓存接口
  *
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public interface CacheX {

bus-cache/src/main/java/org/aoju/bus/cache/Complex.java

@@ -43,7 +43,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Singleton

bus-cache/src/main/java/org/aoju/bus/cache/Context.java

@@ -27,7 +27,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class Context {

bus-cache/src/main/java/org/aoju/bus/cache/Manage.java

@@ -36,7 +36,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Singleton

bus-cache/src/main/java/org/aoju/bus/cache/Module.java

@@ -39,7 +39,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class Module extends AbstractModule {

bus-cache/src/main/java/org/aoju/bus/cache/Shooting.java

@@ -29,7 +29,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public interface Shooting {

bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java

@@ -27,7 +27,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Documented

bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java

@@ -29,7 +29,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Documented

bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java

@@ -28,7 +28,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Documented

bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java

@@ -28,7 +28,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Documented

bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java

@@ -28,7 +28,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public abstract class AbstractReader {

bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java

@@ -30,7 +30,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class AnnoHolder {

bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java

@@ -25,7 +25,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public interface CacheExpire {

bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java

@@ -29,7 +29,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class CacheKeys {

bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java

@@ -25,7 +25,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 public class CachePair<L, R> {

bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java

@@ -27,7 +27,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Data

bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java

@@ -37,7 +37,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.5.5
+ * @version 5.5.6
  * @since JDK 1.8+
  */
 @Singleton