feat(log): log结合当前登录人

src/main/java/com/dragon/tj/portal/auth/config/WebSecurityConfig.java

@@ -55,6 +55,7 @@ public class WebSecurityConfig {
     static {
         whiteList.append("/test/login" + whiteListSplit);
         whiteList.append("/subscribe/*" + whiteListSplit);
+        whiteList.append("/test/test1" + whiteListSplit);
     }
     @Bean
     public WebSecurityCustomizer webSecurityCustomizer() {

src/main/java/com/dragon/tj/portal/common/convert/SysLogDTO2SysLogConvert.java

@@ -0,0 +1,15 @@
+package com.dragon.tj.portal.common.convert;
+
+
+import com.dragon.tj.portal.component.log.dto.SysLogDTO;
+import com.dragon.tj.portal.entity.SysLog;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.MappingConstants;
+
+@Mapper(componentModel = MappingConstants.ComponentModel.SPRING)
+public interface SysLogDTO2SysLogConvert {
+
+    @Mapping(source = "createTime", target = "createTime", ignore = true)
+    SysLog dto2SysLog(SysLogDTO sysLogDTO);
+}

src/main/java/com/dragon/tj/portal/component/log/aspect/SysLogAspect.java

@@ -19,19 +19,39 @@
 
 package com.dragon.tj.portal.component.log.aspect;
 
-import com.dragon.tj.portal.component.log.dto.SysLogDTO;
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.dragon.tj.portal.auth.model.LoginUser;
+import com.dragon.tj.portal.auth.service.TokenService;
 import com.dragon.tj.portal.component.log.annotation.SysLog;
+import com.dragon.tj.portal.component.log.dto.SysLogDTO;
 import com.dragon.tj.portal.component.log.event.SysLogEvent;
 import com.dragon.tj.portal.component.log.uitl.LogTypeEnum;
 import com.dragon.tj.portal.component.log.uitl.SysLogUtils;
-import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.lang.annotation.Annotation;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import java.util.Objects;
+import java.util.SortedMap;
+import java.util.TreeMap;
 
 /**
  * @author huey China.
@@ -41,10 +61,18 @@ import org.springframework.stereotype.Component;
 @Component
 @Slf4j
 @Aspect
-@RequiredArgsConstructor
 public class SysLogAspect {
 
-    private final ApplicationEventPublisher publisher;
+    private static final String GET_METHOD = "GET";
+    private static final String POST_METHOD = "POST";
+
+    private static final Class<RequestBody> REQUEST_BODY_CLASS = RequestBody.class;
+
+    @Autowired
+    private ApplicationEventPublisher publisher;
+
+    @Autowired
+    private TokenService tokenService;
 
     @SneakyThrows
     @Around("@annotation(sysLog)")
@@ -53,8 +81,20 @@ public class SysLogAspect {
         String strMethodName = point.getSignature().getName();
         log.debug("[类名]:{},[方法]:{}", strClassName, strMethodName);
 
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+        LoginUser loginUser = tokenService.getLoginUser(request);
+        String createBy = "admin";
+        String createUser = "admin";
+        if (Objects.nonNull(loginUser)) {
+            log.info("class-method-current-login {}-{}-{}", strClassName, strMethodName, JSON.toJSONString(loginUser));
+            createBy = loginUser.getIdCard();
+            createUser = loginUser.getUsername();
+        }
         SysLogDTO logDTO = SysLogUtils.getSysLog();
         logDTO.setTitle(sysLog.value());
+        logDTO.setCreateBy(createBy);
+        logDTO.setCreateUser(createUser);
+        logDTO.setParams(this.params(request, point));
         // 发送异步日志事件
         Long startTime = System.currentTimeMillis();
         Object obj;
@@ -72,4 +112,55 @@ public class SysLogAspect {
         return obj;
     }
 
-}
+
+    private String params(HttpServletRequest request1, ProceedingJoinPoint point) throws IOException {
+        // 获取GET请求的参数列表及对应的值
+
+        StringBuilder params = new StringBuilder();
+        Map<String, String[]> getParameters = request1.getParameterMap();
+        for (Map.Entry<String, String[]> entry : getParameters.entrySet()) {
+            String parameterName = entry.getKey();
+            String[] parameterValues = entry.getValue();
+            // 处理GET请求的参数及对应的值
+            params.append("GET-PARAM:" + parameterName + " - " + String.join(", ", parameterValues));
+        }
+
+        // 获取POST请求的参数列表及对应的值
+        // 获取POST请求中的JSON值
+        if (POST_METHOD.equalsIgnoreCase(request1.getMethod())) {
+            // 获取JSON参数
+            MethodSignature methodSignature = (MethodSignature) point.getSignature();
+
+            int index = getIndexOfRequestBodyParameter(methodSignature);
+            if (index > -1) {
+                Object[] args = point.getArgs();
+                // 若有参数，则参数
+                Object arg = args[index];
+                String s = JSON.toJSONString(arg);
+                if (Objects.nonNull(s)) {
+                    params.append("POST-PARAM:"+s);
+                }
+            }
+        }
+        return params.toString();
+    }
+
+    /**
+     * 获取@RequestBody注解参数的索引
+     */
+    private int getIndexOfRequestBodyParameter(final MethodSignature methodSignature) {
+        int index = -1;
+        // 获取参数上的所有注解
+        final Annotation[][] parameterAnnotations = methodSignature.getMethod().getParameterAnnotations();
+        for (int i = 0; i < parameterAnnotations.length; i++) {
+            Annotation[] annotations = parameterAnnotations[i];
+            for (int j = 0; j < annotations.length; j++) {
+                Annotation annotation = annotations[j];
+                if (REQUEST_BODY_CLASS.equals(annotation.annotationType())) {
+                    return i;
+                }
+            }
+        }
+        return index;
+    }
+}

src/main/java/com/dragon/tj/portal/component/log/dto/SysLogDTO.java

@@ -35,6 +35,8 @@ public class SysLogDTO {
 	 */
 	private String createBy;
 
+	private String createUser;
+
 	/**
 	 * 更新时间
 	 */

src/main/java/com/dragon/tj/portal/component/log/event/SysLogListener.java

@@ -19,11 +19,11 @@
 
 package com.dragon.tj.portal.component.log.event;
 
+import com.dragon.tj.portal.common.convert.SysLogDTO2SysLogConvert;
 import com.dragon.tj.portal.component.log.dto.SysLogDTO;
 import com.dragon.tj.portal.entity.SysLog;
 import com.dragon.tj.portal.service.SysLogService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.core.annotation.Order;
@@ -42,13 +42,15 @@ public class SysLogListener {
     @Autowired
     private SysLogService sysLogService;
 
+    @Autowired
+    private SysLogDTO2SysLogConvert sysLogDTO2SysLogConvert;
+
     @Async
     @Order
     @EventListener(SysLogEvent.class)
     public void saveSysLog(SysLogEvent event) {
         SysLogDTO sysLogDTO = event.getSysLog();
-        SysLog sysLog = new SysLog();
-        BeanUtils.copyProperties(sysLogDTO, sysLog, "createTime");
+        SysLog sysLog = sysLogDTO2SysLogConvert.dto2SysLog(sysLogDTO);
         sysLogService.save(sysLog);
     }
 

src/main/java/com/dragon/tj/portal/entity/SysLog.java

@@ -38,6 +38,7 @@ public class SysLog implements Serializable {
     private String title;
 
     private String createBy;
+    private String createUser;
 
     /**
      * 创建时间
@@ -68,5 +69,4 @@ public class SysLog implements Serializable {
 
     private String delFlag;
 
-
 }