From 110e73b993a97ecfbf2761858833e868fe4e17c7 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Sat, 3 May 2025 15:03:36 +0800 Subject: [PATCH] =?UTF-8?q?log=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../annotation/{MyLog.java => SysLog.java} | 6 ++-- ...erLogAspect.java => OperateLogAspect.java} | 28 +++++++++---------- .../controller/user/UserInfoController.java | 2 -- 3 files changed, 17 insertions(+), 19 deletions(-) rename src/main/java/com/greenorange/promotion/annotation/{MyLog.java => SysLog.java} (64%) rename src/main/java/com/greenorange/promotion/aop/{OperLogAspect.java => OperateLogAspect.java} (92%) diff --git a/src/main/java/com/greenorange/promotion/annotation/MyLog.java b/src/main/java/com/greenorange/promotion/annotation/SysLog.java similarity index 64% rename from src/main/java/com/greenorange/promotion/annotation/MyLog.java rename to src/main/java/com/greenorange/promotion/annotation/SysLog.java index 0a28fc6..24edd12 100644 --- a/src/main/java/com/greenorange/promotion/annotation/MyLog.java +++ b/src/main/java/com/greenorange/promotion/annotation/SysLog.java @@ -4,11 +4,11 @@ import java.lang.annotation.*; /** * 自定义注解记录系统操作日志 */ -//Target注解决定 MyLog 注解可以加在哪些成分上，如加在类身上，或者属性身上，或者方法身上等成分 +//Target注解决定 SysLog 注解可以加在哪些成分上，如加在类身上，或者属性身上，或者方法身上等成分 @Target({ ElementType.PARAMETER, ElementType.METHOD }) -//Retention注解括号中的"RetentionPolicy.RUNTIME"意思是让 MyLog 这个注解的生命周期一直程序运行时都存在 +//Retention注解括号中的"RetentionPolicy.RUNTIME"意思是让 SysLog 这个注解的生命周期一直程序运行时都存在 @Retention(RetentionPolicy.RUNTIME) -public @interface MyLog { +public @interface SysLog { /** * 模块标题 */ diff --git a/src/main/java/com/greenorange/promotion/aop/OperLogAspect.java b/src/main/java/com/greenorange/promotion/aop/OperateLogAspect.java similarity index 92% rename from src/main/java/com/greenorange/promotion/aop/OperLogAspect.java rename to src/main/java/com/greenorange/promotion/aop/OperateLogAspect.java index af6f8a6..755af23 100644 --- a/src/main/java/com/greenorange/promotion/aop/OperLogAspect.java +++ b/src/main/java/com/greenorange/promotion/aop/OperateLogAspect.java @@ -2,7 +2,7 @@ package com.greenorange.promotion.aop; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.greenorange.promotion.annotation.MyLog; +import com.greenorange.promotion.annotation.SysLog; import com.greenorange.promotion.model.entity.SysOperLog; import com.greenorange.promotion.service.log.SysOperLogService; import jakarta.annotation.Resource; @@ -29,7 +29,7 @@ import java.util.Map; */ @Aspect @Component -public class OperLogAspect { +public class OperateLogAspect { @Resource private SysOperLogService sysOperLogService; @@ -38,8 +38,8 @@ public class OperLogAspect { ThreadLocal startTime = new ThreadLocal<>(); - @Before("@annotation(myLog)") - public void beforeMethod(JoinPoint joinPoint, MyLog myLog){ + @Before("@annotation(sysLog)") + public void beforeMethod(JoinPoint joinPoint, SysLog sysLog){ startTime.set(System.currentTimeMillis()); } @@ -49,8 +49,8 @@ public class OperLogAspect { * @param joinPoint 切入点 * @param result 返回结果 */ - @AfterReturning(value = "@annotation(myLog)", returning = "result") - public void saveOperLog(JoinPoint joinPoint, MyLog myLog, Object result) { + @AfterReturning(value = "@annotation(sysLog)", returning = "result") + public void saveOperateLog(JoinPoint joinPoint, SysLog sysLog, Object result) { // 获取RequestAttributes RequestAttributes requestAttributes = RequestContextHolder.getRequestAttributes(); // 从获取RequestAttributes中获取HttpServletRequest的信息 @@ -62,8 +62,8 @@ public class OperLogAspect { Method method = signature.getMethod(); // 获取操作 SysOperLog sysOperLog = new SysOperLog(); - sysOperLog.setTitle(myLog.title());//设置模块名称 - sysOperLog.setContent(myLog.content());//设置日志内容 + sysOperLog.setTitle(sysLog.title());//设置模块名称 + sysOperLog.setContent(sysLog.content());//设置日志内容 // 将入参转换成json String params = argsArrayToString(joinPoint.getArgs()); // 获取请求的类名 @@ -118,10 +118,10 @@ public class OperLogAspect { String methodName = method.getName(); methodName = className + "." + methodName + "()"; // 获取操作 - MyLog myLog = method.getAnnotation(MyLog.class); - if (myLog != null) { - sysOperLog.setTitle(myLog.title());//设置模块名称 - sysOperLog.setContent(myLog.content());//设置日志内容 + SysLog sysLog = method.getAnnotation(SysLog.class); + if (sysLog != null) { + sysOperLog.setTitle(sysLog.title());//设置模块名称 + sysOperLog.setContent(sysLog.content());//设置日志内容 } // 将入参转换成json String params = argsArrayToString(joinPoint.getArgs()); @@ -181,7 +181,7 @@ public class OperLogAspect { } //字符串截取 - public static String substring(String str, int start, int end) { + public String substring(String str, int start, int end) { if (str == null) { return null; } else { @@ -216,7 +216,7 @@ public class OperLogAspect { * 转换request 请求参数 * @param paramMap request获取的参数数组 */ - public Map converMap(Map paramMap) { + public Map convertMap(Map paramMap) { Map returnMap = new HashMap<>(); for (String key : paramMap.keySet()) { returnMap.put(key, paramMap.get(key)[0]); diff --git a/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java b/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java index e61b0ff..418d613 100644 --- a/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java +++ b/src/main/java/com/greenorange/promotion/controller/user/UserInfoController.java @@ -8,7 +8,6 @@ import com.greenorange.promotion.common.BaseResponse; import com.greenorange.promotion.common.ErrorCode; import com.greenorange.promotion.common.ResultUtils; import com.greenorange.promotion.constant.UserConstant; -import com.greenorange.promotion.exception.BusinessException; import com.greenorange.promotion.exception.ThrowUtils; import com.greenorange.promotion.model.dto.CommonBatchRequest; import com.greenorange.promotion.model.dto.CommonRequest; @@ -26,7 +25,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; -import jakarta.validation.constraints.NotBlank; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*;