From 371a5de116efdc3b7a0ccfb794e120c4f028e7bc Mon Sep 17 00:00:00 2001
From: zhangqinbin <181961702@qq.com>
Date: Wed, 15 Nov 2023 16:57:09 +0800
Subject: [PATCH] =?UTF-8?q?wps=E4=BF=9D=E5=AD=98=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extend/wps/controller/WpsController.java  | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java
index 83ef2bb..07ff4ae 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/wps/controller/WpsController.java
@@ -22,8 +22,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +39,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Stream;
+
+import static com.chinaunicom.mall.ebtp.cloud.security.starter.common.Constants.COOKIE_TOKEN_CODE;
 
 @Slf4j
 @RestController
@@ -136,8 +139,7 @@ public class WpsController {
 	public void getWpsUrlByGet(HttpServletRequest request, HttpServletResponse response,
 											   @RequestParam("fileId") String fileId,
 											   @RequestParam("fileName") String fileName,
-											   @RequestParam("userToken") String userToken,
-							                   @RequestHeader(name = "Authorization") String token
+											   @RequestParam("userToken") String userToken
 											   ) {
 		WpsClientInVo in = new WpsClientInVo();
 		in.setFileId(fileId);
@@ -145,6 +147,20 @@ public class WpsController {
 		in.setUserToken(userToken);
 		String str = this.wpsService.getKSWpsUrl(in);
 		try {
+			String token = userToken;
+			Optional<Cookie> optionalCookie = Optional.ofNullable(request.getCookies())
+					.flatMap(cookies ->
+							Stream.of(cookies)
+									.filter(item -> StringUtils.equals(item.getName(), COOKIE_TOKEN_CODE))
+									.findFirst());
+
+			if (optionalCookie.isPresent()) {
+				token = optionalCookie.get().getValue();
+				log.info("cookie:",token);
+			}else{
+				log.error("未获取到cookie");
+			}
+
 			response.setContentType("text/html;charset=utf-8");
 			PrintWriter out = response.getWriter();
 			response.setHeader("Cookie","mall3_token="+token);