From b8040aa044842c18b1d52379fc40e26fa4c28bf3 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 27 四月 2022 16:03:07 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/ClientController.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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 10da4a1..0b8b177 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.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
@@ -22,6 +23,7 @@
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.RedisUtils;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -32,6 +34,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@@ -79,17 +82,30 @@
@Log("淇敼鏅�氱敤鎴风殑瀵嗙爜")
@PostMapping("/updateClientPassword")
public ResponseVO<Object> updateClientPassword(@Validated @RequestBody UserPwsParm param) {
- if (!SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
- throw new BusinessException("闈炶秴绾х鐞嗗憳鏃犳硶淇敼瀵嗙爜锛�");
- }
+ boolean result;
- boolean result = clientService.updateAdminPassword(param);
+ //瓒呯鐩存帴淇敼
+ if (SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+ result = clientService.updateAdminPassword(param);
+ } else {
+ //褰撳墠鐧诲綍璐﹀彿ID
+ Long userId = SecurityUtils.getUserId();
+ //瑕佷慨瑕佸瘑鐮佺殑鐢ㄦ埛鐨勪笂绾D
+ Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, param.getUserid()));
+ //涓哄叾涓嬪睘鎵嶈兘淇敼
+ if (client != null && userId.equals(client.getSuperiorId())) {
+ result = clientService.updateAdminPassword(param);
+ } else {
+ throw new BusinessException("闈炶秴绾х鐞嗗憳鎴栬鐢ㄦ埛涓嶆槸鎮ㄤ笅灞炵敤鎴凤紝鏃犳硶淇敼瀵嗙爜锛�");
+ }
+ }
if (result) {
return ResponseUtil.success("淇敼鎴愬姛");
} else {
return ResponseUtil.fail("淇敼澶辫触");
}
+
}
@PostMapping("/delete/{id}")
@@ -140,11 +156,17 @@
@AnonymousAccess
@PostMapping(value = "/login")
- public ResponseVO<Object> longin(@RequestBody @Validated AdminLoginParam loginParam) {
+ public ResponseVO<Object> longin(HttpServletRequest request, @RequestBody @Validated AdminLoginParam loginParam) {
Client client = clientService.getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getClientName, loginParam.getUsername()).last("limit 1"));
if (client == null) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
+ String s = RedisUtils.getBean().get(loginParam.getKey());
+ System.out.println(s+"===========================");
+ if (!loginParam.getVlue().equals(s)) {
+ return ResponseUtil.error(ResponseStatusEnums.BAD_AUTHENTICATION.getCode(), ResponseStatusEnums.BAD_AUTHENTICATION.getMessage());
+ }
+ RedisUtils.getBean().delete(loginParam.getKey());
if (!passwordEncoder.matches(loginParam.getPassword(), client.getPassword())) {
return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
}
--
Gitblit v1.9.3