From 72ce25c9c0a03c9279248dc473dbe3497b2d97dc Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 14:54:09 +0800
Subject: [PATCH] fix

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AdminController.java |   46 +++++++++++++++++++++++++++++++++++++---------
 1 files changed, 37 insertions(+), 9 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 1c9f660..d5cbb74 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.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.enums.AdminStatusStatus;
@@ -12,20 +13,17 @@
 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;
 import com.sandu.common.security.token.TokenProvider;
 import com.sandu.common.util.IpUtil;
 import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.AdminLoginParam;
-import com.sandu.ximon.admin.param.AdminParam;
-import com.sandu.ximon.admin.param.PwdParam;
-import com.sandu.ximon.admin.param.ReceiveParam;
+import com.sandu.ximon.admin.param.*;
 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.RedisUtils;
 import com.sandu.ximon.dao.bo.MenuNode;
 import com.sandu.ximon.dao.domain.*;
 import com.sandu.ximon.dao.enums.AdministratorEnums;
@@ -38,8 +36,12 @@
 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.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -67,11 +69,19 @@
     @Log("鍚庡彴鐢ㄦ埛鐧诲綍")
     @AnonymousAccess
     @PostMapping(value = "/login")
-    public ResponseVO<Object> login(@RequestBody AdminLoginParam loginParam) {
+    public ResponseVO<Object> login(HttpServletRequest request, @RequestBody AdminLoginParam loginParam) {
         Admin admin = adminService.getOne(Wrappers.lambdaQuery(Admin.class).eq(Admin::getUsername, loginParam.getUsername()).last("limit 1"));
         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());
+        }
+        RedisUtils.getBean().delete(loginParam.getKey());
         if (!passwordEncoder.matches(loginParam.getPassword(), admin.getPassword())) {
             return ResponseUtil.error(ResponseStatusEnums.BAD_CREDENTIALS.getCode(), ResponseStatusEnums.BAD_CREDENTIALS.getMessage());
         }
@@ -243,8 +253,8 @@
     /**
      * 淇敼鎴戠殑瀵嗙爜
      */
-    @Log("鍚庡彴鐢ㄦ埛淇敼瀵嗙爜")
-    @PutMapping("/updateMyPassword")
+    @Log("淇敼褰撳墠鐢ㄦ埛瀵嗙爜")
+    @PostMapping("/updateMyPassword")
     public ResponseVO<Object> updateMyPassword(@Validated @RequestBody PwdParam param) {
         boolean result;
         if (SecurityUtils.getClientId() == null) {
@@ -253,6 +263,24 @@
             result = clientService.resetPassword(param);
         }
 
+        if (result) {
+            return ResponseUtil.success("淇敼鎴愬姛");
+        } else {
+            return ResponseUtil.fail("淇敼澶辫触");
+        }
+    }
+
+    /**
+     * 淇敼绠＄悊鍛樼殑瀵嗙爜
+     */
+    @Log("淇敼绠＄悊鍛樼殑瀵嗙爜")
+    @PostMapping("/updateAdminPassword")
+    public ResponseVO<Object> updateAdminPassword(@Validated @RequestBody UserPwsParm param) {
+        if (!SecurityUtils.getUserDetails().getAdministratorType().equals(AdministratorEnums.ADMIN.getCode())) {
+            throw new BusinessException("闈炶秴绾х鐞嗗憳鏃犳硶淇敼瀵嗙爜锛�");
+        }
+
+        boolean result = adminService.updateAdminPassword(param);
 
         if (result) {
             return ResponseUtil.success("淇敼鎴愬姛");

--
Gitblit v1.9.3