From 7c92a9851eb6bf90e3bb9e2a5059b83f12564b85 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 四月 2022 19:27:21 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 296b992..1c9f660 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
@@ -7,9 +7,12 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.enums.AdminStatusStatus;
import com.sandu.common.enums.ResponseStatusEnums;
+import com.sandu.common.enums.RoleLevelStatus;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.log.Log;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.redis.RedisService;
+import com.sandu.common.redis.UserModel;
import com.sandu.common.security.LoginUserInfo;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.security.config.SecurityProperties;
@@ -59,6 +62,7 @@
private final TokenProvider tokenProvider;
private final AdminRoleRelationService adminRoleRelationService;
private PermissionConfig permissionConfig;
+ private final RedisService redisService;
@Log("鍚庡彴鐢ㄦ埛鐧诲綍")
@AnonymousAccess
@@ -83,7 +87,16 @@
loginUserInfo.setAccount(admin.getUsername());
loginUserInfo.setStatus(admin.getStatus());
loginUserInfo.setIp(IpUtil.getRealIp());
- loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
+
+ //纭畾鐢ㄦ埛瑙掕壊鏉冮檺
+ AdminRoleRelation adminRoleRelation = adminRoleRelationService.getOne(Wrappers.lambdaQuery(AdminRoleRelation.class).eq(AdminRoleRelation::getAdminId, loginUserInfo.getUserId()));
+ Role role = roleService.getOne(Wrappers.lambdaQuery(Role.class).eq(Role::getId, adminRoleRelation.getRoleId()));
+ if (role != null && role.getLevel().equals(RoleLevelStatus.SUPER.getCode())) {
+ loginUserInfo.setAdministratorType(AdministratorEnums.ADMIN.getCode());
+ } else {
+ loginUserInfo.setAdministratorType(AdministratorEnums.CUSTOMER.getCode());
+ }
+
loginUserInfo.setPermission(grantedAuthorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
// 鐢熸垚浠ょ墝
@@ -106,6 +119,7 @@
// @Log("鍚庡彴鐢ㄦ埛淇℃伅")
@GetMapping(value = "/info")
public ResponseVO<Object> getUserInfo() {
+ System.out.println(SecurityUtils.getUserDetails().getAdministratorType() + " ---------");
Long userId = SecurityUtils.getUserId();
List<Role> roles;
MapBuilder<Object, Object> builder;
@@ -142,6 +156,17 @@
builder.put("menus", menuNodeList);
}
return ResponseUtil.success(builder.build());
+ }
+
+ @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 key = String.format("%d_%d", SecurityUtils.getUserDetails().getUserId(), SecurityUtils.getUserDetails().getAdministratorType());
+ redisService.set(key, null);
+ return ResponseUtil.success("閫�鍑虹櫥褰曟垚鍔�");
}
private MenuNode covertMenuNode(Menu menu, List<Menu> menuList) {
@@ -221,7 +246,14 @@
@Log("鍚庡彴鐢ㄦ埛淇敼瀵嗙爜")
@PutMapping("/updateMyPassword")
public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
- boolean result = adminService.updateMyPassword(param);
+ boolean result;
+ if (SecurityUtils.getClientId() == null) {
+ result = adminService.updateMyPassword(param);
+ } else {
+ result = clientService.resetPassword(param);
+ }
+
+
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
} else {
--
Gitblit v1.9.3