From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java |   12 ++++--------
 1 files changed, 4 insertions(+), 8 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 762d287..3973ce4 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,22 +1,17 @@
 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;
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.enums.ResponseStatusEnums;
 import com.sandu.common.execption.BusinessException;
 import com.sandu.common.log.Log;
-import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.security.LoginUserInfo;
 import com.sandu.common.security.annotation.AnonymousAccess;
 import com.sandu.common.security.config.SecurityProperties;
 import com.sandu.common.security.token.TokenProvider;
 import com.sandu.common.util.IpUtil;
 import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.dto.ClientDto;
 import com.sandu.ximon.admin.dto.ClientDtoNode;
 import com.sandu.ximon.admin.param.AddClientPrarm;
 import com.sandu.ximon.admin.param.AdminLoginParam;
@@ -30,10 +25,8 @@
 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 com.sandu.ximon.dao.enums.OrderByEnums;
 import eu.bitwalker.useragentutils.Browser;
 import eu.bitwalker.useragentutils.OperatingSystem;
 import eu.bitwalker.useragentutils.UserAgent;
@@ -45,7 +38,10 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

--
Gitblit v1.9.3