From 15d6d20c8f5e36f79b420cf6ebdcbbf41cb2cdc8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 21 一月 2025 18:21:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 d60dbe4..d308e59 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
@@ -19,6 +19,7 @@
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.domain.dto.MgtCompanyDTO;
import com.ruoyi.company.api.model.RegisterUser;
import com.ruoyi.system.api.model.AppUser;
import com.ruoyi.system.api.model.LoginUser;
@@ -26,7 +27,6 @@
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;
@@ -69,7 +69,7 @@
}
@Operation(summary = "管理端-修改密码")
- @GetMapping("/modify-pwd")
+ @PostMapping("/modify-pwd")
public R<?> modifyPwd(@Valid @RequestBody MgtPasswordDTO dto) {
try {
sysLoginService.modifyPwd(dto);
@@ -110,7 +110,7 @@
@PostMapping("companyRegister")
@Operation(summary = "用户注册接口",description = "用户注册接口")
- public R<?> companyRegister(@RequestBody RegisterUser registerUser)
+ public R<?> companyRegister(@RequestBody MgtCompanyDTO registerUser)
{
// 用户注册
sysLoginService.companyRegister(registerUser);
@@ -157,6 +157,7 @@
appUser.setAccountName(user.getAccountName());
appUser.setPhone(user.getPhone());
appUser.setLoginTime(System.currentTimeMillis());
+ appUser.setExpireTime(appUser.getLoginTime() + CacheConstants.EXPIRATION * 60 * 1000L);
appUser.setToken(token);
// 根据uuid将loginUser缓存
--
Gitblit v1.7.1