调整操作日志查询条件，优化登录日志采集逻辑

xtools-app-sys/xtools-app-sys-auth/src/main/java/xtools/app/sys/auth/filter/AuthFilter.java

@@ -40,6 +40,7 @@ import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
+import static xtools.base.config.Constants.CP_LINE;
 import static xtools.base.config.Constants.CP_NUM1;
 import static xtools.base.config.Constants.CP_NUM200;
 
@@ -193,18 +194,8 @@ public class AuthFilter extends BaseFilter implements Ordered, BootCommonConstan
         // 校验登录白名单
         if (checkLoginWhiteList(uri)) {
             filterChain.doFilter(request, response);
-            // 记录登录日志
-            if (LOGIN_URI.contains(uri)) {
-                LoginUserDto loginUser = AuthUtils.getDefNull();
-                if (loginUser == null) {
-                    log.setTitle("系统登录-密码登录失败");
-                } else {
-                    log.setAccountId(loginUser.getId());
-                    log.setAccount(loginUser.getAccount());
-                    log.setTitle("系统登录-密码登录成功");
-                }
-                saveOptLog(log);
-            }
+            // 保存登录日志
+            saveLoginLog(uri, log);
             return;
         }
 
@@ -244,6 +235,29 @@ public class AuthFilter extends BaseFilter implements Ordered, BootCommonConstan
         saveOptLog(log);
     }
 
+    /**
+     * 保存登录日志
+     *
+     * @param uri 访问uri
+     * @param log 日志
+     */
+    private void saveLoginLog(String uri, OptLogDto log) {
+        if (!LOGIN_URI.contains(uri)) {
+            return;
+        }
+        LoginUserDto loginUser = AuthUtils.getDefNull();
+        if (loginUser == null) {
+            log.setAccountId(0L);
+            log.setAccount(CP_LINE);
+            log.setTitle("系统登录-登录失败");
+        } else {
+            log.setAccountId(loginUser.getId());
+            log.setAccount(loginUser.getAccount());
+            log.setTitle("系统登录-登录成功");
+        }
+        saveOptLog(log);
+    }
+
     /**
      * 保存操作日志
      *