From f60b687aa46111a5cb94b9997f166ee0f997dcee Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 17:22:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 4 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 4 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java | 4 ++--
3 files changed, 6 insertions(+), 6 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 5fdae00..754a7ce 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
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
+import cn.hutool.extra.servlet.ServletUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
@@ -22,7 +23,6 @@
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
-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.bo.MenuNode;
@@ -136,7 +136,7 @@
String content = "鐢ㄦ埛ID锛�" + admin.getId()
+ "锛岀敤鎴峰悕锛�" + admin.getUsername()
+ "锛岀敤鎴风被鍨嬶細绠＄悊鍛�"
- + "锛岀櫥褰旾P鍦板潃锛�" + IPUtils.getPublicIp()
+ + "锛岀櫥褰旾P鍦板潃锛�" + ServletUtil.getClientIP(request)
+ "锛屾搷浣滅郴缁燂細" + os
+ "锛屾祻瑙堝櫒锛�" + browser;
StoreOperationRecordsUtils.storeOperationLoginData(admin.getId(), admin.getUsername(), "绠＄悊鍛樼櫥褰�", content);
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 b97414c..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;
@@ -220,7 +220,7 @@
String content = "鐢ㄦ埛ID锛�" + client.getId()
+ "锛岀敤鎴峰悕锛�" + client.getClientName()
+ "锛岀敤鎴风被鍨嬶細绠＄悊鍛�"
- + "锛岀櫥褰旾P鍦板潃锛�" + IPUtils.getPublicIp()
+ + "锛岀櫥褰旾P鍦板潃锛�" + ServletUtil.getClientIP(request)
+ "锛屾搷浣滅郴缁燂細" + os
+ "锛屾祻瑙堝櫒锛�" + browser;
StoreOperationRecordsUtils.storeOperationLoginData(client.getId(), client.getClientName(), "鐢ㄦ埛鐧诲綍", content);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java
index 4302436..56af43b 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/DeviceOperationLogService.java
@@ -28,7 +28,7 @@
DeviceOperationLog deviceOperationLog = new DeviceOperationLog();
deviceOperationLog.setUserId(SecurityUtils.getUserId());
deviceOperationLog.setUserName(SecurityUtils.getUsername());
- if (deviceCode != null) {
+ if (deviceCode != null && !"[]".equals(deviceCode)) {
deviceOperationLog.setDeviceCode(deviceCode);
}
if (deviceName != null) {
@@ -36,7 +36,7 @@
}
deviceOperationLog.setOperation(operation);
deviceOperationLog.setContent(content);
- if (poleCode != null) {
+ if (poleCode != null && !"[]".equals(poleCode)) {
deviceOperationLog.setPoleCode(poleCode);
}
this.save(deviceOperationLog);
--
Gitblit v1.9.3