Merge branch 'master' into deploy

eladmin-logging/src/main/java/me/zhengjie/service/impl/LogServiceImpl.java

@@ -17,6 +17,7 @@ package me.zhengjie.service.impl;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.domain.Log;
@@ -94,6 +95,12 @@ public class LogServiceImpl implements LogService {
         log.setMethod(methodName);
         log.setUsername(username);
         log.setParams(getParameter(method, joinPoint.getArgs()));
+        // 记录登录用户，隐藏密码信息
+        if(log.getDescription().equals("用户登录")){
+            JSONObject obj = JSONUtil.parseObj(log.getParams());
+            log.setUsername(obj.get("username").toString());
+            log.setParams(JSONUtil.toJsonStr(Dict.create().set("username", log.getUsername())));
+        }
         log.setBrowser(browser);
         logRepository.save(log);
     }

eladmin-system/src/main/java/me/zhengjie/modules/security/rest/AuthorizationController.java

@@ -21,6 +21,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import me.zhengjie.annotation.Log;
 import me.zhengjie.annotation.rest.AnonymousDeleteMapping;
 import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
@@ -70,6 +71,7 @@ public class AuthorizationController {
     @Resource
     private LoginProperties loginProperties;
 
+    @Log("用户登录")
     @ApiOperation("登录授权")
     @AnonymousPostMapping(value = "/login")
     public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {