7x31/SOP
1
0
Fork 0
mirror of https://gitee.com/durcframework/SOP.git synced 2025-08-11 21:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into registry-nacos

Browse Source
This commit is contained in:
tanghc
2019-07-11 16:47:49 +08:00
parent 9803c5133e ec050db29a
commit 83627f1b2f
33 changed files with 578 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sop-example/sop-auth/pom.xml
View File

@@ -26,7 +26,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

2
sop-example/sop-book/sop-book-web/pom.xml
View File

@@ -24,7 +24,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gitee.sop</groupId>

2
sop-example/sop-easyopen/pom.xml
View File

@@ -29,7 +29,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

2
sop-example/sop-springmvc/pom.xml
View File

@@ -20,7 +20,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</dependency>
<!-- eureka 服务发现 -->
<dependency>

2
sop-example/sop-story/sop-story-web/pom.xml
View File

@@ -24,7 +24,7 @@
<dependency>
<groupId>com.gitee.sop</groupId>
<artifactId>sop-service-common</artifactId>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.gitee.sop</groupId>

6
sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/config/OpenServiceConfig.java
View File

@@ -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 {

9
sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/FileUploadDemoController.java
View File

@@ -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());

3
sop-example/sop-story/sop-story-web/src/main/java/com/gitee/sop/storyweb/controller/param/FileUploadParam.java
View File

@@ -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;
}