Merge branch 'leng_dev' into 3.1

docker-compose.yml

@@ -25,9 +25,24 @@ services:
     restart: always
 
   pigx-redis:
-    image: redis:4.0.10
+    image: redis:5.0.4
     restart: always
     container_name: pigx-redis
+    ports:
+      - 6379:6379
+
+  pigx-minio:
+    image: minio/minio
+    command: server /data
+    ports:
+      - 9000:9000
+    volumes:
+      - ./data:/data
+      - ./config:/root/.minio
+    environment:
+      - MINIO_DOMAIN=pigx-minio
+      - MINIO_ACCESS_KEY=lengleng
+      - MINIO_SECRET_KEY=lengleng
 
   pigx-register:
     build:

pigx-common/pigx-common-core/pom.xml

@@ -70,5 +70,10 @@
 			<artifactId>transmittable-thread-local</artifactId>
 			<version>${ttl.version}</version>
 		</dependency>
+		<!--swagger 依赖-->
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+		</dependency>
 	</dependencies>
 </project>

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java

@@ -20,6 +20,8 @@
 package com.pig4cloud.pigx.common.core.util;
 
 import com.pig4cloud.pigx.common.core.constant.CommonConstants;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import lombok.experimental.Accessors;
 
@@ -34,21 +36,25 @@ import java.io.Serializable;
 @Builder
 @ToString
 @Accessors(chain = true)
+@ApiModel(description = "响应信息主体")
 @AllArgsConstructor
 public class R<T> implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Getter
 	@Setter
+	@ApiModelProperty(value = "返回标记：成功标记=0，失败标记=0")
 	private int code = CommonConstants.SUCCESS;
 
 	@Getter
 	@Setter
+	@ApiModelProperty(value = "返回信息")
 	private String msg = "success";
 
 
 	@Getter
 	@Setter
+	@ApiModelProperty(value = "数据")
 	private T data;
 
 	public R() {

pigx-gateway/pom.xml

@@ -84,6 +84,11 @@
 			<artifactId>springfox-swagger2</artifactId>
 			<version>${swagger.fox.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>swagger-bootstrap-ui</artifactId>
+			<version>${swagger-bootstrap-ui.version}</version>
+		</dependency>
 	</dependencies>
 
 	<build>

pom.xml

@@ -52,6 +52,7 @@
 		<hutool.version>4.5.6</hutool.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<swagger.fox.version>2.9.2</swagger.fox.version>
+		<swagger-bootstrap-ui.version>1.9.3</swagger-bootstrap-ui.version>
 		<curator.version>2.10.0</curator.version>
 		<velocity.version>1.7</velocity.version>
 		<lcn.version>4.1.0</lcn.version>