From 7fd2270570811c0d29f0d5d87d11bfc4612e0743 Mon Sep 17 00:00:00 2001
From: 905086 <k2049@qq.com>
Date: Sat, 07 Nov 2026 20:30:06 +0800
Subject: [PATCH] feat: 实现用户密码找回功能及相关配套功能

---
 server/handlers/auth.go |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/server/handlers/auth.go b/server/handlers/auth.go
index f6fe7c2..627acd1 100644
--- a/server/handlers/auth.go
+++ b/server/handlers/auth.go
@@ -112,7 +112,7 @@
 	}})
 }
 
-// ResetPassword 找回密码
+// ResetPassword 找回密码:提交重置申请(含期望的新密码),由管理员在后台同意后生效
 func ResetPassword(c *gin.Context) {
 	var req struct {
 		Phone     string `json:"phone"`
@@ -142,9 +142,14 @@
 		c.JSON(http.StatusOK, gin.H{"code": 1, "msg": "两次输入的密码不一致"})
 		return
 	}
-	hash, _ := bcrypt.GenerateFromPassword([]byte(req.Password), bcrypt.DefaultCost)
-	config.DB.Model(&user).Update("password", string(hash))
-	c.JSON(http.StatusOK, gin.H{"code": 0, "msg": "密码重置成功"})
+	// 已有待处理的申请则更新期望密码,不重复创建
+	var apply models.PasswordResetRequest
+	if err := config.DB.Where("phone = ? AND status = ?", req.Phone, 0).First(&apply).Error; err != nil {
+		config.DB.Create(&models.PasswordResetRequest{Phone: req.Phone, ProposedPwd: req.Password})
+	} else {
+		config.DB.Model(&apply).Update("proposed_pwd", req.Password)
+	}
+	c.JSON(http.StatusOK, gin.H{"code": 0, "msg": "找回密码申请已提交,请联系管理员重置密码!"})
 }
 
 // GetUserInfo 当前用户信息(含会员状态)
@@ -155,17 +160,24 @@
 		c.JSON(http.StatusOK, gin.H{"code": 1, "msg": "用户不存在"})
 		return
 	}
-	// 查询会员有效期(取最大的未过期时间)
+	// 查询会员有效期(永久卡 expired_at 为 NULL;冻结的密钥不计入会员;取最大的未过期时间)
 	var keys []models.MemberKey
-	config.DB.Where("user_id = ? AND expired_at > ?", userID, time.Now()).Find(&keys)
+	config.DB.Where("user_id = ? AND frozen = ? AND (expired_at IS NULL OR expired_at > ?)", userID, false, time.Now()).Find(&keys)
+	permanent := false
 	var expire *time.Time
 	for i := range keys {
+		if keys[i].ExpiredAt == nil {
+			permanent = true
+			continue
+		}
 		if expire == nil || keys[i].ExpiredAt.After(*expire) {
 			expire = keys[i].ExpiredAt
 		}
 	}
-	member := gin.H{"is_member": expire != nil}
-	if expire != nil {
+	member := gin.H{"is_member": permanent || expire != nil}
+	if permanent {
+		member["expire_at"] = "永久"
+	} else if expire != nil {
 		member["expire_at"] = expire.Format("2006-01-02 15:04:05")
 	}
 	c.JSON(http.StatusOK, gin.H{"code": 0, "data": gin.H{

--
Gitblit v1.10.0