From 0461576d53511d699c1f0d7e079d8011b86efe97 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 17 五月 2022 14:42:56 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 114 ++++++++++++++++++++-------------------------------------
1 files changed, 40 insertions(+), 74 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 0b69b22..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
@@ -3,7 +3,6 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.map.MapBuilder;
import cn.hutool.core.map.MapUtil;
-import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
@@ -23,11 +22,16 @@
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;
import com.sandu.ximon.dao.domain.*;
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 lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -74,9 +78,7 @@
if (admin == null) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
-// String session_vcode = (String) request.getSession().getAttribute(loginParam.getKey());
String s = RedisUtils.getBean().get(loginParam.getKey());
- System.out.println(s + "===========================");
if (!loginParam.getVlue().equals(s)) {
log.error(loginParam.getVlue() + "楠岃瘉鐮�");
return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
@@ -123,6 +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 = "鐢ㄦ埛ID锛�" + admin.getId()
+ + "鐢ㄦ埛鍚嶏細" + admin.getUsername()
+ + "鐢ㄦ埛绫诲瀷锛氱鐞嗗憳"
+ + " 鐧诲綍IP鍦板潃锛�" + IPUtils.getPublicIp()
+ + "锛屾搷浣滅郴缁燂細" + os
+ + "锛屾祻瑙堝櫒锛�" + browser;
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛鐧诲綍", content);
+ /**
+ * 鐧诲綍淇℃伅鏃ュ織璁板綍缁撴潫
+ */
return ResponseUtil.success(authInfo);
}
@@ -170,10 +190,8 @@
@GetMapping(value = "/logout")
public ResponseVO<Object> LogOut() {
-// redisService.set(UserModel.USER_INFO.key(SecurityUtils.getUserId().toString() + SecurityUtils.getUserDetails().getAdministratorType()), null);
-// redisService.set(UserModel.USER_TOKEN.key(UserModel.USER_TOKEN.key(SecurityUtils.getUserDetails().getToken())), null);
-
-
+ String content = "鐢ㄦ埛鍚嶏細" + SecurityUtils.getUsername();
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐢ㄦ埛閫�鍑虹櫥褰�", content);
String key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
redisService.set(key, null);
return ResponseUtil.success("閫�鍑虹櫥褰曟垚鍔�");
@@ -196,31 +214,6 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
return ResponseUtil.successPage(adminService.listAdmin(baseConditionVO, keyword));
-
-// PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-// LambdaQueryWrapper<Admin> wrapper = Wrappers.lambdaQuery(Admin.class);
-// if (keyword != null) {
-// wrapper.like(Admin::getNickName, keyword)
-// .or(adminLambdaQueryWrapper -> {
-// adminLambdaQueryWrapper.like(Admin::getUsername, keyword);
-// });
-// }
-// List<Admin> list = adminService.list(wrapper);
-//
-// List<AdminDto> adminDtoList = new ArrayList<>();
-// for (Admin demo : list) {
-// AdminDto adminDto = new AdminDto();
-// BeanUtil.copyProperties(demo, adminDto);
-// AdminRoleRelation one = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class)
-// .eq(AdminRoleRelation::getAdminId, demo.getId()));
-//
-// if (one != null) {
-// adminDto.setRoleId(one.getRoleId());
-// }
-// adminDtoList.add(adminDto);
-//
-// }
-// return ResponseUtil.successPage(adminDtoList);
}
@Log("鍚庡彴鐢ㄦ埛娉ㄥ唽")
@@ -237,7 +230,6 @@
}
}
-// @PreAuthorize("@el.check('admin:edit')")
/**
* 淇敼绠＄悊鍛樹俊鎭�
@@ -295,16 +287,6 @@
}
}
-// @PutMapping("/updateStatus/{id}")
-// public ResponseVO<Object> updateStatus(@PathVariable Long id, @RequestParam(value = "status") Integer status) {
-// checkLevel(id);
-// Admin update = new Admin();
-// update.setId(id);
-// update.setStatus(status);
-// adminService.updateById(update);
-// return ResponseUtil.success(null);
-// }
-
@Log("鍚庡彴鐢ㄦ埛鍒犻櫎")
@PostMapping("/del/{adminId}")
public ResponseVO<Object> deleteAdmin(@PathVariable Long adminId) {
@@ -341,37 +323,21 @@
}
}
-// /**
-// * 缁欑鐞嗗憳鍒嗛厤瑙掕壊
-// *
-// * @return
-// */
-// @PostMapping("/updateAdminRole")
-// @PreAuthorize("@el.check('admin:edit')")
-// public ResponseVO<Object> updateAdminRole(@RequestParam("adminId") Long adminId,
-// @RequestParam("roleIds") List<Long> roleIds) {
-// checkLevel(adminId);
-// adminsRolesService.updateAdminRole(adminId, roleIds);
-// return ResponseUtil.success("");
-// }
+ /**
+ * 鑾峰彇鐢ㄦ埛鏉冮檺
+ *
+ * @return
+ */
+ @GetMapping("/getUserPermissionList")
+ public ResponseVO<Object> getUserPermissionList() {
+ List<MenuNode> userPermissionList;
+ if (SecurityUtils.getClientId() == null) {
+ userPermissionList = adminService.getUserPermissionList();
+ } else {
+ userPermissionList = clientService.getUserPermissionList();
+ }
-// /**
-// * 缂栬緫鎴戠殑淇℃伅
-// *
-// * @param resources
-// * @return
-// */
-// @PutMapping("/editUserInfo")
-// public ResponseVO<Object> editUserInfo(@RequestBody AdminParam resources) {
-// Long userId = SecurityUtils.getUserId();
-// Admin admin = new Admin();
-// admin.setId(userId);
-// admin.setMobile(resources.getMobile());
-// admin.setEmail(resources.getEmail());
-// admin.setNickName(resources.getNickName());
-// adminService.updateById(admin);
-// return ResponseUtil.success(null);
-// }
-
+ return ResponseUtil.success(userPermissionList);
+ }
}
--
Gitblit v1.9.3