Merge pull request #30 from aoju/develop

[Update] v3.1.9

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-v3.1.8-blue.svg?label=Maven%20Central" ></img>
+		<img src="https://img.shields.io/badge/maven--central-v3.1.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">

bus-all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>3.1.8</version>
+    <version>3.1.9</version>
     <packaging>jar</packaging>
 
     <name>bus-all</name>

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

@@ -30,7 +30,7 @@
  * Version is Licensed under the MIT License, Version 3.0.0 (the "License")
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public final class Bus extends Version {

bus-base/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>3.1.8</version>
+    <version>3.1.9</version>
     <packaging>jar</packaging>
 
     <name>bus-base</name>

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

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

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

@@ -29,7 +29,7 @@
  * 系统响应码
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public enum ErrorCode {

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

@@ -35,7 +35,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 @MappedSuperclass

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

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

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

@@ -31,7 +31,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 @Data

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

@@ -34,7 +34,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 @Data

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

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

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

@@ -34,7 +34,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @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 3.1.8
+ * @version 3.1.9
  * @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 3.1.8
+ * @version 3.1.9
  * @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 3.1.8
+ * @version 3.1.9
  * @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 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public interface Service {

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

@@ -46,7 +46,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @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

@@ -42,7 +42,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 @ControllerAdvice

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

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

@@ -36,7 +36,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public class Controller {

bus-boot/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-boot</artifactId>
-    <version>3.1.8</version>
+    <version>3.1.9</version>
     <packaging>jar</packaging>
 
     <name>bus-boot</name>

bus-boot/src/main/java/org/aoju/bus/Version.java

@@ -28,7 +28,7 @@
  * Version is Licensed under the MIT License, Version 3.0.0 (the "License")
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public class Version {

bus-boot/src/main/java/org/aoju/bus/boot/consts/BusConsts.java

@@ -28,7 +28,7 @@
  * 全局常量配置
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public class BusConsts {
@@ -53,6 +53,6 @@ public class BusConsts {
     /***
      * 应用属性
      */
-    public static final String BUS_BOOT_PROPERTIES = "BusConfigurationProperties";
+    public static final String BUS_BOOT_PROPERTIES = "EnvConfigurable";
 
 }

bus-boot/src/main/java/org/aoju/bus/boot/env/BusEnvConfigurable.java → bus-boot/src/main/java/org/aoju/bus/boot/env/EnvConfigurable.java

@@ -40,19 +40,19 @@
  * 将作为一个名为BusConfigurationProperties的属性源添加
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 @ComponentScan("org.aoju.**")
 @Order(Ordered.LOWEST_PRECEDENCE - 100)
-public class BusEnvConfigurable implements EnvironmentPostProcessor {
+public class EnvConfigurable implements EnvironmentPostProcessor {
 
     @Override
     public void postProcessEnvironment(ConfigurableEnvironment environment,
                                        SpringApplication application) {
 
         /**
-         * Get Version version properties
+         * 获取版本信息
          */
         Properties properties = getProperties();
 
@@ -61,13 +61,13 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
         environment.getPropertySources().addLast(propertySource);
 
         /**
-         * set required properties
+         * 设置必要参数
          **/
         environment.setRequiredProperties(BusConsts.BUS_APP_NAME);
     }
 
     /**
-     * Get boot Version and print it on banner
+     * 获取版本信息以及banner信息
      *
      * @return properties
      */
@@ -81,7 +81,7 @@ protected Properties getProperties() {
     }
 
     /**
-     * Get Version Version string.
+     * 获取bus版本信息.
      *
      * @return version
      */

bus-boot/src/main/java/org/aoju/bus/boot/health/HealthIndicators.java

@@ -24,21 +24,23 @@
 package org.aoju.bus.boot.health;
 
 /**
- * Check whether runtime is healthy.
+ * 检查运行时是否健康.
  *
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public interface HealthIndicators {
 
     /**
-     * Check whether runtime is readiness healthy
+     * 检查运行时是否准备就绪
+     * @return true/false
      */
     boolean isReadinessHealth();
 
     /**
-     * Check whether runtime is liveness health
+     * 检查运行时是否为活动健康状态
+     * @return true/false
      */
     boolean isLivenessHealth();
 

bus-boot/src/main/resources/META-INF/spring.factories

@@ -1,2 +1,2 @@
 org.springframework.boot.env.EnvironmentPostProcessor=\
-org.aoju.bus.boot.env.BusEnvConfigurable
+org.aoju.bus.boot.env.EnvConfigurable

bus-boot/src/main/resources/config/application.yml

@@ -1,6 +1,7 @@
 logging:
   pattern:
     console: "%boldRed(%d{yyyy-MM-dd HH:mm:ss}) %green([%p]) - %highlight(%C:%L) : - %magenta(%m%n)"
+    file: "%boldRed(%d{yyyy-MM-dd HH:mm:ss}) %green([%p]) - %highlight(%C:%L) : - %magenta(%m%n)"
   file:
     max-size: 10MB
 

bus-cache/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>3.1.8</version>
+    <version>3.1.9</version>
     <packaging>jar</packaging>
 
     <name>bus-cache</name>

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

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

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

@@ -30,7 +30,7 @@
 
 /**
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public class CacheConfig {

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

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

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

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

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

@@ -41,7 +41,7 @@
 
 /**
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public class CacheModule extends AbstractModule {

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

@@ -39,7 +39,7 @@
 
 /**
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 public class CacheProxy<T> implements FactoryBean<T> {

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

@@ -27,7 +27,7 @@
 
 /**
  * @author Kimi Liu
- * @version 3.1.8
+ * @version 3.1.9
  * @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 3.1.8
+ * @version 3.1.9
  * @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 3.1.8
+ * @version 3.1.9
  * @since JDK 1.8
  */
 @Documented