v5.9.5

v5.9.5

Author: 839536

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.9.3-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v5.9.5-blue.svg?label=Maven%20Central" />
 	</a>
 	<a target="_blank" href="https://travis-ci.org/aoju/bus">
 		<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
@@ -83,7 +83,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 
 
 #### 功能概述
-1. Java基础工具类，对文件、流、加密解密、转码、正则、线程、XML等JDK方法进行封装，组成各种Utils工具类；
+1. Java基础工具类，对文件、流、加密解密、转码、正则、线程、XML等JDK方法进行封装，组成各种工具类；
    以及结合springboot封装常用工具按需加载例如mybatis、xss、i18n、sensitive、validate等框架
 
 2. 详细说明以及使用姿势请参考每个模块下README介绍
@@ -95,7 +95,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>5.9.3</version>
+    <version>5.9.5</version>
 </dependency>
 ```
 或者单独使用某个组建
@@ -109,7 +109,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 
 ### Gradle
 ```
-implementation 'org.aoju:bus-all:5.9.3'
+implementation 'org.aoju:bus-all:5.9.5'
 ```
 
 ### Downlad

bus-all/pom.xml

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

bus-all/src/main/java/org/aoju/bus/Bus.java

@@ -42,7 +42,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 5.9.3
+ * @version 5.9.5
  * @since JDK 1.8+
  */
 public class Bus extends Version {

bus-base/pom.xml

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

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

@@ -30,8 +30,8 @@
 import org.aoju.bus.core.lang.exception.CrontabException;
 import org.aoju.bus.core.lang.exception.InstrumentException;
 import org.aoju.bus.core.lang.exception.ValidateException;
-import org.aoju.bus.core.utils.RuntimeUtils;
-import org.aoju.bus.core.utils.StringUtils;
+import org.aoju.bus.core.toolkit.RuntimeKit;
+import org.aoju.bus.core.toolkit.StringKit;
 import org.aoju.bus.logger.Logger;
 import org.springframework.http.HttpStatus;
 import org.springframework.ui.Model;
@@ -47,7 +47,7 @@
  * 异常信息拦截处理
  *
  * @author Kimi Liu
- * @version 5.9.3
+ * @version 5.9.5
  * @since JDK 1.8+
  */
 @ControllerAdvice
@@ -85,7 +85,7 @@ public void addAttributes(Model model) {
     @ResponseBody
     @ExceptionHandler(value = Exception.class)
     public Object defaultException(Exception e) {
-        Logger.error(RuntimeUtils.getStackTrace(e));
+        Logger.error(RuntimeKit.getStackTrace(e));
         return write(ErrorCode.EM_FAILURE);
     }
 
@@ -98,7 +98,7 @@ public Object defaultException(Exception e) {
     @ResponseBody
     @ExceptionHandler(value = InstrumentException.class)
     public Object instrumentException(InstrumentException e) {
-        Logger.error(RuntimeUtils.getStackTrace(e));
+        Logger.error(RuntimeKit.getStackTrace(e));
         return write(ErrorCode.EM_100510);
     }
 
@@ -112,8 +112,8 @@ public Object instrumentException(InstrumentException e) {
     @ResponseBody
     @ExceptionHandler(value = BusinessException.class)
     public Object businessException(BusinessException e) {
-        Logger.error(RuntimeUtils.getStackTrace(e));
-        if (StringUtils.isBlank(e.getErrcode())) {
+        Logger.error(RuntimeKit.getStackTrace(e));
+        if (StringKit.isBlank(e.getErrcode())) {
             return write(ErrorCode.EM_100513, e.getMessage());
         }
         return write(e.getErrcode());
@@ -128,7 +128,7 @@ public Object businessException(BusinessException e) {
     @ResponseBody
     @ExceptionHandler(value = CrontabException.class)
     public Object crontabException(CrontabException e) {
-        Logger.error(RuntimeUtils.getStackTrace(e));
+        Logger.error(RuntimeKit.getStackTrace(e));
         return write(ErrorCode.EM_100514);
     }
 
@@ -141,7 +141,7 @@ public Object crontabException(CrontabException e) {
     @ResponseBody
     @ExceptionHandler(value = ValidateException.class)
     public Object validateException(ValidateException e) {
-        Logger.error(RuntimeUtils.getStackTrace(e));
+        Logger.error(RuntimeKit.getStackTrace(e));
         return write(e.getErrcode(), e.getErrmsg());
     }
 

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

@@ -31,7 +31,7 @@
  * 公共常量
  *
  * @author Kimi Liu
- * @version 5.9.3
+ * @version 5.9.5
  * @since JDK 1.8+
  */
 public class Consts extends Normal {

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

@@ -34,7 +34,7 @@
  * 系统响应码
  *
  * @author Kimi Liu
- * @version 5.9.3
+ * @version 5.9.5
  * @since JDK 1.8+
  */
 public class ErrorCode {

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

@@ -30,7 +30,7 @@
 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.*;
+import org.aoju.bus.core.toolkit.*;
 
 import javax.persistence.Transient;
 import java.util.List;
@@ -40,7 +40,7 @@
  * Entity 基本信息.
  *
  * @author Kimi Liu
- * @version 5.9.3
+ * @version 5.9.5
  * @since JDK 1.8+
  */
 @Data
@@ -99,7 +99,7 @@ public static <T extends BaseEntity> void setAccess(T source, T target) {
      * @param target 目标实体
      */
     public static <T extends BaseEntity> void setAccess(T source, T... target) {
-        if (Objects.isNull(source) || ArrayUtils.isEmpty(target)) {
+        if (Objects.isNull(source) || ArrayKit.isEmpty(target)) {
             return;
         }
         for (T targetEntity : target) {
@@ -116,7 +116,7 @@ public static <T extends BaseEntity> void setAccess(T source, T... target) {
      * @param target 目标实体
      */
     public static <S extends BaseEntity, E extends BaseEntity> void setAccess(S source, List<E> target) {
-        if (Objects.isNull(source) || CollUtils.isEmpty(target)) {
+        if (Objects.isNull(source) || CollKit.isEmpty(target)) {
             return;
         }
         target.forEach(targetEntity -> setAccess(source, targetEntity));
@@ -133,8 +133,8 @@ public static <S extends BaseEntity, E extends BaseEntity> void setAccess(S sour
     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);
+            if (Consts.EMPTY.equals(values[i]) && ReflectKit.hasField(entity, field)) {
+                ReflectKit.invokeSetter(entity, field, null);
             }
         }
     }
@@ -147,13 +147,13 @@ public static <T extends BaseEntity> void resetIntField(T entity, String[] field
      */
     public <T> void setCreateInfo(T entity) {
         String id = ObjectID.id();
-        String timestamp = StringUtils.toString(DateUtils.timestamp());
+        String timestamp = StringKit.toString(DateKit.timestamp());
         String[] fields = {"id", "created"};
         Object[] value = new Object[]{id, timestamp};
-        if (ObjectUtils.isEmpty(getValue(entity, "creator"))) {
+        if (ObjectKit.isEmpty(getValue(entity, "creator"))) {
             fields = new String[]{"id", "creator", "created"};
             value = new Object[]{id,
-                    ObjectUtils.isEmpty(getValue(entity, "x_user_id")) ? "-1" : getValue(entity, "x_user_id"),
+                    ObjectKit.isEmpty(getValue(entity, "x_user_id")) ? "-1" : getValue(entity, "x_user_id"),
                     timestamp};
         }
         setValue(entity, fields, value);
@@ -166,12 +166,12 @@ public <T> void setCreateInfo(T entity) {
      * @param entity 反射对象
      */
     public <T> void setUpdatedInfo(T entity) {
-        String timestamp = StringUtils.toString(DateUtils.timestamp());
+        String timestamp = StringKit.toString(DateKit.timestamp());
         String[] fields = {"modified"};
         Object[] value = new Object[]{timestamp};
-        if (ObjectUtils.isEmpty(getValue(entity, "modifier"))) {
+        if (ObjectKit.isEmpty(getValue(entity, "modifier"))) {
             fields = new String[]{"modifier", "modified"};
-            value = new Object[]{ObjectUtils.isEmpty(getValue(entity, "x_user_id")) ? "-1" : getValue(entity, "x_user_id"),
+            value = new Object[]{ObjectKit.isEmpty(getValue(entity, "x_user_id")) ? "-1" : getValue(entity, "x_user_id"),
                     timestamp};
         }
 
@@ -192,10 +192,10 @@ public <T> void setCreatAndUpdatInfo(T entity) {
      * @return 主键为空, 则返回false；主键有值,返回true
      */
     public <T> boolean isPKNotNull(T entity, String field) {
-        if (!ReflectUtils.hasField(entity, field)) {
+        if (!ReflectKit.hasField(entity, field)) {
             return false;
         }
-        Object value = ReflectUtils.getFieldValue(entity, field);
+        Object value = ReflectKit.getFieldValue(entity, field);
         return value != null && !Normal.EMPTY.equals(value);
     }
 
@@ -207,8 +207,8 @@ public <T> boolean isPKNotNull(T entity, String field) {
      * @param field  属性数组
      */
     private <T> Object getValue(T entity, String field) {
-        if (ReflectUtils.hasField(entity, field)) {
-            Object object = ReflectUtils.invokeGetter(entity, field);
+        if (ReflectKit.hasField(entity, field)) {
+            Object object = ReflectKit.invokeGetter(entity, field);
             return object != null ? object.toString() : null;
         }
         return null;
@@ -225,8 +225,8 @@ private <T> Object getValue(T entity, String field) {
     private <T> void setValue(T entity, String[] fields, Object[] value) {
         for (int i = 0; i < fields.length; i++) {
             String field = fields[i];
-            if (ReflectUtils.hasField(entity, field)) {
-                ReflectUtils.invokeSetter(entity, field, value[i]);
+            if (ReflectKit.hasField(entity, field)) {
+                ReflectKit.invokeSetter(entity, field, value[i]);
             }
         }
     }

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

@@ -34,7 +34,7 @@
  * Entity 实体
  *
  * @author Kimi Liu
- * @version 5.9.3
+ * @version 5.9.5
  * @since JDK 1.8+
  */
 @Data

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

@@ -33,7 +33,7 @@
  * 返回值公用类
  *
  * @author Kimi Liu
- * @version 5.9.3
+ * @version 5.9.5
  * @since JDK 1.8+
  */
 @Data