From 893297f6e5d472704d30f6789e1ffc82a44803d2 Mon Sep 17 00:00:00 2001 From: xiaoyu <17601026937@163.com> Date: Tue, 15 Jun 2021 15:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=81=E5=95=86=E6=88=B7=E6=93=8D=E4=BD=9C=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeequan/jeepay/mgr/aop/MethodLogAop.java | 21 +++++++++++-------- .../jeequan/jeepay/mch/aop/MethodLogAop.java | 21 +++++++++++-------- .../mch/ctrl/sysuser/SysUserController.java | 3 +++ 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java index acbe253..5bb7d8b 100644 --- a/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java +++ b/jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java @@ -20,6 +20,7 @@ import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.SysLog; +import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.security.JeeUserDetails; import com.jeequan.jeepay.service.impl.SysLogService; import org.aspectj.lang.JoinPoint; @@ -83,17 +84,13 @@ public class MethodLogAop { public Object around(ProceedingJoinPoint point) throws Throwable { final SysLog sysLog = new SysLog(); - // 基础日志信息 - setBaseLogInfo(point, sysLog); //处理切面任务 发生异常将向外抛出 不记录日志 Object result = point.proceed(); try { - sysLog.setUserId(JeeUserDetails.getCurrentUserDetails().getSysUser().getSysUserId()); - sysLog.setUserName(JeeUserDetails.getCurrentUserDetails().getSysUser().getRealname()); - sysLog.setSystem(JeeUserDetails.getCurrentUserDetails().getSysUser().getSystem()); + // 基础日志信息 + setBaseLogInfo(point, sysLog, JeeUserDetails.getCurrentUserDetails()); sysLog.setOptResInfo(JSONObject.toJSON(result).toString()); - scheduledThreadPool.execute(() -> sysLogService.save(sysLog)); } catch (Exception e) { logger.error("methodLogError", e); @@ -111,8 +108,8 @@ public class MethodLogAop { public void doException(JoinPoint joinPoint, Throwable e) throws Exception{ final SysLog sysLog = new SysLog(); // 基础日志信息 - setBaseLogInfo(joinPoint, sysLog); - sysLog.setOptResInfo("请求异常"); + setBaseLogInfo(joinPoint, sysLog, JeeUserDetails.getCurrentUserDetails()); + sysLog.setOptResInfo(e instanceof BizException ? e.getMessage() : "请求异常"); scheduledThreadPool.execute(() -> sysLogService.save(sysLog)); } @@ -139,7 +136,7 @@ public class MethodLogAop { * @date: 2021/6/7 14:12 * @describe: 日志基本信息 公共方法 */ - private void setBaseLogInfo(JoinPoint joinPoint, SysLog sysLog) throws Exception { + private void setBaseLogInfo(JoinPoint joinPoint, SysLog sysLog, JeeUserDetails userDetails) throws Exception { // 使用point.getArgs()可获取request，仅限于spring MVC参数包含request，改为通过contextHolder获取。 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); @@ -159,6 +156,12 @@ public class MethodLogAop { sysLog.setUserIp(requestKitBean.getClientIp()); sysLog.setCreatedAt(new Date()); sysLog.setSystem(CS.SYS_TYPE.MGR); + + if (userDetails != null) { + sysLog.setUserId(JeeUserDetails.getCurrentUserDetails().getSysUser().getSysUserId()); + sysLog.setUserName(JeeUserDetails.getCurrentUserDetails().getSysUser().getRealname()); + sysLog.setSystem(JeeUserDetails.getCurrentUserDetails().getSysUser().getSystem()); + } } } diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java index f1f0182..4c2ed83 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/aop/MethodLogAop.java @@ -20,6 +20,7 @@ import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.beans.RequestKitBean; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.SysLog; +import com.jeequan.jeepay.core.exception.BizException; import com.jeequan.jeepay.core.model.security.JeeUserDetails; import com.jeequan.jeepay.service.impl.SysLogService; import org.aspectj.lang.JoinPoint; @@ -82,18 +83,14 @@ public class MethodLogAop{ public Object around(ProceedingJoinPoint point) throws Throwable { final SysLog sysLog = new SysLog(); - // 基础日志信息 - setBaseLogInfo(point, sysLog); //处理切面任务 发生异常将向外抛出 不记录日志 Object result = point.proceed(); try { - sysLog.setUserId(JeeUserDetails.getCurrentUserDetails().getSysUser().getSysUserId()); - sysLog.setUserName(JeeUserDetails.getCurrentUserDetails().getSysUser().getRealname()); - sysLog.setSystem(JeeUserDetails.getCurrentUserDetails().getSysUser().getSystem()); + // 基础日志信息 + setBaseLogInfo(point, sysLog, JeeUserDetails.getCurrentUserDetails()); sysLog.setOptResInfo(JSONObject.toJSON(result).toString()); - scheduledThreadPool.execute(new Runnable() { @Override public void run() { @@ -116,8 +113,8 @@ public class MethodLogAop{ public void doException(JoinPoint joinPoint, Throwable e) throws Exception{ final SysLog sysLog = new SysLog(); // 基础日志信息 - setBaseLogInfo(joinPoint, sysLog); - sysLog.setOptResInfo("请求异常"); + setBaseLogInfo(joinPoint, sysLog, JeeUserDetails.getCurrentUserDetails()); + sysLog.setOptResInfo(e instanceof BizException ? e.getMessage() : "请求异常"); scheduledThreadPool.execute(() -> sysLogService.save(sysLog)); } @@ -144,7 +141,7 @@ public class MethodLogAop{ * @date: 2021/6/7 14:12 * @describe: 日志基本信息 公共方法 */ - private void setBaseLogInfo(JoinPoint joinPoint, SysLog sysLog) throws Exception { + private void setBaseLogInfo(JoinPoint joinPoint, SysLog sysLog, JeeUserDetails userDetails) throws Exception { // 使用point.getArgs()可获取request，仅限于spring MVC参数包含request，改为通过contextHolder获取。 HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); @@ -164,6 +161,12 @@ public class MethodLogAop{ sysLog.setUserIp(requestKitBean.getClientIp()); sysLog.setCreatedAt(new Date()); sysLog.setSystem(CS.SYS_TYPE.MCH); + + if (userDetails != null) { + sysLog.setUserId(JeeUserDetails.getCurrentUserDetails().getSysUser().getSysUserId()); + sysLog.setUserName(JeeUserDetails.getCurrentUserDetails().getSysUser().getRealname()); + sysLog.setSystem(JeeUserDetails.getCurrentUserDetails().getSysUser().getSystem()); + } } } diff --git a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java index 704c02d..ae04ef6 100644 --- a/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java +++ b/jeepay-merchant/src/main/java/com/jeequan/jeepay/mch/ctrl/sysuser/SysUserController.java @@ -17,6 +17,7 @@ package com.jeequan.jeepay.mch.ctrl.sysuser; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jeequan.jeepay.core.aop.MethodLog; import com.jeequan.jeepay.core.constants.ApiCodeEnum; import com.jeequan.jeepay.core.constants.CS; import com.jeequan.jeepay.core.entity.SysUser; @@ -94,6 +95,7 @@ public class SysUserController extends CommonCtrl { /** add */ @PreAuthorize("hasAuthority( 'ENT_UR_USER_ADD' )") @RequestMapping(value="", method = RequestMethod.POST) + @MethodLog(remark = "添加管理员") public ApiRes add() { SysUser sysUser = getObject(SysUser.class); sysUser.setBelongInfoId(getCurrentUser().getSysUser().getBelongInfoId()); @@ -130,6 +132,7 @@ public class SysUserController extends CommonCtrl { /** update */ @PreAuthorize("hasAuthority( 'ENT_UR_USER_EDIT' )") @RequestMapping(value="/{recordId}", method = RequestMethod.PUT) + @MethodLog(remark = "修改操作员信息") public ApiRes update(@PathVariable("recordId") Long recordId) { SysUser sysUser = getObject(SysUser.class); sysUser.setSysUserId(recordId); -- GitLab