更新密码找回uniapp
This commit is contained in:
1 parent
7f9a66da0f
commit
3fdda89833
1304 files changed
+3503
-26132
No files matched your search
@@ -13,7 +13,6 @@ import (
|
||||
authsvc "server/services/auth"
|
||||
)
|
||||
|
||||
// resetCodeItem 存储找回密码的验证码
|
||||
type resetCodeItem struct {
|
||||
Code string
|
||||
Channel string
|
||||
@@ -22,7 +21,6 @@ type resetCodeItem struct {
|
||||
|
||||
var resetCodeStore sync.Map
|
||||
|
||||
// resetCodeKey 生成密码重置验证码的存储key
|
||||
func resetCodeKey(tenantName, account, phone, channel string) string {
|
||||
key := strings.ToLower(strings.TrimSpace(tenantName)) + "|" +
|
||||
strings.ToLower(strings.TrimSpace(account)) + "|" +
|
||||
@@ -31,8 +29,6 @@ func resetCodeKey(tenantName, account, phone, channel string) string {
|
||||
return key
|
||||
}
|
||||
|
||||
// VerifyTenantAccount 第一步:验证租户和账号是否存在
|
||||
// 返回该账号关联的手机号和邮箱(用于第二步选择验证方式)
|
||||
func VerifyTenantAccount(tenantName, account string) (phone, email string, err error) {
|
||||
tenantName = strings.TrimSpace(tenantName)
|
||||
account = strings.TrimSpace(account)
|
||||
@@ -41,7 +37,6 @@ func VerifyTenantAccount(tenantName, account string) (phone, email string, err e
|
||||
return "", "", errors.New("租户名称和账号不能为空")
|
||||
}
|
||||
|
||||
// 验证租户是否存在
|
||||
var tenant models.SystemTenant
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenant)).
|
||||
Filter("tenant_name", tenantName).
|
||||
@@ -52,7 +47,6 @@ func VerifyTenantAccount(tenantName, account string) (phone, email string, err e
|
||||
return "", "", errors.New("租户已停用")
|
||||
}
|
||||
|
||||
// 验证该租户下的账号是否存在
|
||||
var tenantUser models.SystemTenantUser
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("tid", tenant.ID).
|
||||
@@ -64,7 +58,6 @@ func VerifyTenantAccount(tenantName, account string) (phone, email string, err e
|
||||
return "", "", errors.New("账号已禁用")
|
||||
}
|
||||
|
||||
// 返回该账号的手机号和邮箱
|
||||
phoneStr := ""
|
||||
if tenantUser.Phone != nil {
|
||||
phoneStr = strings.TrimSpace(*tenantUser.Phone)
|
||||
@@ -81,7 +74,6 @@ func VerifyTenantAccount(tenantName, account string) (phone, email string, err e
|
||||
return phoneStr, emailStr, nil
|
||||
}
|
||||
|
||||
// SendResetCode 第二步:验证手机号并发送验证码
|
||||
func SendResetCode(tenantName, account, phone, channel string) error {
|
||||
tenantName = strings.TrimSpace(tenantName)
|
||||
account = strings.TrimSpace(account)
|
||||
@@ -95,7 +87,6 @@ func SendResetCode(tenantName, account, phone, channel string) error {
|
||||
return errors.New("仅支持短信或邮箱验证码")
|
||||
}
|
||||
|
||||
// 验证租户是否存在
|
||||
var tenant models.SystemTenant
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenant)).
|
||||
Filter("tenant_name", tenantName).
|
||||
@@ -103,7 +94,6 @@ func SendResetCode(tenantName, account, phone, channel string) error {
|
||||
return errors.New("租户不存在")
|
||||
}
|
||||
|
||||
// 验证该租户下的账号和手机号是否匹配
|
||||
var tenantUser models.SystemTenantUser
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("tid", tenant.ID).
|
||||
@@ -115,7 +105,6 @@ func SendResetCode(tenantName, account, phone, channel string) error {
|
||||
return errors.New("账号已禁用")
|
||||
}
|
||||
|
||||
// 根据验证渠道验证用户信息
|
||||
if channel == "sms" {
|
||||
if tenantUser.Phone == nil || strings.TrimSpace(*tenantUser.Phone) != phone {
|
||||
return errors.New("手机号不匹配,请确认您输入的手机号正确")
|
||||
@@ -126,11 +115,9 @@ func SendResetCode(tenantName, account, phone, channel string) error {
|
||||
}
|
||||
}
|
||||
|
||||
// 生成验证码
|
||||
rand.Seed(time.Now().UnixNano())
|
||||
code := fmt.Sprintf("%06d", rand.Intn(1000000))
|
||||
|
||||
// 发送验证码
|
||||
if channel == "sms" {
|
||||
content := "密码重置验证码:" + code
|
||||
if err := enqueueSMSTaskForPasswordReset(tenant.ID, phone, content, code); err != nil {
|
||||
@@ -139,7 +126,6 @@ func SendResetCode(tenantName, account, phone, channel string) error {
|
||||
}
|
||||
// TODO: 实现邮箱验证码发送逻辑
|
||||
|
||||
// 存储验证码(5分钟有效期)
|
||||
resetCodeStore.Store(resetCodeKey(tenantName, account, phone, channel), resetCodeItem{
|
||||
Code: code,
|
||||
Channel: channel,
|
||||
@@ -149,7 +135,6 @@ func SendResetCode(tenantName, account, phone, channel string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// VerifyResetCode 验证重置密码的验证码
|
||||
func VerifyResetCode(tenantName, account, phone, channel, code string) error {
|
||||
tenantName = strings.TrimSpace(tenantName)
|
||||
account = strings.TrimSpace(account)
|
||||
@@ -181,12 +166,10 @@ func VerifyResetCode(tenantName, account, phone, channel, code string) error {
|
||||
return errors.New("验证码错误")
|
||||
}
|
||||
|
||||
// 验证通过后删除验证码
|
||||
resetCodeStore.Delete(key)
|
||||
return nil
|
||||
}
|
||||
|
||||
// ResetPassword 第三步:重置密码
|
||||
func ResetPassword(tenantName, account, phone, smsCode, newPassword, confirmPassword string) error {
|
||||
tenantName = strings.TrimSpace(tenantName)
|
||||
account = strings.TrimSpace(account)
|
||||
@@ -208,12 +191,10 @@ func ResetPassword(tenantName, account, phone, smsCode, newPassword, confirmPass
|
||||
return errors.New("密码长度不能少于6个字符")
|
||||
}
|
||||
|
||||
// 验证验证码(验证码验证后会被删除)
|
||||
if err := VerifyResetCode(tenantName, account, phone, "sms", smsCode); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 验证租户
|
||||
var tenant models.SystemTenant
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenant)).
|
||||
Filter("tenant_name", tenantName).
|
||||
@@ -221,7 +202,6 @@ func ResetPassword(tenantName, account, phone, smsCode, newPassword, confirmPass
|
||||
return errors.New("租户不存在")
|
||||
}
|
||||
|
||||
// 查询用户
|
||||
var tenantUser models.SystemTenantUser
|
||||
if err := models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("tid", tenant.ID).
|
||||
@@ -230,18 +210,15 @@ func ResetPassword(tenantName, account, phone, smsCode, newPassword, confirmPass
|
||||
return errors.New("账号不存在")
|
||||
}
|
||||
|
||||
// 验证手机号
|
||||
if tenantUser.Phone == nil || strings.TrimSpace(*tenantUser.Phone) != phone {
|
||||
return errors.New("手机号不匹配")
|
||||
}
|
||||
|
||||
// 哈希新密码
|
||||
hashedPassword, err := passwordutil.Hash(newPassword)
|
||||
if err != nil {
|
||||
return errors.New("密码处理失败")
|
||||
}
|
||||
|
||||
// 更新密码
|
||||
_, err = models.Orm.QueryTable(new(models.SystemTenantUser)).
|
||||
Filter("id", tenantUser.ID).
|
||||
Update(map[string]interface{}{
|
||||
@@ -251,7 +228,6 @@ func ResetPassword(tenantName, account, phone, smsCode, newPassword, confirmPass
|
||||
return errors.New("密码更新失败")
|
||||
}
|
||||
|
||||
// 双写:同步新密码到统一认证中心(失败不影响找回密码主流程)
|
||||
_ = authsvc.SyncTenantUser(authsvc.SyncTenantUserInput{
|
||||
Tid: tenantUser.Tid,
|
||||
Account: trimStrPtr(tenantUser.Account),
|
||||
@@ -268,7 +244,6 @@ func ResetPassword(tenantName, account, phone, smsCode, newPassword, confirmPass
|
||||
return nil
|
||||
}
|
||||
|
||||
// trimStrPtr 取指针字符串并去空格;nil 时返回空串
|
||||
func trimStrPtr(p *string) string {
|
||||
if p == nil {
|
||||
return ""
|
||||
@@ -276,8 +251,6 @@ func trimStrPtr(p *string) string {
|
||||
return strings.TrimSpace(*p)
|
||||
}
|
||||
|
||||
// enqueueSMSTaskForPasswordReset 发送密码重置短信任务
|
||||
func enqueueSMSTaskForPasswordReset(tid uint64, phone, content, code string) error {
|
||||
// 重用已有的短信发送逻辑
|
||||
return enqueueSMSTaskForLogin(tid, phone, content, code)
|
||||
}
|
||||
Reference in new issue
Block a user