提交 ca1d10d3 authored 作者: Matrix's avatar Matrix

[系统架构]

- 将springboot版本退回到2.1.4 - swagger版本退回到2.9.0
上级 7e279b88
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<properties> <properties>
<swagger.version>3.0.0</swagger.version> <swagger.version>2.9.0</swagger.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -35,9 +35,26 @@ ...@@ -35,9 +35,26 @@
</dependency> </dependency>
<dependency> <dependency>
<scope>compile</scope>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>com.github.caspar-chen</groupId>
<artifactId>swagger-ui-layer</artifactId>
<version>0.0.4</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-bean-validators</artifactId>
<version>${swagger.version}</version> <version>${swagger.version}</version>
</dependency> </dependency>
......
...@@ -3,6 +3,7 @@ package com.tykj.dev.config.swagger; ...@@ -3,6 +3,7 @@ package com.tykj.dev.config.swagger;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.OAuthBuilder; import springfox.documentation.builders.OAuthBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
......
...@@ -12,15 +12,14 @@ import com.tykj.dev.misc.exception.ApiException; ...@@ -12,15 +12,14 @@ import com.tykj.dev.misc.exception.ApiException;
import com.tykj.dev.misc.utils.ResultUtil; import com.tykj.dev.misc.utils.ResultUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.service.ApiKey;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
...@@ -78,7 +77,7 @@ public class FinalCheckController { ...@@ -78,7 +77,7 @@ public class FinalCheckController {
} }
// @GetMapping("/test") // @GetMapping("/test")
// @ApiOperation(value = "测试接口") // @ApiOperation(value = "测试接口")
public ResponseEntity test() { public ResponseEntity test() {
return ResponseEntity.ok(4); return ResponseEntity.ok(4);
...@@ -170,8 +169,11 @@ public class FinalCheckController { ...@@ -170,8 +169,11 @@ public class FinalCheckController {
ByteArrayOutputStream outByteStream = new ByteArrayOutputStream(); ByteArrayOutputStream outByteStream = new ByteArrayOutputStream();
book.write(outByteStream); book.write(outByteStream);
HttpHeaders header = new HttpHeaders();
header.setContentDispositionFormData("attachment", "Report.xls");
return ResponseEntity.ok() return ResponseEntity.ok()
.headers(headers -> headers.setContentDispositionFormData("attachment", "Report.xls")) .headers(header)
.contentType(MediaType.APPLICATION_OCTET_STREAM) .contentType(MediaType.APPLICATION_OCTET_STREAM)
.body(outByteStream.toByteArray()); .body(outByteStream.toByteArray());
} }
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.7.RELEASE</version> <version>2.1.14.RELEASE</version>
</parent> </parent>
<modules> <modules>
<module>dev-socket</module> <module>dev-socket</module>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论