From 8ae8c5498da43d15e8fc511c7534fc9ff4a9c750 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 14 一月 2023 00:58:30 +0800 Subject: [PATCH] fix 修复 多数据源适配 jakarta 异常 bug (临时) --- ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java index 91ddd3f..fd57842 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java @@ -1,9 +1,13 @@ package com.ruoyi.common.utils; import cn.hutool.core.convert.Convert; -import cn.hutool.extra.servlet.ServletUtil; +import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.http.HttpStatus; import com.ruoyi.common.constant.Constants; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.http.MediaType; @@ -11,10 +15,6 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; @@ -30,7 +30,7 @@ * @author ruoyi */ @NoArgsConstructor(access = AccessLevel.PRIVATE) -public class ServletUtils extends ServletUtil { +public class ServletUtils extends JakartaServletUtil { /** * 鑾峰彇String鍙傛暟 -- Gitblit v1.9.3