diff --git a/docker-compose.yml b/docker-compose.yml
index b07c41d75..2ab0fbdad 100644
--- a/docker-compose.yml
+++ b/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:
diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml
index 6b4aa513c..1157ed73d 100644
--- a/pigx-common/pigx-common-core/pom.xml
+++ b/pigx-common/pigx-common-core/pom.xml
@@ -70,5 +70,10 @@
transmittable-thread-local
${ttl.version}
+
+
+ io.swagger
+ swagger-annotations
+
diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java
index 4044da87e..a688f6f1a 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/R.java
+++ b/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 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() {
diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml
index 9122ed74f..38ed0f749 100644
--- a/pigx-gateway/pom.xml
+++ b/pigx-gateway/pom.xml
@@ -84,6 +84,11 @@
springfox-swagger2
${swagger.fox.version}
+
+ com.github.xiaoymin
+ swagger-bootstrap-ui
+ ${swagger-bootstrap-ui.version}
+
diff --git a/pom.xml b/pom.xml
index 417063c98..d282d8423 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,7 @@
4.5.6
0.0.9
2.9.2
+ 1.9.3
2.10.0
1.7
4.1.0