From 8b4414dbc0486eb03defa7430a3061689057b2dd Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Sun, 26 Dec 2021 18:18:40 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=99=BB=E5=BD=95):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E7=94=A8?= =?UTF-8?q?=E6=88=B7id=E8=AE=B0=E5=BD=95=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java | 7 ++++++- .../com/qiwenshare/file/controller/UserController.java | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java b/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java index cd43a91..5d33a0b 100644 --- a/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java +++ b/src/main/java/com/qiwenshare/file/aop/WebLogAcpect.java @@ -4,8 +4,8 @@ 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.domain.UserBean; import com.qiwenshare.file.util.OperationLogUtil; +import com.qiwenshare.file.vo.user.UserLoginVo; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.Aspect; @@ -83,6 +83,11 @@ public class WebLogAcpect { boolean isSuccess = ((RestResult) ret).getSuccess(); String errorMessage = ((RestResult) ret).getMessage(); Long userId = userService.getUserIdByToken(token); + Integer code = ((RestResult) ret).getCode(); + if (code != null && code == 200001) { + UserLoginVo data = (UserLoginVo) ((RestResult) ret).getData(); + userId = data.getUserId(); + } if (isSuccess) { operationLogService.insertOperationLog( diff --git a/src/main/java/com/qiwenshare/file/controller/UserController.java b/src/main/java/com/qiwenshare/file/controller/UserController.java index d436dac..03aeb54 100644 --- a/src/main/java/com/qiwenshare/file/controller/UserController.java +++ b/src/main/java/com/qiwenshare/file/controller/UserController.java @@ -91,6 +91,7 @@ public class UserController { userLoginVo.setToken("Bearer " + token); restResult.setData(userLoginVo); restResult.setSuccess(true); + restResult.setCode(200001); return restResult; }