Merge pull request #22 from aoju/develop

Develop

Author: 839536

bus-all/pom.xml

@@ -6,9 +6,13 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>3.0.6</version>
+    <version>3.0.8</version>
     <packaging>jar</packaging>
 
+    <name>bus-all</name>
+    <description>Bus All</description>
+    <url>https://github.com/aoju/bus</url>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -124,11 +128,11 @@
             <artifactId>bus-http</artifactId>
             <version>${project.version}</version>
         </dependency>
-<!--        <dependency>
+        <dependency>
             <groupId>org.aoju</groupId>
             <artifactId>bus-limiter</artifactId>
             <version>${project.version}</version>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.aoju</groupId>
             <artifactId>bus-logger</artifactId>

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

@@ -0,0 +1,38 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2017, aoju.org All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.aoju;
+
+import org.aoju.bus.Version;
+
+/**
+ * 用于识别当前版本号和版权声明!
+ * Version is Licensed under the MIT License, Version 3.0.0 (the "License")
+ *
+ * @author Kimi Liu
+ * @version 3.0.6
+ * @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.0.6</version>
+    <version>3.0.8</version>
     <packaging>jar</packaging>
 
     <name>bus-base</name>

bus-boot/pom.xml

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

bus-boot/src/main/java/org/aoju/bus/Bus.java renamed to bus-boot/src/main/java/org/aoju/bus/Version.java

@@ -21,24 +21,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package org.aoju;
+package org.aoju.bus;
 
 /**
  * 用于识别当前版本号和版权声明!
- * Bus is Licensed under the MIT License, Bus 3.0.0 (the "License")
+ * Version is Licensed under the MIT License, Version 3.0.0 (the "License")
  *
  * @author Kimi Liu
  * @version 3.0.6
  * @since JDK 1.8
  */
-public final class Bus {
-
-
-    Bus() {
-    }
+public class Version {
 
     /**
-     * 获取 Bus 的版本号，版本号的命名规范
+     * 获取 Version 的版本号，版本号的命名规范
      *
      * <pre>
      * [大版本].[小版本].[发布流水号]
@@ -82,7 +78,7 @@ public static String minor() {
      * @return 阶段号
      */
     public static String stage() {
-        return "5";
+        return "8";
     }
 
     /**

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

@@ -36,8 +36,12 @@ public class BusConsts {
     /***
      * 应用名: 备注 @Value("${spring.application.name:@null}")
      */
-    public static final String BUS_APP_NAME = "spring.application.name";
+    public static final String BUS_VERSION = "version";
 
+    /***
+     * 应用名: 备注 @Value("${spring.application.name:@null}")
+     */
+    public static final String BUS_APP_NAME = "spring.application.name";
     /***
      * 应用版本号
      */

bus-boot/src/main/java/org/aoju/bus/boot/env/BusEnvironment.java

@@ -23,7 +23,7 @@
  */
 package org.aoju.bus.boot.env;
 
-import org.aoju.Bus;
+import org.aoju.bus.Version;
 import org.aoju.bus.boot.consts.BusConsts;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.env.EnvironmentPostProcessor;
@@ -50,7 +50,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
                                        SpringApplication application) {
 
         /**
-         * Get Bus version properties
+         * Get Version version properties
          */
         Properties properties = getProperties();
 
@@ -79,12 +79,12 @@ protected Properties getProperties() {
     }
 
     /**
-     * Get Bus Version string.
+     * Get Version Version string.
      *
      * @return version
      */
     protected String getVersion() {
-        return Bus.version() == null ? "" : Bus.version();
+        return Version.version() == null ? "" : Version.version();
     }
 
 }

bus-cache/pom.xml

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

bus-core/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-core</artifactId>
-    <version>3.0.6</version>
+    <version>3.0.8</version>
     <packaging>jar</packaging>
 
     <name>bus-core</name>

bus-cron/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-cron</artifactId>
-    <version>3.0.6</version>
+    <version>3.0.8</version>
     <packaging>jar</packaging>
 
     <name>bus-cron</name>