From feac6e0c2db4e60d55417fde1971a0bc6d703566 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 15:58:28 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 15 +++++++++------
1 files changed, 9 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 87f5c8d..93993e1 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,10 +136,10 @@
String content = "鐢ㄦ埛ID锛�" + admin.getId()
+ "锛岀敤鎴峰悕锛�" + admin.getUsername()
+ "锛岀敤鎴风被鍨嬶細绠＄悊鍛�"
- + "锛岀櫥褰旾P鍦板潃锛�" + IPUtils.getPublicIp()
+ + "锛岀櫥褰旾P鍦板潃锛�" + ServletUtil.getClientIP(request)
+ "锛屾搷浣滅郴缁燂細" + os
+ "锛屾祻瑙堝櫒锛�" + browser;
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛鐧诲綍", content);
+ StoreOperationRecordsUtils.storeOperationLoginData(admin.getId(), admin.getUsername(), "绠＄悊鍛樼櫥褰�", content);
/**
* 鐧诲綍淇℃伅鏃ュ織璁板綍缁撴潫
*/
@@ -191,7 +191,7 @@
@GetMapping(value = "/logout")
public ResponseVO<Object> LogOut() {
String content = "鐢ㄦ埛鍚嶏細" + SecurityUtils.getUsername();
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛閫�鍑虹櫥褰�", content);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄧ鐞嗗憳閫�鍑虹櫥褰�", content);
String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
redisService.set(key, null);
return ResponseUtil.success("閫�鍑虹櫥褰曟垚鍔�");
@@ -209,11 +209,14 @@
@Log("鍚庡彴鐢ㄦ埛鍒楄〃")
@GetMapping(value = "/list")
- public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listAdmin(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.ADMIN_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
+ return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword, order, seq));
}
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
--
Gitblit v1.9.3