From 6281ec0456f2b02d924cdb360db47c5ef93db8f2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 15 九月 2022 09:48:17 +0800
Subject: [PATCH] fix 修复 不同网段因reset请求头导致下载导出跨域问题
---
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
index d8c405e..e8549bf 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
@@ -12,7 +12,6 @@
import com.ruoyi.generator.domain.GenTable;
import com.ruoyi.generator.domain.GenTableColumn;
import com.ruoyi.generator.service.IGenTableService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +28,6 @@
* @author Lion Li
*/
@Validated
-@Tag(name = "浠ｇ爜鐢熸垚", description = "浠ｇ爜鐢熸垚绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/tool/gen")
@@ -48,6 +46,8 @@
/**
* 淇敼浠ｇ爜鐢熸垚涓氬姟
+ *
+ * @param tableId 琛↖D
*/
@SaCheckPermission("tool:gen:query")
@GetMapping(value = "/{tableId}")
@@ -73,6 +73,8 @@
/**
* 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
+ *
+ * @param tableId 琛↖D
*/
@SaCheckPermission("tool:gen:list")
@GetMapping(value = "/column/{tableId}")
@@ -86,6 +88,8 @@
/**
* 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
+ *
+ * @param tables 琛ㄥ悕涓�
*/
@SaCheckPermission("tool:gen:import")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
@@ -112,6 +116,8 @@
/**
* 鍒犻櫎浠ｇ爜鐢熸垚
+ *
+ * @param tableIds 琛↖D涓�
*/
@SaCheckPermission("tool:gen:remove")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
@@ -123,6 +129,8 @@
/**
* 棰勮浠ｇ爜
+ *
+ * @param tableId 琛↖D
*/
@SaCheckPermission("tool:gen:preview")
@GetMapping("/preview/{tableId}")
@@ -133,6 +141,8 @@
/**
* 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
+ *
+ * @param tableName 琛ㄥ悕
*/
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@@ -144,6 +154,8 @@
/**
* 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
+ *
+ * @param tableName 琛ㄥ悕
*/
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@@ -155,6 +167,8 @@
/**
* 鍚屾鏁版嵁搴�
+ *
+ * @param tableName 琛ㄥ悕
*/
@SaCheckPermission("tool:gen:edit")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
@@ -166,6 +180,8 @@
/**
* 鎵归噺鐢熸垚浠ｇ爜
+ *
+ * @param tables 琛ㄥ悕涓�
*/
@SaCheckPermission("tool:gen:code")
@Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
@@ -180,7 +196,6 @@
* 鐢熸垚zip鏂囦欢
*/
private void genCode(HttpServletResponse response, byte[] data) throws IOException {
- response.reset();
response.addHeader("Access-Control-Allow-Origin", "*");
response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
--
Gitblit v1.9.3