From 2abe80f2c5e05c8169e56bf891f776f30d26f4b3 Mon Sep 17 00:00:00 2001
From: PING <waitylyou@163.com>
Date: Tue, 30 Jan 2024 12:58:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=85=BC=E5=AE=B9jakarta/javax=E7=9A=84S?=
 =?UTF-8?q?ervletRequest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/github/pagehelper/util/ClassUtil.java    | 11 +++++++++++
 .../com/github/pagehelper/util/PageObjectUtil.java    |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/github/pagehelper/util/ClassUtil.java b/src/main/java/com/github/pagehelper/util/ClassUtil.java
index 5952e490..cfd17fa6 100644
--- a/src/main/java/com/github/pagehelper/util/ClassUtil.java
+++ b/src/main/java/com/github/pagehelper/util/ClassUtil.java
@@ -89,4 +89,15 @@ public static <T> T newInstance(Class<T> cls, Properties properties) {
         }
     }
 
+    public static Class<?> getServletRequestClass() throws ClassNotFoundException {
+        Class<?> requestClass = null;
+        try {
+            requestClass = Class.forName("javax.servlet.ServletRequest");
+        }catch (ClassNotFoundException exception){
+        }
+        if (requestClass != null){
+            return requestClass;
+        }
+        return Class.forName("jakarta.servlet.ServletRequest");
+    }
 }
diff --git a/src/main/java/com/github/pagehelper/util/PageObjectUtil.java b/src/main/java/com/github/pagehelper/util/PageObjectUtil.java
index 8e0c4672..fd63a530 100644
--- a/src/main/java/com/github/pagehelper/util/PageObjectUtil.java
+++ b/src/main/java/com/github/pagehelper/util/PageObjectUtil.java
@@ -47,7 +47,7 @@ public abstract class PageObjectUtil {
 
     static {
         try {
-            requestClass = Class.forName("javax.servlet.ServletRequest");
+            requestClass = ClassUtil.getServletRequestClass();
             getParameterMap = requestClass.getMethod("getParameterMap", new Class[]{});
             hasRequest = true;
         } catch (Throwable e) {