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 | 4 ++++
1 files changed, 4 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 df35095..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
@@ -34,10 +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());
}
--
Gitblit v1.9.3