From e02a3eee8217ae6bff5890d1ece6ee1f342e03dd Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 14:36:21 +0800
Subject: [PATCH] 1.管理端:修改密码 2.阿里云oss

---
 ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java |   55 +++++++++++++++++++++++++++++++++----------------------
 1 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index f47c98c..d60dbe4 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -1,51 +1,49 @@
 package com.ruoyi.auth.controller;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
+import com.ruoyi.auth.form.LoginBody;
+import com.ruoyi.auth.form.MgtPasswordDTO;
+import com.ruoyi.auth.service.SysLoginService;
 import com.ruoyi.auth.utils.SmsUtils;
 import com.ruoyi.common.core.constant.CacheConstants;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.SecurityConstants;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.exception.CaptchaException;
 import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.JwtUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.common.security.auth.AuthUtil;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.company.api.RemoteCompanyUserService;
 import com.ruoyi.company.api.domain.User;
 import com.ruoyi.company.api.model.RegisterUser;
 import com.ruoyi.system.api.model.AppUser;
+import com.ruoyi.system.api.model.LoginUser;
 import io.swagger.v3.oas.annotations.Operation;
-import org.jetbrains.annotations.NotNull;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.auth.form.LoginBody;
-import com.ruoyi.auth.form.RegisterBody;
-import com.ruoyi.auth.service.SysLoginService;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.JwtUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.security.auth.AuthUtil;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.model.LoginUser;
 
-import java.time.LocalDateTime;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-
-import static com.alibaba.nacos.api.common.Constants.ACCESS_TOKEN;
-
 /**
  * token 控制
  * 
  * @author ruoyi
  */
 @RestController
+@Tag(name = "用户登录", description = "用户登录")
 public class TokenController
 {
     @Autowired
@@ -60,7 +58,7 @@
 
     @Resource
     private RemoteCompanyUserService remoteCompanyUserService;
-
+    @Operation(summary = "管理端-登录")
     @PostMapping("login")
     public R<?> login(@RequestBody LoginBody form)
     {
@@ -70,6 +68,16 @@
         return R.ok(tokenService.createToken(userInfo));
     }
 
+    @Operation(summary = "管理端-修改密码")
+    @GetMapping("/modify-pwd")
+    public R<?> modifyPwd(@Valid @RequestBody MgtPasswordDTO dto) {
+        try {
+            sysLoginService.modifyPwd(dto);
+            return R.ok();
+        } catch (ServiceException e) {
+            return R.fail(e.getMessage());
+        }
+    }
     @DeleteMapping("logout")
     public R<?> logout(HttpServletRequest request)
     {
@@ -131,6 +139,7 @@
     }
 
     @PostMapping("companyLogin")
+    @Operation(summary = "用户登录接口",description = "账号/手机号登录")
     public R<Map<String, Object>> companyLogin(@RequestBody RegisterUser registerUser)
     {
         // 用户登录
@@ -145,9 +154,9 @@
         String token = IdUtils.fastUUID();
         AppUser appUser = new AppUser();
         appUser.setUserId(user.getUserId());
-        appUser.setAccountName(appUser.getAccountName());
-        appUser.setPhone(appUser.getPhone());
-        appUser.setLoginTime(LocalDateTime.now());
+        appUser.setAccountName(user.getAccountName());
+        appUser.setPhone(user.getPhone());
+        appUser.setLoginTime(System.currentTimeMillis());
         appUser.setToken(token);
 
         // 根据uuid将loginUser缓存
@@ -172,6 +181,7 @@
      * @return
      */
     @PostMapping("smsLogin")
+    @Operation(summary = "验证码登录",description = "验证码登录")
     public R<Map<String, Object>> smsLogin(@RequestBody RegisterUser registerUser){
         String smsCode = registerUser.getSmsCode();
         if (!"999999".equals(smsCode)) {
@@ -208,6 +218,7 @@
      * 重置密码
      */
     @PostMapping("resetPwd")
+    @Operation(summary = "重置密码",description = "重置密码")
     public R<?> resetPwd(@RequestBody RegisterUser registerUser)
     {
         sysLoginService.resetPwd(registerUser);

--
Gitblit v1.7.1