From 8f9e5cf5650a3744f4ffefad76896452a2bee221 Mon Sep 17 00:00:00 2001
From: andy <1042025947@qq.com>
Date: Fri, 18 Apr 2025 14:33:09 +0800
Subject: [PATCH] 1

---
 .../hd/common/permission/util/SpringUtil.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java b/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java
index aa22d7f..aab6c83 100644
--- a/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java
+++ b/base-commons/common-permission/src/main/java/com/evotech/hd/common/permission/util/SpringUtil.java
@@ -67,16 +67,21 @@ public class SpringUtil implements ApplicationContextAware {
     }
 
     public static HttpServletRequest getRequest() {
-        RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes();
-        if(null == requestAttributes) {
-            log.warn("The 'RequestAttributes' object is null, so can`t get 'HttpServletRequest' object!");
+        try {
+            RequestAttributes requestAttributes = RequestContextHolder.currentRequestAttributes();
+            if(null == requestAttributes) {
+                log.warn("The 'RequestAttributes' object is null, so can`t get 'HttpServletRequest' object!");
 
+                return null;
+            }
+            ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)requestAttributes;
+            HttpServletRequest request = servletRequestAttributes.getRequest();
+
+            return request;
+        } catch (IllegalStateException e) {
+            log.error("The request is error:{}",e.getMessage());
             return null;
         }
-        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)requestAttributes;
-        HttpServletRequest request = servletRequestAttributes.getRequest();
-
-        return request;
     }
 
     public static HttpServletResponse getResponse() {