v6.0.9

v6.0.9

Author: 839536

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.0.8-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v6.0.9-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">
@@ -20,9 +20,6 @@
 	<a target="_blank" href="https://www.mysql.com">
 		<img src="https://img.shields.io/badge/Mysql-5.7-blue.svg">
 	</a>
-	<a target="_blank" href="https://swagger.io">
-		<img src="https://img.shields.io/badge/swagger-2.9.2-brightgreen.svg">
-	</a>
 	<a target="_blank" href="http://dubbo.apache.org">
 		<img src="https://img.shields.io/badge/dubbo-2.7.5-yellow.svg">
 	</a>
@@ -101,7 +98,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 <dependency>
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.0.8</version>
+    <version>6.0.9</version>
 </dependency>
 ```
 或者单独使用某个组件
@@ -115,7 +112,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
 
 ### Gradle
 ```
-implementation 'org.aoju:bus-all:6.0.8'
+implementation 'org.aoju:bus-all:6.0.9'
 ```
 
 ### Downlad

bus-all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-all</artifactId>
-    <version>6.0.8</version>
+    <version>6.0.9</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 6.0.8
+ * @version 6.0.9
  * @since JDK 1.8+
  */
 public class Bus {

bus-base/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.aoju</groupId>
     <artifactId>bus-base</artifactId>
-    <version>6.0.8</version>
+    <version>6.0.9</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -19,16 +19,10 @@
         <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>
-        <swagger.version>3.0.0</swagger.version>
         <persistence.version>2.2</persistence.version>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>bus-mapper</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>bus-pager</artifactId>
@@ -46,82 +40,6 @@
             <version>${persistence.version}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-            <version>${swagger.version}</version>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-aop</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-expression</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>byte-buddy</artifactId>
-                    <groupId>net.bytebuddy</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.swagger</groupId>
-                    <artifactId>swagger-models</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.5.22</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-            <version>1.5.22</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -47,7 +47,7 @@
  * 异常信息拦截处理
  *
  * @author Kimi Liu
- * @version 6.0.8
+ * @version 6.0.9
  * @since JDK 1.8+
  */
 @ControllerAdvice

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

@@ -31,7 +31,7 @@
  * 公共常量
  *
  * @author Kimi Liu
- * @version 6.0.8
+ * @version 6.0.9
  * @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 6.0.8
+ * @version 6.0.9
  * @since JDK 1.8+
  */
 public class ErrorCode {

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

@@ -24,7 +24,6 @@
  ********************************************************************************/
 package org.aoju.bus.base.entity;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.aoju.bus.base.consts.Consts;
@@ -40,7 +39,7 @@
  * Entity 基本信息.
  *
  * @author Kimi Liu
- * @version 6.0.8
+ * @version 6.0.9
  * @since JDK 1.8+
  */
 @Data
@@ -49,31 +48,47 @@ public class BaseEntity extends Tracer {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "状态", notes = "-1删除,0无效,1正常")
+    /**
+     * 数据状态:-1删除,0无效,1正常
+     */
     protected String status;
 
-    @ApiModelProperty("创建人")
+    /**
+     * 创建者
+     */
     protected String creator;
 
-    @ApiModelProperty("创建时间")
+    /**
+     * 创建时间
+     */
     protected String created;
 
-    @ApiModelProperty("修改人")
+    /**
+     * 修改者
+     */
     protected String modifier;
 
-    @ApiModelProperty("修改时间")
+    /**
+     * 修改时间
+     */
     protected String modified;
 
+    /**
+     * 分页页码,默认值:1
+     */
     @Transient
-    @ApiModelProperty(value = "页码", notes = "默认值:1")
     protected Integer pageNo = 1;
 
+    /**
+     * 分页大小,默认值:20
+     */
     @Transient
-    @ApiModelProperty(value = "分页大小", notes = "默认值:20")
     protected Integer pageSize = 20;
 
+    /**
+     * 排序方式,asc desc
+     */
     @Transient
-    @ApiModelProperty(value = "数据排序")
     protected String orderBy;
 
     /**

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

@@ -24,7 +24,6 @@
  ********************************************************************************/
 package org.aoju.bus.base.entity;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.persistence.Id;
@@ -34,16 +33,18 @@
  * Entity 实体
  *
  * @author Kimi Liu
- * @version 6.0.8
+ * @version 6.0.9
  * @since JDK 1.8+
  */
 @Data
 public abstract class Entity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 数据主键
+     */
     @Id
-    @ApiModelProperty("主键")
     protected String id;
 
 }

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

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