Merge pull request #106 from aoju/develop

v5.6.9
aoju · Mar 13, 2020 · 97fa980 · 97fa980
2 parents b93ad1d + 9fdb2c7
commit 97fa980
Show file tree

Hide file tree

Showing 1,766 changed files with 2,014 additions and 1,982 deletions.
diff --git a/README.md b/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.6.8-blue.svg?label=Maven%20Central" ></img>
+		<img src="https://img.shields.io/badge/maven--central-v5.6.9-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">
@@ -93,13 +93,13 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>5.6.8</version>
+    <version>5.6.9</version>
 </dependency>
 ```
 
 ### Gradle
 ```
-implementation 'org.aoju:bus-all:5.6.8'
+implementation 'org.aoju:bus-all:5.6.9'
 ```
 
 ### Downlad

diff --git a/bus-all/pom.xml b/bus-all/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>5.6.8</version>
+    <version>5.6.9</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -32,11 +32,11 @@
         <ehcache.version>3.3.1</ehcache.version>
         <curator.version>4.2.0</curator.version>
         <guava.version>28.0-jre</guava.version>
-        <yaml.version>1.23</yaml.version>
+        <yaml.version>1.25</yaml.version>
         <druid.version>1.1.20</druid.version>
-        <mysql.version>8.0.18</mysql.version>
+        <mysql.version>8.0.19</mysql.version>
         <!--bus-core-->
-        <lombok.version>1.18.10</lombok.version>
+        <lombok.version>1.18.12</lombok.version>
         <!--bus-crypto-->
         <bouncycastle.version>1.60</bouncycastle.version>
         <!--bus-extra-->
@@ -54,13 +54,13 @@
         <lz4.version>1.3.0</lz4.version>
         <snappy.version>1.1.7.3</snappy.version>
         <!--bus-forest-->
-        <loader.version>2.0.1.RELEASE</loader.version>
+        <loader.version>2.2.5.RELEASE</loader.version>
         <!--bus-health-->
         <jna.version>5.5.0</jna.version>
         <!--bus-limiter-->
         <redisson.version>3.11.2</redisson.version>
         <!--bus-logger-->
-        <slf4j.version>1.7.26</slf4j.version>
+        <slf4j.version>1.7.30</slf4j.version>
         <logback.version>1.2.3</logback.version>
         <log4j.version>1.2.17</log4j.version>
         <log4j2.version>2.13.0</log4j2.version>
@@ -102,7 +102,7 @@
         <!--bus-tracer-->
         <cxf.version>2.7.18</cxf.version>
         <httpclient.version>4.5.2</httpclient.version>
-        <httpclient5.version>5.0-alpha1</httpclient5.version>
+        <httpclient5.version>5.0</httpclient5.version>
         <jersey.version>2.23.1</jersey.version>
         <quartz.version>2.2.3</quartz.version>
     </properties>

diff --git a/bus-base/pom.xml b/bus-base/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>5.6.8</version>
+    <version>5.6.9</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

diff --git a/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java b/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java
@@ -48,7 +48,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @ControllerAdvice

diff --git a/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java b/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java
@@ -33,7 +33,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public class Consts extends Normal {

diff --git a/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java b/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java
@@ -34,7 +34,7 @@
  * 系统响应码
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public class ErrorCode {

diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java b/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java
@@ -27,21 +27,20 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.aoju.bus.base.consts.Consts;
 import org.aoju.bus.core.key.ObjectID;
 import org.aoju.bus.core.lang.Normal;
-import org.aoju.bus.core.utils.DateUtils;
-import org.aoju.bus.core.utils.ReflectUtils;
-import org.aoju.bus.core.utils.StringUtils;
+import org.aoju.bus.core.utils.*;
 
 import javax.persistence.Transient;
+import java.util.List;
+import java.util.Objects;
 
 /**
- * <p>
  * Entity 基本信息.
- * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Data
@@ -155,4 +154,67 @@ private <T> void setValue(T entity, String[] fields, Object[] value) {
         }
     }
 
+    /**
+     * 设置访问信息
+     *
+     * @param <T>    对象泛型
+     * @param source 源始实体
+     * @param target 目标实体
+     */
+    public static <T extends BaseEntity> void setAccess(T source, T target) {
+        if (Objects.isNull(source) || Objects.isNull(target)) {
+            return;
+        }
+        target.setX_org_id(source.getX_org_id());
+        target.setX_user_id(source.getX_user_id());
+    }
+
+    /**
+     * 设置访问信息
+     *
+     * @param <T>    对象泛型
+     * @param source 源始实体
+     * @param target 目标实体
+     */
+    public static <T extends BaseEntity> void setAccess(T source, T... target) {
+        if (Objects.isNull(source) || ArrayUtils.isEmpty(target)) {
+            return;
+        }
+        for (T targetEntity : target) {
+            setAccess(source, targetEntity);
+        }
+    }
+
+    /**
+     * 设置访问信息
+     *
+     * @param <S>    源对象泛型
+     * @param <E>    集合元素对象泛型
+     * @param source 源始实体
+     * @param target 目标实体
+     */
+    public static <S extends BaseEntity, E extends BaseEntity> void setAccess(S source, List<E> target) {
+        if (Objects.isNull(source) || CollUtils.isEmpty(target)) {
+            return;
+        }
+        target.forEach(targetEntity -> setAccess(source, targetEntity));
+    }
+
+    /**
+     * 重置数字型字符串为null，防止插入数据库表异常
+     *
+     * @param <T>    对象泛型
+     * @param entity 实体对象
+     * @param fields 数字型字符串属性数组
+     * @param values 值数据
+     */
+    public static <T extends BaseEntity> void resetIntField(T entity, String[] fields, String[] values) {
+        for (int i = 0; i < fields.length; i++) {
+            String field = fields[i];
+            if (Consts.EMPTY.equals(values[i]) && ReflectUtils.hasField(entity, field)) {
+                ReflectUtils.invokeSetter(entity, field, null);
+            }
+        }
+    }
+
 }
diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java
@@ -36,7 +36,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Data

diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java
@@ -33,7 +33,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Data

diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java b/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java
@@ -36,7 +36,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Data

diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java
@@ -37,7 +37,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Data

diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java
@@ -36,7 +36,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Data

diff --git a/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java b/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java
@@ -30,7 +30,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public interface BaseMapper<T> extends Mapper<T> {

diff --git a/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java b/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java
@@ -30,7 +30,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public interface Mapper<T> extends org.aoju.bus.mapper.common.Mapper<T> {

diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java b/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java
@@ -34,7 +34,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public interface BaseService<T> extends Service {

diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/Service.java b/bus-base/src/main/java/org/aoju/bus/base/service/Service.java
@@ -30,7 +30,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public interface Service {

diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java b/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java
@@ -45,7 +45,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public class BaseServiceImpl<Mapper extends BaseMapper<T>, T extends BaseEntity>

diff --git a/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java b/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java
@@ -36,7 +36,7 @@
  * 基础请求封装
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public class BaseController<Service extends BaseService<T>, T> extends Controller {

diff --git a/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java b/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java
@@ -33,7 +33,7 @@
  * 基础输出封装
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public class Controller {

diff --git a/bus-bom/pom.xml b/bus-bom/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-bom</artifactId>
-    <version>5.6.8</version>
+    <version>5.6.9</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>

diff --git a/bus-cache/README.md b/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.6.8</version>
+    <version>5.6.9</version>
 </dependency>
 ```
 - XML注册

diff --git a/bus-cache/pom.xml b/bus-cache/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>5.6.8</version>
+    <version>5.6.9</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -29,7 +29,7 @@
         <ehcache.version>3.3.1</ehcache.version>
         <curator.version>4.2.0</curator.version>
         <guava.version>28.0-jre</guava.version>
-        <yaml.version>1.23</yaml.version>
+        <yaml.version>1.25</yaml.version>
         <hession.version>4.0.38</hession.version>
         <druid.version>1.1.20</druid.version>
     </properties>

diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java b/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java
@@ -31,7 +31,7 @@
  * 缓存接口
  *
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public interface CacheX {

diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java b/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java
@@ -44,7 +44,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Singleton

diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Context.java b/bus-cache/src/main/java/org/aoju/bus/cache/Context.java
@@ -28,7 +28,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public class Context {

diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java b/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java
@@ -37,7 +37,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 @Singleton

diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Module.java b/bus-cache/src/main/java/org/aoju/bus/cache/Module.java
@@ -40,7 +40,7 @@
 
 /**
  * @author Kimi Liu
- * @version 5.6.8
+ * @version 5.6.9
  * @since JDK 1.8+
  */
 public class Module extends AbstractModule {