From 04028745adb2786c5c85f605c30e6a1a98ae21c7 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 1 Apr 2024 11:53:14 +0800
Subject: [PATCH] 404 page javax to jakarta

---
 modules/core/src/main/resources/views/error/404.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/resources/views/error/404.html b/modules/core/src/main/resources/views/error/404.html
index 010b35ef..34af7167 100644
--- a/modules/core/src/main/resources/views/error/404.html
+++ b/modules/core/src/main/resources/views/error/404.html
@@ -2,6 +2,7 @@
    * No deletion without permission, or be held responsible to law. */
 @servlet.getResponse().setStatus(responseStatus!404);
 
+var requestUri = @request.getAttribute('jakarta.servlet.forward.request_uri');
 var message = @ObjectUtils.toString(@request.getAttribute("message"));
 
 if (isBlank(message)){
@@ -10,7 +11,7 @@ if (isBlank(message)){
 
 // 如果是异步请求或是手机端，则直接返回信息
 if (@ServletUtils.isAjaxRequest(request)) {
-	var data = {requestUri: @request.getAttribute('javax.servlet.forward.request_uri')};
+	var data = { requestUri: requestUri };
 	print(@ServletUtils.renderResult(@Global.FALSE, message, data));
 }
 
@@ -27,11 +28,7 @@ else {
 		<ul>
 			<li>${text('sys.error.404.message.p2')}</li>
 			<li style="word-break:break-all;word-wrap:break-word;">
-				${text('sys.error.404.message.p3')}${
-					@EncodeUtils.encodeHtml(
-						@request.getAttribute('javax.servlet.forward.request_uri')
-					)
-				}</li>
+				${text('sys.error.404.message.p3')}${@EncodeUtils.encodeHtml(requestUri)}</li>
 			<li>${text('sys.error.404.message.p4')}</li>
 			<li>......</li>
 		</ul>