diff --git a/changelog.md b/changelog.md index 546edd69..254f03cf 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # changelog +## 1.12.2 + +- 沙盒支持文件上传 + ## 1.12.1 - 修复重启网关路由状态重置BUG diff --git a/doc/docs/files/90100_常见问题.md b/doc/docs/files/90100_常见问题.md index e2b4601f..b1177e01 100644 --- a/doc/docs/files/90100_常见问题.md +++ b/doc/docs/files/90100_常见问题.md @@ -67,4 +67,20 @@ public static class Swagger2 extends SwaggerSupport { return false; } } +``` + +## 调试网关出现服务不可用 + +打断点调试,网关出现Read Timeout + +参考:https://blog.csdn.net/qq_36872046/article/details/81058045 + +yml添加: + +```yaml +ribbon: + # https://blog.csdn.net/qq_36872046/article/details/81058045 + # 路由转发超时时间,毫秒,默认值1000,详见:RibbonClientConfiguration.DEFAULT_READ_TIMEOUT。 + # 如果微服务端 处理时间过长,会导致ribbon read超时,解决办法将这个值调大一点 + ReadTimeout: 60000 ``` \ No newline at end of file diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index 6a032d17..28d2f3f7 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -30,7 +30,7 @@ com.gitee.sop sop-registry-api - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT diff --git a/sop-common/pom.xml b/sop-common/pom.xml index 6b19dffd..637c8019 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT pom diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index 223f94fa..715568f6 100644 --- a/sop-common/sop-gateway-common/pom.xml +++ b/sop-common/sop-gateway-common/pom.xml @@ -5,11 +5,11 @@ com.gitee.sop sop-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT ../pom.xml sop-gateway-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT jar sop-gateway-common diff --git a/sop-common/sop-registry-api/pom.xml b/sop-common/sop-registry-api/pom.xml index e613f1b4..3b903cac 100644 --- a/sop-common/sop-registry-api/pom.xml +++ b/sop-common/sop-registry-api/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.gitee.sop sop-registry-api - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT UTF-8 diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index ac643b22..6e51fd8b 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -6,11 +6,11 @@ com.gitee.sop sop-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT ../pom.xml sop-service-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT jar sop-service-common diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/AlipayServiceConfiguration.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/AlipayServiceConfiguration.java index 01517ecf..a1748613 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/AlipayServiceConfiguration.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/configuration/AlipayServiceConfiguration.java @@ -14,7 +14,7 @@ import java.util.List; */ public class AlipayServiceConfiguration extends BaseServiceConfiguration { - public AlipayServiceConfiguration() { + static { // 默认版本号为1.0 ServiceConfig.getInstance().setDefaultVersion("1.0"); } diff --git a/sop-example/sop-auth/pom.xml b/sop-example/sop-auth/pom.xml index 614784d8..8524c144 100644 --- a/sop-example/sop-auth/pom.xml +++ b/sop-example/sop-auth/pom.xml @@ -26,7 +26,7 @@ com.gitee.sop sop-service-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT org.springframework.cloud diff --git a/sop-example/sop-book/sop-book-web/pom.xml b/sop-example/sop-book/sop-book-web/pom.xml index bb12b690..183adb6a 100644 --- a/sop-example/sop-book/sop-book-web/pom.xml +++ b/sop-example/sop-book/sop-book-web/pom.xml @@ -24,7 +24,7 @@ com.gitee.sop sop-service-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT com.gitee.sop diff --git a/sop-example/sop-easyopen/pom.xml b/sop-example/sop-easyopen/pom.xml index 3dc21475..ce1785c8 100644 --- a/sop-example/sop-easyopen/pom.xml +++ b/sop-example/sop-easyopen/pom.xml @@ -29,7 +29,7 @@ com.gitee.sop sop-service-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT org.springframework.cloud diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml index e3a1d8d4..acc2499f 100644 --- a/sop-example/sop-springmvc/pom.xml +++ b/sop-example/sop-springmvc/pom.xml @@ -20,7 +20,7 @@ com.gitee.sop sop-service-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT diff --git a/sop-example/sop-story/sop-story-web/pom.xml b/sop-example/sop-story/sop-story-web/pom.xml index 56329e9c..e65408b3 100644 --- a/sop-example/sop-story/sop-story-web/pom.xml +++ b/sop-example/sop-story/sop-story-web/pom.xml @@ -24,7 +24,7 @@ com.gitee.sop sop-service-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT com.gitee.sop diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/config/OpenServiceConfig.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/config/OpenServiceConfig.java index c39ba27c..dd9a5f12 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/config/OpenServiceConfig.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/config/OpenServiceConfig.java @@ -28,7 +28,11 @@ public class OpenServiceConfig extends AlipayServiceConfiguration { .addResourceLocations("classpath:/META-INF/resources/webjars/"); } - // 开启文档 + + /** + * 开启文档 + * http://ip:port/v2/api-docs + */ @Configuration @EnableSwagger2 public static class Swagger2 extends SwaggerSupport { diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java index bcce526b..13b38327 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java @@ -5,6 +5,10 @@ import com.gitee.sop.servercommon.util.UploadUtil; import com.gitee.sop.storyweb.controller.param.FileUploadParam; import com.gitee.sop.storyweb.controller.param.FileUploadParam2; import com.gitee.sop.storyweb.vo.FileUploadVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.Extension; +import io.swagger.annotations.ExtensionProperty; import org.apache.commons.io.IOUtils; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -19,6 +23,7 @@ import java.util.Collection; * @author tanghc */ @RestController +@Api(tags = "文件上传") public class FileUploadDemoController { /** @@ -26,6 +31,7 @@ public class FileUploadDemoController { * @param param * @return */ + @ApiOperation(value = "文件上传例1", notes = "上传文件demo") @ApiMapping(value = "demo.file.upload") public FileUploadVO file1(FileUploadParam param) { System.out.println(param.getRemark()); @@ -48,6 +54,9 @@ public class FileUploadDemoController { * @param param * @return */ + @ApiOperation(value = "文件上传例2", notes = "可上传多个文件" + // 多文件上传、不确定文件数量上传,必须申明下面这句,否则沙盒界面不会出现上传控件 + , extensions = @Extension(properties = @ExtensionProperty(name = "multiple", value = "multiple"))) @ApiMapping(value = "demo.file.upload2") public FileUploadVO file2(FileUploadParam2 param, HttpServletRequest request) { System.out.println(param.getRemark()); diff --git a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/param/FileUploadParam.java b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/param/FileUploadParam.java index ac778bf2..2be7875c 100644 --- a/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/param/FileUploadParam.java +++ b/sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/param/FileUploadParam.java @@ -1,5 +1,6 @@ package com.gitee.sop.storyweb.controller.param; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.web.multipart.MultipartFile; @@ -14,8 +15,10 @@ public class FileUploadParam { // 上传文件,字段名称对应表单中的name属性值 @NotNull(message = "请上传文件1") + @ApiModelProperty(value = "文件1", required = true) private MultipartFile file1; @NotNull(message = "请上传文件2") + @ApiModelProperty(value = "文件2", required = true) private MultipartFile file2; } diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index d40348fd..d54e1766 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -23,7 +23,7 @@ com.gitee.sop sop-gateway-common - 1.12.1-SNAPSHOT + 1.12.2-SNAPSHOT