From 35924055a41e1505aceacef503fd3cfa7a064a36 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 26 八月 2025 20:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
index 07d6867..5fb90a6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
@@ -118,7 +118,7 @@
public boolean endOfLife(String username) {
- SysUser sysUser = userService.selectUserByUserName(username);
+ SysUser sysUser = userService.selectUserByNickName(username);
if (sysUser.getPaid() != null && sysUser.getPaid().equals(0) && !"4".equals(sysUser.getStatus())) {
Date startTime = sysUser.getCreateTime();
@@ -130,6 +130,7 @@
if (daysPassed > 7) {
sysUser.setStatus("4");
userService.updateUserStatus(sysUser);
+
}
}
return true;
@@ -148,14 +149,14 @@
*/
public String login(String nickName, String password, String code, String uuid)
{
- System.out.println("[[[[[[[[[[[[[[");
- endOfLife(nickName);
// 楠岃瘉鐮佹牎楠�
validateCaptcha(nickName, code, uuid);
// 鐧诲綍鍓嶇疆鏍￠獙
loginPreCheck(nickName, password);
// 鐢ㄦ埛楠岃瘉
Authentication authentication = null;
+
+
try
{
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(nickName, password);
@@ -185,6 +186,9 @@
recordLoginInfo(loginUser.getUserId());
+ endOfLife(nickName);
+
+
SysUser sysUser = userService.selectUserByNickName(nickName);
//.selectUserByUserName(username);
--
Gitblit v1.9.1