From c66c55331511ea11569a5e29c8b23c413bc1514a Mon Sep 17 00:00:00 2001
From: MAC <1162714483@qq.com>
Date: Sun, 26 Dec 2021 18:52:27 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E7=94=A8=E6=88=B7id?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/qiwenshare/file/aop/WebLogAcpect.java   | 12 ++++++++----
 .../com/qiwenshare/file/util/OperationLogUtil.java   |  1 +
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java b/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java
index 5d33a0b..afdcca5 100644
--- a/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java
+++ b/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java
@@ -4,7 +4,9 @@ import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.file.api.IOperationLogService;
 import com.qiwenshare.file.api.IUserService;
+import com.qiwenshare.file.config.security.user.JwtUser;
 import com.qiwenshare.file.util.OperationLogUtil;
+import com.qiwenshare.file.util.SessionUtil;
 import com.qiwenshare.file.vo.user.UserLoginVo;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -36,7 +38,6 @@ public class WebLogAcpect {
 
     private String operation = "";
     private String module = "";
-    private String token = "";
     private HttpServletRequest request;
 
 
@@ -58,7 +59,6 @@ public class WebLogAcpect {
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         //获取切入点所在的方法
         Method method = signature.getMethod();
-        Map<String, Object> map = getNameAndValue(joinPoint);
 
         //获取操作
         MyLog myLog = method.getAnnotation(MyLog.class);
@@ -66,7 +66,6 @@ public class WebLogAcpect {
         if (myLog != null) {
             operation = myLog.operation();
             module = myLog.module();
-            token = (String) map.get("token");
         }
 
         // 接收到请求，记录请求内容
@@ -82,7 +81,12 @@ public class WebLogAcpect {
         if (ret instanceof RestResult) {
             boolean isSuccess = ((RestResult) ret).getSuccess();
             String errorMessage = ((RestResult) ret).getMessage();
-            Long userId = userService.getUserIdByToken(token);
+            JwtUser sessionUser = SessionUtil.getSession();
+            Long userId = 0L;
+            if (sessionUser != null) {
+                userId = sessionUser.getUserId();
+            }
+
             Integer code = ((RestResult) ret).getCode();
             if (code != null && code == 200001) {
                 UserLoginVo data = (UserLoginVo) ((RestResult) ret).getData();
diff --git a/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java b/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java
index acf6d4b..ffc77c1 100644
--- a/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java
+++ b/src/main/java/com/qiwenshare/file/util/OperationLogUtil.java
@@ -30,6 +30,7 @@ public class OperationLogUtil {
         operationLogBean.setResult(isSuccess);
         operationLogBean.setOperation(operation);
         operationLogBean.setDetail(detail);
+        operationLogBean.setPlatform(3);
 
         return operationLogBean;
     }