From 291354e580dbe8686d3d53ac69c825df75da9098 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 17 二月 2025 15:18:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
index dc0d0fb..3ebb2e1 100644
--- a/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
+++ b/server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java
@@ -3,6 +3,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.utils.Utils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.DigestUtils;
@@ -33,6 +34,12 @@
if(user !=null){
signString.append("loginuserId").append("=").append(user.getId()).append(";");
}
+
+ String apiToken = String.valueOf(request.getHeader("token"));
+ if(StringUtils.isNotBlank(apiToken)){
+ signString.append("apiToken").append("=").append(apiToken).append(";");
+ }
+
// 鍙傛暟绛惧悕
return DigestUtils.md5DigestAsHex(signString.toString().getBytes());
}
@@ -46,6 +53,7 @@
HashMap<String, Object> paramMap = new HashMap<>();
paramMap.put("REQUEST_URI", request.getRequestURI());
paramMap.put("USER_TOKEN", String.valueOf(request.getHeader("eva-auth-token")));
+ paramMap.put("API_TOKEN", String.valueOf(request.getHeader("token")));
paramMap.put("IP", Utils.User_Client.getIP(request));
return paramMap;
}
--
Gitblit v1.9.3