From 709a83bccf7eb291c1e20db46359a698bb245908 Mon Sep 17 00:00:00 2001
From: zhp <746006956@qq.com>
Date: Wed, 25 Sep 2024 10:58:17 +0800
Subject: [PATCH] =?UTF-8?q?2024-09-24=20=E7=94=9F=E4=BA=A7=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/RuoYiSystemApplication.java    | 13 +++++++++++++
 .../ruoyi/system/controller/MerchantController.java |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
index 1755a8e6..1963f0cc 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/RuoYiSystemApplication.java
@@ -1,9 +1,14 @@
 package com.ruoyi.system;
 
+import org.apache.tomcat.util.http.LegacyCookieProcessor;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import com.ruoyi.common.security.annotation.EnableCustomConfig;
 import com.ruoyi.common.security.annotation.EnableRyFeignClients;
+import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
+import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.context.annotation.Bean;
 
 /**
  * 系统模块
@@ -20,4 +25,12 @@ public class RuoYiSystemApplication
         SpringApplication.run(RuoYiSystemApplication.class, args);
         System.out.println("(♥◠‿◠)ﾉﾞ  系统模块启动成功   ლ(´ڡ`ლ)ﾞ  \n");
     }
+
+    @Bean
+    public WebServerFactoryCustomizer<TomcatServletWebServerFactory> cookieProcessorCustomizer() {
+        return tomcatServletWebServerFactory -> tomcatServletWebServerFactory.addContextCustomizers((TomcatContextCustomizer) context -> {
+            context.setCookieProcessor(new LegacyCookieProcessor());
+        });
+    }
+
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java
index a94c8251..197b328c 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/MerchantController.java
@@ -138,8 +138,8 @@ public class MerchantController extends BaseController
      * H5申请商户
      */
     @GetMapping("/h5applyMerchant")
-    public AjaxResult H5applyMerchant(@RequestParam("merchantId") Long merchantId,HttpServletRequest request){
-        return merchantService.H5applyMerchant(merchantId,request);
+    public AjaxResult H5applyMerchant(@RequestParam("merchantId") String merchantId,HttpServletRequest request){
+        return merchantService.H5applyMerchant(Long.valueOf(merchantId),request);
     }