v6.2.2

v6.2.2

README.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
     <a target="_blank" href="https://search.maven.org/search?q=org.aoju">
-		<img src="https://img.shields.io/badge/maven--central-v6.2.1-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v6.2.2-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">
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java8
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.2.1</version>
+    <version>6.2.2</version>
 </dependency>
 ```
 
@@ -114,7 +114,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java8
 ### Gradle
 
 ```
-implementation 'org.aoju:bus-all:6.2.1'
+implementation 'org.aoju:bus-all:6.2.2'
 ```
 
 ### Downlad

bus-all/pom.xml

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

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

@@ -43,7 +43,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @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>6.2.1</version>
+    <version>6.2.2</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

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

@@ -48,7 +48,7 @@
  * 异常信息拦截处理
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @ControllerAdvice

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

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

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

@@ -35,7 +35,7 @@
  * 系统响应码
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 public class ErrorCode {
@@ -114,13 +114,13 @@ public class ErrorCode {
         register(EM_100109, "缺少language参数");
         register(EM_100110, "缺少fields参数");
         register(EM_100111, "缺少format参数");
-        register(EM_100112, "code错误");
-        register(EM_100113, "code过期");
-        register(EM_100114, "缺少sign参数");
-        register(EM_100115, "缺少noncestr参数");
-        register(EM_100116, "缺少timestamp参数");
-        register(EM_100117, "缺少sign");
-        register(EM_100118, "token过期");
+        register(EM_100112, "缺少sign参数");
+        register(EM_100113, "缺少noncestr参数");
+        register(EM_100114, "缺少timestamp参数");
+        register(EM_100115, "缺少sign");
+        register(EM_100116, "当前令牌已过期");
+        register(EM_100117, "当前账号已登录");
+        register(EM_100118, "无效的签名");
         register(EM_100200, "请使用GET请求");
         register(EM_100201, "请使用POST请求");
         register(EM_100202, "请使用PUT请求");

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

@@ -40,7 +40,7 @@
  * Entity 基本信息.
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @Data
@@ -212,7 +212,7 @@ public <T> boolean isPKNotNull(T entity, String field) {
             return false;
         }
         Object value = ReflectKit.getFieldValue(entity, field);
-        return value != null && !Normal.EMPTY.equals(value);
+        return null != value && !Normal.EMPTY.equals(value);
     }
 
     /**
@@ -225,7 +225,7 @@ public <T> boolean isPKNotNull(T entity, String field) {
     private <T> Object getValue(T entity, String field) {
         if (ReflectKit.hasField(entity, field)) {
             Object object = ReflectKit.invokeGetter(entity, field);
-            return object != null ? object.toString() : null;
+            return null != object ? object.toString() : null;
         }
         return null;
     }

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

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

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

@@ -34,7 +34,7 @@
  * 返回值公用类
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @Data

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

@@ -34,7 +34,7 @@
  * 授权公用类
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @Data

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

@@ -36,7 +36,7 @@
  * 返回结果公用
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @Data
@@ -57,7 +57,7 @@ public Result(int total, List<T> rows) {
     }
 
     public Result(List<T> rows, int pageSize) {
-        if (rows == null || rows.isEmpty()) {
+        if (null == rows || rows.isEmpty()) {
             throw new IllegalArgumentException("data must be not empty!");
         }
         new Result<>(rows, rows.size(), pageSize);

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

@@ -34,7 +34,7 @@
  * 访问链路跟踪
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @Data

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

@@ -29,7 +29,7 @@
  * BaseMapper 接口
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @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 @@
  * CoreMapper 接口
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @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 @@
  * BaseService 接口
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 public interface BaseService<T> extends Service {

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

@@ -28,7 +28,7 @@
  * Service 接口
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 public interface Service {

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

@@ -44,7 +44,7 @@
  * BaseService 接口实现
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @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

@@ -36,7 +36,7 @@
  * 基础请求封装
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @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

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

bus-bom/pom.xml

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

bus-cache/README.md

@@ -69,7 +69,7 @@ Object func(@CacheKey("#arg0[#i]") List<Long> ids){
 <dependency>
     <groupId>org.aoju.bus</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>6.2.1</version>
+    <version>6.2.2</version>
 </dependency>
 ```
 

bus-cache/pom.xml

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

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

@@ -32,7 +32,7 @@
  * 缓存接口
  *
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 public interface CacheX {

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

@@ -45,7 +45,7 @@
 
 /**
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @Singleton

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

@@ -29,7 +29,7 @@
 
 /**
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 public class Context {
@@ -56,7 +56,7 @@ public static Context newConfig(Map<String, CacheX> caches) {
     }
 
     public boolean isPreventOn() {
-        return prevent != null && prevent == Switch.ON;
+        return null != prevent && prevent == Switch.ON;
     }
 
     public Map<String, CacheX> getCaches() {

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

@@ -31,7 +31,7 @@
 
 /**
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 public interface Hitting {

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

@@ -38,20 +38,21 @@
 
 /**
  * @author Kimi Liu
- * @version 6.2.1
+ * @version 6.2.2
  * @since JDK 1.8+
  */
 @Singleton
 public class Manage {
 
-    // defaultCache和cachePool直接使用Pair实现, 减小new Object的损耗
+    /**
+     * defaultCache和cachePool直接使用Pair实现, 减小new Object的损耗
+     */
     private CachePair<String, CacheX> defaultCache;
 
     private Map<String, CachePair<String, CacheX>> cachePool = new ConcurrentHashMap<>();
 
     @Inject
     public void setCachePool(Map<String, CacheX> caches) {
-        // default cache impl
         Map.Entry<String, CacheX> entry = caches.entrySet().iterator().next();
         this.defaultCache = CachePair.of(entry.getKey(), entry.getValue());
 
@@ -76,7 +77,7 @@ public Object readSingle(String cache, String key) {
     }
 
     public void writeSingle(String cache, String key, Object value, int expire) {
-        if (value != null) {
+        if (null != value) {
             try {
                 CachePair<String, CacheX> cacheImpl = getCacheImpl(cache);
 
@@ -111,21 +112,18 @@ public CacheKeys readBatch(String cache, Collection<String> keys) {
                 Set<String> notHitKeys = new LinkedHashSet<>();
                 for (String key : keys) {
                     Object value = cacheMap.get(key);
-
-                    if (value == null) {
+                    if (null == value) {
                         notHitKeys.add(key);
                     } else {
                         hitValueMap.put(key, value);
                     }
                 }
-
                 cacheKeys = new CacheKeys(hitValueMap, notHitKeys);
             } catch (Throwable e) {
                 Logger.error("read multi cache failed, keys: {}", keys, e);
                 cacheKeys = new CacheKeys();
             }
         }
-
         return cacheKeys;
     }
 
@@ -145,7 +143,7 @@ public void writeBatch(String cache, Map<String, Object> keyValueMap, int expire
     }
 
     public void remove(String cache, String... keys) {
-        if (keys != null && keys.length != 0) {
+        if (null != keys && keys.length != 0) {
             try {
                 CachePair<String, CacheX> cacheImpl = getCacheImpl(cache);