From 03267d87fade82578087123a1be515b6fde20bfb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 14:19:01 +0800
Subject: [PATCH] 日志

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java  |   17 ++++++++++++++---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java |   19 +++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
index e217563..2bd15ed 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java
@@ -125,13 +125,24 @@
             put("token", properties.getTokenStartWith() + token);
             put("user", admin);
         }};
-        //淇濆瓨鐧诲綍淇℃伅鍒版棩蹇�
+
+
+        /**
+         * 鐧诲綍淇℃伅鏃ュ織璁板綍寮�濮�
+         */
         UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
         Browser browser = userAgent.getBrowser();
         OperatingSystem os = userAgent.getOperatingSystem();
-        String content = "鐧诲綍IP鍦板潃锛�" + IPUtils.getPublicIp() + "锛屾搷浣滅郴缁燂細" + os + "锛屾祻瑙堝櫒锛�" + browser;
-
+        String content = "鐢ㄦ埛ID锛�" + admin.getId()
+                + "鐢ㄦ埛鍚嶏細" + admin.getUsername()
+                + "鐢ㄦ埛绫诲瀷锛氱鐞嗗憳"
+                + " 鐧诲綍IP鍦板潃锛�" + IPUtils.getPublicIp()
+                + "锛屾搷浣滅郴缁燂細" + os
+                + "锛屾祻瑙堝櫒锛�" + browser;
         StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛鐧诲綍", content);
+        /**
+         * 鐧诲綍淇℃伅鏃ュ織璁板綍缁撴潫
+         */
         return ResponseUtil.success(authInfo);
     }
 
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
index 4f1806b..e9507ce 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java
@@ -25,11 +25,16 @@
 import com.sandu.ximon.admin.service.ClientRoleRelationService;
 import com.sandu.ximon.admin.service.ClientService;
 import com.sandu.ximon.admin.service.RoleService;
+import com.sandu.ximon.admin.utils.IPUtils;
 import com.sandu.ximon.admin.utils.RedisUtils;
+import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
 import com.sandu.ximon.dao.domain.Client;
 import com.sandu.ximon.dao.domain.ClientRoleRelation;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
 import com.sandu.ximon.dao.enums.MenuEnum;
+import eu.bitwalker.useragentutils.Browser;
+import eu.bitwalker.useragentutils.OperatingSystem;
+import eu.bitwalker.useragentutils.UserAgent;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -205,6 +210,20 @@
             put("token", properties.getTokenStartWith() + token);
             put("user", client);
         }};
+
+        /**
+         * 鐧诲綍淇℃伅鏃ュ織璁板綍寮�濮�
+         */
+        UserAgent userAgent = UserAgent.parseUserAgentString(request.getHeader("User-Agent"));
+        Browser browser = userAgent.getBrowser();
+        OperatingSystem os = userAgent.getOperatingSystem();
+        String content = "鐢ㄦ埛ID锛�" + client.getId()
+                + "鐢ㄦ埛鍚嶏細" + client.getClientName()
+                + "鐢ㄦ埛绫诲瀷锛氱鐞嗗憳"
+                + " 鐧诲綍IP鍦板潃锛�" + IPUtils.getPublicIp()
+                + "锛屾搷浣滅郴缁燂細" + os
+                + "锛屾祻瑙堝櫒锛�" + browser;
+        StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛鐧诲綍", content);
         return ResponseUtil.success(authInfo);
     }
 }

--
Gitblit v1.9.3