From 0974650b91b4ce0909855d1302d0ad379df854bf Mon Sep 17 00:00:00 2001
From: wanggeng <450292408@qq.com>
Date: Mon, 1 Nov 2021 11:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=B1=BB=E5=9E=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/rbac/impl/RbacServiceImpl.java     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/common/src/main/java/ink/wgink/common/service/rbac/impl/RbacServiceImpl.java b/common/src/main/java/ink/wgink/common/service/rbac/impl/RbacServiceImpl.java
index 5d4bc7cd..73cf1dba 100644
--- a/common/src/main/java/ink/wgink/common/service/rbac/impl/RbacServiceImpl.java
+++ b/common/src/main/java/ink/wgink/common/service/rbac/impl/RbacServiceImpl.java
@@ -4,6 +4,7 @@ import ink.wgink.common.service.rbac.IRbacService;
 import ink.wgink.interfaces.consts.ISystemConstant;
 import ink.wgink.pojo.bos.LoginUser;
 import ink.wgink.pojo.bos.RoleGrantedAuthorityBO;
+import ink.wgink.pojo.bos.UserInfoBO;
 import ink.wgink.properties.AccessControlProperties;
 import ink.wgink.properties.LoggingProperties;
 import ink.wgink.util.log.LogUtil;
@@ -47,7 +48,6 @@ public class RbacServiceImpl implements IRbacService {
         if (object == null || "anonymousUser".equals(object.toString())) {
             return false;
         }
-        LoginUser loginUser = (LoginUser) object;
         boolean hasPermission = false;
         String requestURI = request.getRequestURI();
         Collection<? extends GrantedAuthority> grantedAuthorities = authentication.getAuthorities();
@@ -109,7 +109,14 @@ public class RbacServiceImpl implements IRbacService {
                 break;
             }
         }
-        log(hasPermission, requestURI, contextPath, request, loginUser);
+        if (object instanceof UserInfoBO) {
+            UserInfoBO userInfoBO = (UserInfoBO) object;
+            log(hasPermission, requestURI, contextPath, request, userInfoBO.getUserId(), userInfoBO.getUserName());
+        }
+        if (object instanceof LoginUser) {
+            LoginUser loginUser = (LoginUser) object;
+            log(hasPermission, requestURI, contextPath, request, loginUser.getUserId(), loginUser.getUserName());
+        }
         return hasPermission;
     }
 
@@ -231,9 +238,10 @@ public class RbacServiceImpl implements IRbacService {
      * @param requestURI
      * @param contextPath
      * @param request
-     * @param loginUser
+     * @param userId
+     * @param userName
      */
-    private void log(boolean hasPermission, String requestURI, String contextPath, HttpServletRequest request, LoginUser loginUser) {
+    private void log(boolean hasPermission, String requestURI, String contextPath, HttpServletRequest request, String userId, String userName) {
         if (!hasPermission) {
             return;
         }
@@ -244,7 +252,7 @@ public class RbacServiceImpl implements IRbacService {
         if (!uri.startsWith("/route")) {
             return;
         }
-        LogUtil.routeLog(request, uri, loginUser.getUserId(), loginUser.getUserName());
+        LogUtil.routeLog(request, uri, userId, userName);
     }
 
 }