From 6226acca09482447f8591435ccf8771842308a38 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 十一月 2023 11:28:45 +0800
Subject: [PATCH] bug
---
server/services/src/main/java/com/doumee/core/annotation/pr/PreventRepeatDefaultHandler.java | 9 +++++++++
1 files changed, 9 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 9cb019f..f03bd38 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,7 +34,14 @@
if(user !=null){
signString.append("loginuserId").append("=").append(user.getId()).append(";");
}
+<<<<<<< HEAD
+=======
+ String apiToken = String.valueOf(request.getHeader("token"));
+ if(StringUtils.isNotBlank(apiToken)){
+ signString.append("apiToken").append("=").append(apiToken).append(";");
+ }
+>>>>>>> 7f2749f8bb57290104636f50de4824ad1f13cdd5
// 鍙傛暟绛惧悕
return DigestUtils.md5DigestAsHex(signString.toString().getBytes());
}
@@ -47,6 +55,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