From 62f930cee9ef7031421890cd2c9b636f10ef727a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 20 Nov 2025 10:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/java/com/ard/work/component/forest/TokenInterceptor.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/work/component/forest/TokenInterceptor.java b/ard-work/src/main/java/com/ard/work/component/forest/TokenInterceptor.java
index 2145b5e..52f29ac 100644
--- a/ard-work/src/main/java/com/ard/work/component/forest/TokenInterceptor.java
+++ b/ard-work/src/main/java/com/ard/work/component/forest/TokenInterceptor.java
@@ -2,10 +2,13 @@
import com.ard.work.domain.receiver.AccessTokenReceiver;
import com.ard.work.service.IArdServerInfoService;
+import com.dtflys.forest.exceptions.ForestRuntimeException;
import com.dtflys.forest.http.ForestRequest;
+import com.dtflys.forest.http.ForestResponse;
import com.dtflys.forest.interceptor.ForestInterceptor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
+
import javax.annotation.Resource;
@Component
@@ -23,15 +26,14 @@
public boolean beforeExecute(ForestRequest req) {
try {
String serverId = (String) req.getVariableValue("serverId");
- AccessTokenReceiver accessToken = ardServerService.getAccessToken(serverId);
- if (accessToken == null) {
- log.warn("AccessToken 为 null, serverId={}", serverId);
+ AccessTokenReceiver token = ardServerService.getAccessToken(serverId);
+ if (token == null) {
return false; // 阻止请求继续
}
- req.addHeader("x-cid", accessToken.getCompanyId());
- req.addHeader("x-token", accessToken.getAccessToken());
- } catch (Exception e) {
- log.error("TokenInterceptor 处理异常:{}", e.getMessage());
+ req.addHeader("x-cid", token.getCompanyId());
+ req.addHeader("x-token", token.getAccessToken());
+ } catch (ForestRuntimeException e) {
+ log.error("拦截器处理异常:{}", e.getMessage());
return false;
}
return true;
--
Gitblit v1.9.3