From 62f6ac3b8ad64b1d66abda5474467f5733de9755 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 23 五月 2022 14:39:26 +0800
Subject: [PATCH] 单灯任务

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

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 e9507ce..b4755d7 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
@@ -1,6 +1,7 @@
 package com.sandu.ximon.admin.controller;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.extra.servlet.ServletUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
@@ -25,7 +26,6 @@
 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;
@@ -178,7 +178,7 @@
             return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
         }
         String s = RedisUtils.getBean().get(loginParam.getKey());
-        System.out.println(s+"===========================");
+        System.out.println(s + "===========================");
         if (!loginParam.getVlue().equals(s)) {
             return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
         }
@@ -218,12 +218,12 @@
         Browser browser = userAgent.getBrowser();
         OperatingSystem os = userAgent.getOperatingSystem();
         String content = "鐢ㄦ埛ID锛�" + client.getId()
-                + "鐢ㄦ埛鍚嶏細" + client.getClientName()
-                + "鐢ㄦ埛绫诲瀷锛氱鐞嗗憳"
-                + " 鐧诲綍IP鍦板潃锛�" + IPUtils.getPublicIp()
+                + "锛岀敤鎴峰悕锛�" + client.getClientName()
+                + "锛岀敤鎴风被鍨嬶細绠$悊鍛�"
+                + "锛岀櫥褰旾P鍦板潃锛�" + ServletUtil.getClientIP(request)
                 + "锛屾搷浣滅郴缁燂細" + os
                 + "锛屾祻瑙堝櫒锛�" + browser;
-        StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛鐧诲綍", content);
+        StoreOperationRecordsUtils.storeOperationLoginData(client.getId(), client.getClientName(), "鐢ㄦ埛鐧诲綍", content);
         return ResponseUtil.success(authInfo);
     }
 }

--
Gitblit v1.9.3