From 8079411dc75945ed84e30110b49cab5c392d02aa Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 11 Feb 2025 15:17:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E6=9C=AA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=8A=B6=E6=80=81=E8=AE=BF=E9=97=AE=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E9=A2=84=E8=A7=88=E9=A1=B5=E9=9D=A2=E6=9C=AA?=
 =?UTF-8?q?=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=B7=B3=E8=BD=AC=E5=88=B0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/views/login/index.vue  |  6 ++---
 .../src/views/mobile/login/index.vue          |  2 +-
 .../io/dataease/auth/filter/TokenFilter.java  | 23 ++++++++++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/views/login/index.vue b/core/core-frontend/src/views/login/index.vue
index e59b6267cf..84443e3cdd 100644
--- a/core/core-frontend/src/views/login/index.vue
+++ b/core/core-frontend/src/views/login/index.vue
@@ -145,15 +145,15 @@ const showLoginErrorMsg = () => {
   if (!loginErrorMsg.value) {
     return
   }
-  if (loginErrorMsg.value.startsWith('token is empty')) {
+  if (loginErrorMsg.value.includes('token is empty')) {
     ElMessage.error('token为空！')
     return
   }
-  if (loginErrorMsg.value.startsWith('token is Expired')) {
+  if (loginErrorMsg.value.includes('token is Expired')) {
     ElMessage.error('登录信息已过期，请重新登录！')
     return
   }
-  if (loginErrorMsg.value.startsWith('token is destroyed')) {
+  if (loginErrorMsg.value.includes('token is destroyed')) {
     ElMessage.error('登录信息已销毁，请重新登录！')
     return
   }
diff --git a/core/core-frontend/src/views/mobile/login/index.vue b/core/core-frontend/src/views/mobile/login/index.vue
index abc5b345ad..d176252a1a 100644
--- a/core/core-frontend/src/views/mobile/login/index.vue
+++ b/core/core-frontend/src/views/mobile/login/index.vue
@@ -253,7 +253,7 @@ const loadFail = () => {
   <XpackComponent
     ref="xpackInvalidPwd"
     jsname="L2NvbXBvbmVudC9sb2dpbi9JbnZhbGlkUHdk"
-    @load-fail="() => loadFail"
+    @load-fail="loadFail"
     @call-back="invalidPwdCb"
   />
   <XpackComponent
diff --git a/sdk/common/src/main/java/io/dataease/auth/filter/TokenFilter.java b/sdk/common/src/main/java/io/dataease/auth/filter/TokenFilter.java
index f9201d4dea..37edca839f 100644
--- a/sdk/common/src/main/java/io/dataease/auth/filter/TokenFilter.java
+++ b/sdk/common/src/main/java/io/dataease/auth/filter/TokenFilter.java
@@ -3,22 +3,26 @@ package io.dataease.auth.filter;
 import io.dataease.auth.bo.TokenUserBO;
 import io.dataease.constant.AuthConstant;
 import io.dataease.exception.DEException;
+import io.dataease.license.utils.LicenseUtil;
 import io.dataease.result.ResultMessage;
 import io.dataease.utils.*;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
 public class TokenFilter implements Filter {
-
+    private static final String headName = "DE-GATEWAY-FLAG";
 
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
@@ -77,6 +81,19 @@ public class TokenFilter implements Filter {
             TokenUserBO userBO = TokenUtils.validate(token);
             UserUtils.setUserInfo(userBO);
             filterChain.doFilter(servletRequest, servletResponse);
+        } catch (Exception e) {
+            if (!LicenseUtil.licenseValid()) {
+                HttpServletResponse res = (HttpServletResponse) servletResponse;
+                ResultMessage resultMessage = new ResultMessage(HttpStatus.UNAUTHORIZED.value(), e.getMessage());
+                HttpHeaders headers = new HttpHeaders();
+                String msg = URLEncoder.encode(e.getMessage(), StandardCharsets.UTF_8).replace("+", "%20");
+                headers.add(headName, msg);
+                ResponseEntity<ResultMessage> entity = new ResponseEntity<>(resultMessage, headers, HttpStatus.UNAUTHORIZED);
+                sendResponseEntity(res, entity);
+                LogUtil.error(e.getMessage(), e);
+            } else {
+                throw e;
+            }
         } finally {
             UserUtils.removeUser();
         }
@@ -86,6 +103,10 @@ public class TokenFilter implements Filter {
         HttpStatusCode statusCode = responseEntity.getStatusCode();
         httpResponse.setStatus(statusCode.value());
         httpResponse.setCharacterEncoding(StandardCharsets.UTF_8.name());
+        HttpHeaders headers = responseEntity.getHeaders();
+        if (ObjectUtils.isNotEmpty(headers)) {
+            headers.forEach((key, value) -> httpResponse.addHeader(key, value.toString()));
+        }
         httpResponse.getWriter().write(Objects.requireNonNull(JsonUtil.toJSONString(responseEntity.getBody()).toString()));
     }