From 7ef4892f9f24f941aca37e6b3991b808a0aca619 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 08 九月 2023 11:16:35 +0800
Subject: [PATCH] 优化

---
 ycl-common/src/main/java/com/ycl/aspect/LogAspect.java |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java b/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
index 8db5b2a..9d342d9 100644
--- a/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
+++ b/ycl-common/src/main/java/com/ycl/aspect/LogAspect.java
@@ -35,9 +35,13 @@
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         Method method = signature.getMethod();
         LogSave annotation = method.getAnnotation(LogSave.class);
-        AdminUserDetails adminUserDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
         UmsAdminLoginLog loginLog = new UmsAdminLoginLog();
-        loginLog.setAdminId(adminUserDetails.getUserId());
+        try {
+            AdminUserDetails adminUserDetails = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+
+            loginLog.setAdminId(adminUserDetails.getUserId());
+        } catch (Exception ex) {
+        }
         loginLog.setCreateTime(new Date());
         ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
         HttpServletRequest request = attributes.getRequest();
@@ -45,21 +49,18 @@
         String header = request.getHeader("user-agent");
         if (header.contains("Windows NT")) {
             loginLog.setUserAgent("Web绔�");
-        }
-        else if(header.contains("Android")) {
+        } else if (header.contains("Android")) {
             loginLog.setUserAgent("Android绔�");
-        }
-        else if(header.contains("iPhone")) {
+        } else if (header.contains("iPhone")) {
             loginLog.setUserAgent("ios绔�");
-        }
-        else if(header.contains("iPad")) {
+        } else if (header.contains("iPad")) {
             loginLog.setUserAgent("iPad绔�");
-        }else {
+        } else {
             loginLog.setUserAgent("Web绔�");
         }
-        if (annotation.operationType().equals("")){
+        if (annotation.operationType().equals("")) {
             loginLog.setOperationType("鍏朵粬鎿嶄綔");
-        }else {
+        } else {
             loginLog.setOperationType(annotation.operationType());
         }
         loginLog.setContain(annotation.contain());

--
Gitblit v1.8.0