Merge pull request #76 from aoju/develop

v5.2.5

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.2.3-blue.svg?label=Maven%20Central" ></img>
+		<img src="https://img.shields.io/badge/maven--central-v5.2.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">
@@ -18,7 +18,7 @@
 		<img src="https://img.shields.io/badge/swagger-2.9.2-brightgreen.svg">
 	</a>
 	<a target="_blank" href="http://dubbo.apache.org">
-		<img src="https://img.shields.io/badge/dubbo-2.6.6-yellow.svg">
+		<img src="https://img.shields.io/badge/dubbo-2.6.7-yellow.svg">
 	</a>
 	<a target="_blank" href="http://poi.apache.org">
 		<img src="https://img.shields.io/badge/poi-3.1.7-blue.svg">
@@ -96,13 +96,13 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.5</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-implementation 'org.aoju:bus-all:5.2.3'
+implementation 'org.aoju:bus-all:5.2.5'
 ```
 
 ### Other
@@ -115,17 +115,33 @@ implementation 'org.aoju:bus-all:5.2.3'
 > 注意
 > Bus项目支持JDK8+，对Android平台部分模块没有测试，不能保证所有工具类获工具方法可用。
 
+## 分支说明
+
+源码分为两个分支，功能如下：
+
+| 分支       | 作用                                                          |
+|-----------|---------------------------------------------------------------|
+| master    | 主分支，即稳定版本使用的分支，与中央库提交的jar一致，不接收任何PR或修改 |
+| develop   | 开发分支，默认为下个版本的更新或者修复等，接受修改或PR              |
+
 ## 意见建议
 
 All kinds of contributions (enhancements, new features, documentation & code improvements, issues & bugs reporting) are welcome.
 
 欢迎各种形式的贡献，包括但不限于优化，添加功能，文档 & 代码的改进，问题和 bugs 的报告。
 
-## 许可证
+## 许可证(license)
 
+### MIT
 Open sourced under the MIT license.
 
 根据 MIT 许可证开源。
 
+### JetBrains 
+
+Thanks JetBrains for the free license.
+
+感谢JetBrains提供IDEA免费license
+
 ##
 源码永远是最好的教程，善于读源码和debug朋友掌握完全是轻而易举的事。源码是作者设计理念最直观的展现，这也是开源的魅力所在。"talk is cheap show me the code"，开源让技术难题的探讨变得更加务实，在您看完源码后心中对它都会有一个定论。在作者看来，Bus切切实实降低了开发学习门槛，也保障了服务的高性能、高可用。如果读者朋友对源码中某些部分的设计存在疑虑，也欢迎与作者保持沟通。

bus-all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.5</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.9.RELEASE</version>
+        <version>2.2.1.RELEASE</version>
     </parent>
 
     <properties>
@@ -61,8 +61,8 @@
         <tinylog.version>1.3.5</tinylog.version>
         <jboss-logging.version>3.4.1.Final</jboss-logging.version>
         <!--bus-mapper-->
-        <mybatis.version>3.5.2</mybatis.version>
-        <mybatis-spring.version>2.0.1</mybatis-spring.version>
+        <mybatis.version>3.5.3</mybatis.version>
+        <mybatis-spring.version>2.0.3</mybatis-spring.version>
         <persistence.version>2.2</persistence.version>
         <!--bus-oauth-->
         <alipay-sdk-version>3.7.4.ALL</alipay-sdk-version>
@@ -79,9 +79,9 @@
         <!--bus-socket-->
         <netty.version>4.1.42.Final</netty.version>
         <!--bus-spring-->
-        <mysql.version>8.0.15</mysql.version>
-        <druid.version>1.1.16</druid.version>
-        <dubbo.version>2.6.6</dubbo.version>
+        <mysql.version>8.0.18</mysql.version>
+        <druid.version>1.1.20</druid.version>
+        <dubbo.version>2.6.7</dubbo.version>
         <!--bus-storage-->
         <aliyun.oss.version>3.4.2</aliyun.oss.version>
         <baidu.bos.version>0.10.48</baidu.bos.version>

bus-base/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.5</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.9.RELEASE</version>
+        <version>2.2.1.RELEASE</version>
     </parent>
 
     <properties>

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

@@ -31,7 +31,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 public class Consts extends Normal {

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

@@ -32,7 +32,7 @@
  * 系统响应码
  *
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 public class ErrorCode {

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

@@ -39,7 +39,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 @Data

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

@@ -36,7 +36,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 @Data

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

@@ -30,7 +30,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 public class BaseServiceImpl<Mapper extends BaseMapper<T>, T extends BaseEntity>

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

@@ -44,7 +44,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 @ControllerAdvice

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

@@ -35,7 +35,7 @@
  * 基础请求封装
  *
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3</version>
+    <version>5.2.5</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.2.3</version>
+    <version>5.2.5</version>
 </dependency>
 ```
 - XML注册

bus-cache/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>5.2.3</version>
+    <version>5.2.5</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.9.RELEASE</version>
+        <version>2.2.1.RELEASE</version>
     </parent>
 
     <properties>

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

@@ -40,7 +40,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 @Aspect

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

@@ -47,7 +47,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 @Singleton

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

@@ -29,7 +29,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 public class Context {

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

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

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

@@ -40,7 +40,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 public class Module extends AbstractModule {

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

@@ -27,7 +27,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 public interface Provider {

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

@@ -38,7 +38,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 public class Registry<T> implements FactoryBean<T> {

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

@@ -27,7 +27,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @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.2.3
+ * @version 5.2.5
  * @since JDK 1.8+
  */
 @Documented