v6.1.2

aoju · Nov 19, 2020 · 2d83d15 · 2d83d15
2 parents 25f2e1c + b2f1c9d
commit 2d83d15
Show file tree

Hide file tree

Showing 2,819 changed files with 11,953 additions and 5,197 deletions.
diff --git a/README.md b/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.1.1-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v6.1.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">
@@ -70,7 +70,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 |[ √ ]|bus-oauth|第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)|
 |[ √ ]|bus-pager|数据分页,mybatis|
 |[ √ ]|bus-office|office等相关转换及处理,POI封装实现，使Java操作Excel等文件变得更加简单|
-|[ √ ]|bus-opencv|图像识别及分析，提供丰富的徒刑图像处理算法,跨平台支持等|
+|[ √ ]|bus-opencv|图像识别及分析，提供丰富的图形图像处理算法,跨平台支持等|
 |[ √ ]|bus-proxy|公共代理，使动态代理变得简单|
 |[ √ ]|bus-sensitive|敏感数据脱敏,对应用和使用者透明，业务逻辑无感知，通过配置集成，改动代码量小|
 |[ √ ]|bus-setting|设置工具类， 用于支持设置/配置|
@@ -98,7 +98,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.1.1</version>
+    <version>6.1.2</version>
 </dependency>
 ```
 或者单独使用某个组件
@@ -112,7 +112,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 
 ### Gradle
 ```
-implementation 'org.aoju:bus-all:6.1.1'
+implementation 'org.aoju:bus-all:6.1.2'
 ```
 
 ### Downlad

diff --git a/bus-all/pom.xml b/bus-all/pom.xml
@@ -6,13 +6,38 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.1.1</version>
+    <version>6.1.2</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
     <description>Bus All</description>
     <url>https://github.com/aoju/bus</url>
 
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>https://opensource.org/licenses/MIT</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <connection>scm:[email protected]:aoju/bus.git</connection>
+        <developerConnection>scm:[email protected]:aoju/bus.git</developerConnection>
+        <url>[email protected]:aoju/bus.git</url>
+    </scm>
+
+    <developers>
+        <developer>
+            <name>Kimi Liu</name>
+            <url>https://github.com/aoju/bus.git</url>
+        </developer>
+    </developers>
+
+    <issueManagement>
+        <system>Github Issue</system>
+        <url>https://github.com/aoju/bus/issues</url>
+    </issueManagement>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -190,31 +215,6 @@
         </dependency>
     </dependencies>
 
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>https://opensource.org/licenses/MIT</url>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:[email protected]:aoju/bus.git</connection>
-        <developerConnection>scm:[email protected]:aoju/bus.git</developerConnection>
-        <url>[email protected]:aoju/bus.git</url>
-    </scm>
-
-    <developers>
-        <developer>
-            <name>Kimi Liu</name>
-            <url>https://github.com/aoju/bus.git</url>
-        </developer>
-    </developers>
-
-    <issueManagement>
-        <system>Github Issue</system>
-        <url>https://github.com/aoju/bus/issues</url>
-    </issueManagement>
-
     <build>
         <plugins>
             <plugin>

diff --git a/bus-all/src/main/java/org/aoju/bus/Bus.java b/bus-all/src/main/java/org/aoju/bus/Bus.java
@@ -21,6 +21,7 @@
  * 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.bus;
 
@@ -42,7 +43,7 @@
  * </p>
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @since JDK 1.8+
  */
 public class Bus {

diff --git a/bus-base/pom.xml b/bus-base/pom.xml
@@ -6,19 +6,44 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>6.1.1</version>
+    <version>6.1.2</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
     <description>Bus Base</description>
     <url>https://github.com/aoju/bus</url>
 
+    <licenses>
+        <license>
+            <name>The MIT License (MIT)</name>
+            <url>https://opensource.org/licenses/MIT</url>
+        </license>
+    </licenses>
+
+    <scm>
+        <connection>scm:[email protected]:aoju/bus.git</connection>
+        <developerConnection>scm:[email protected]:aoju/bus.git</developerConnection>
+        <url>[email protected]:aoju/bus.git</url>
+    </scm>
+
+    <developers>
+        <developer>
+            <name>Kimi Liu</name>
+            <url>https://github.com/aoju/bus.git</url>
+        </developer>
+    </developers>
+
+    <issueManagement>
+        <system>Github Issue</system>
+        <url>https://github.com/aoju/bus/issues</url>
+    </issueManagement>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.compiler.version>1.8</project.compiler.version>
-        <spring.boot.version>2.3.0.RELEASE</spring.boot.version>
-        <lombok.version>1.18.12</lombok.version>
+        <spring.boot.version>2.4.0</spring.boot.version>
+        <lombok.version>1.18.16</lombok.version>
         <persistence.version>2.2</persistence.version>
     </properties>
 
@@ -48,31 +73,6 @@
         </dependency>
     </dependencies>
 
-    <licenses>
-        <license>
-            <name>The MIT License (MIT)</name>
-            <url>https://opensource.org/licenses/MIT</url>
-        </license>
-    </licenses>
-
-    <scm>
-        <connection>scm:[email protected]:aoju/bus.git</connection>
-        <developerConnection>scm:[email protected]:aoju/bus.git</developerConnection>
-        <url>[email protected]:aoju/bus.git</url>
-    </scm>
-
-    <developers>
-        <developer>
-            <name>Kimi Liu</name>
-            <url>https://github.com/aoju/bus.git</url>
-        </developer>
-    </developers>
-
-    <issueManagement>
-        <system>Github Issue</system>
-        <url>https://github.com/aoju/bus/issues</url>
-    </issueManagement>
-
     <build>
         <plugins>
             <plugin>

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
@@ -21,6 +21,7 @@
  * 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.bus.base.advice;
 
@@ -47,7 +48,7 @@
  * 异常信息拦截处理
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,6 +21,7 @@
  * 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.bus.base.consts;
 
@@ -31,7 +32,7 @@
  * 公共常量
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,6 +21,7 @@
  * 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.bus.base.consts;
 
@@ -34,7 +35,7 @@
  * 系统响应码
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,6 +21,7 @@
  * 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.bus.base.entity;
 
@@ -39,7 +40,7 @@
  * Entity 基本信息.
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @since JDK 1.8+
  */
 @Data

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
@@ -21,6 +21,7 @@
  * 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.bus.base.entity;
 
@@ -33,7 +34,7 @@
  * Entity 实体
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,6 +21,7 @@
  * 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.bus.base.entity;
 
@@ -33,7 +34,7 @@
  * 返回值公用类
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,6 +21,7 @@
  * 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.bus.base.entity;
 
@@ -33,7 +34,7 @@
  * 授权公用类
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,6 +21,7 @@
  * 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.bus.base.entity;
 
@@ -35,7 +36,7 @@
  * 返回结果公用
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,6 +21,7 @@
  * 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.bus.base.entity;
 
@@ -33,7 +34,7 @@
  * 访问链路跟踪
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,14 +21,15 @@
  * 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.bus.base.mapper;
 
 /**
  * BaseMapper 接口
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @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
@@ -21,14 +21,15 @@
  * 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.bus.base.mapper;
 
 /**
  * CoreMapper 接口
  *
  * @author Kimi Liu
- * @version 6.1.1
+ * @version 6.1.2
  * @since JDK 1.8+
  */
 public interface Mapper<T> extends org.aoju.bus.mapper.common.Mapper<T> {