From 9d682dbf7857b6bc3fa9a089dcfa7fd63c4812d3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期日, 18 二月 2024 16:20:12 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
index 0398a98..1881c3b 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/Utils.java
@@ -2,6 +2,7 @@
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.wcs.common.constant.Constants;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
@@ -27,7 +28,8 @@
* @param <R> parentId鐨勭被鍨�
* @return List<T>
*/
- public static <T, R> List<T> toTreeData(List<T> data, R parentId,
+ public static <T, R> List<T> toTreeData(List<T> data,
+ R parentId,
Function<? super T, ? extends R> parentIdMapper,
Function<? super T, ? extends R> idMapper,
BiConsumer<T, List<T>> consumer) {
@@ -257,11 +259,11 @@
public static void cors(HttpServletResponse response){
// 璺ㄥ煙璁剧疆
+ response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Credentials", "true");
response.setHeader("Access-Control-Allow-Methods", "*");
- response.setHeader("Access-Control-Allow-Headers", "Content-Type,Access-Token,Authorization");
- response.setHeader("Access-Control-Expose-Headers", "*");
+ response.setHeader("Access-Control-Allow-Headers", "*");
+ response.setHeader("Access-Control-Expose-Headers", Constants.TOKEN_HEADER_NAME);
}
}
--
Gitblit v1.9.1