From e68c4455a8af1b4d7a25cd63f9fc9e5aabb441ab Mon Sep 17 00:00:00 2001 From: Charles7c Date: Mon, 15 Apr 2024 21:10:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=20Authorization=20?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=A4=B4=E5=86=85=E5=AE=B9=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=B0=8F=E5=86=99=E8=AF=B7=E6=B1=82=E5=A4=B4=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/system/config/log/LogDaoLocalImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java index 1263fd99..652f873e 100644 --- a/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/continew/admin/system/config/log/LogDaoLocalImpl.java @@ -18,6 +18,7 @@ package top.charles7c.continew.admin.system.config.log; import cn.dev33.satoken.SaManager; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; @@ -45,6 +46,7 @@ import java.net.URI; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.Map; +import java.util.Set; /** * 日志持久层接口本地实现类 @@ -112,9 +114,12 @@ public class LogDaoLocalImpl implements LogDao { } } // 操作人 - if (!requestUri.startsWith(SysConstants.LOGOUT_URI) && MapUtil.isNotEmpty(requestHeaderMap) && requestHeaderMap - .containsKey(HttpHeaders.AUTHORIZATION)) { - String authorization = requestHeaderMap.get(HttpHeaders.AUTHORIZATION); + String headerName = HttpHeaders.AUTHORIZATION; + boolean isContains = CollUtil.containsAny(requestHeaderMap.keySet(), Set.of(headerName, headerName + .toLowerCase())); + if (!requestUri.startsWith(SysConstants.LOGOUT_URI) && MapUtil.isNotEmpty(requestHeaderMap) && isContains) { + String authorization = requestHeaderMap.getOrDefault(headerName, requestHeaderMap.get(headerName + .toLowerCase())); String token = authorization.replace(SaManager.getConfig() .getTokenPrefix() + StringConstants.SPACE, StringConstants.EMPTY); logDO.setCreateUser(Convert.toLong(StpUtil.getLoginIdByToken(token)));