更新密码修改

services/platform_auth.go

@@ -51,8 +51,41 @@ func toPlatformLoginUser(user *models.AdminUser) *PlatformLoginUser {
 	}
 }
 
-// PlatformLogin 登录业务：先校验租户，再校验租户下用户
-func PlatformLogin(tenantName, account, password string) (string, *PlatformLoginUser, error) {
+// PlatformAdminLogin 平台端登录：仅校验 yz_system_admin_user（不需要租户）
+func PlatformAdminLogin(account, password string) (string, *PlatformLoginUser, error) {
+	account = strings.TrimSpace(account)
+	password = strings.TrimSpace(password)
+	if account == "" || password == "" {
+		return "", nil, errors.New("用户名或密码不能为空")
+	}
+
+	var user models.AdminUser
+	err := models.Orm.QueryTable(new(models.AdminUser)).
+		Filter("account", account).
+		One(&user)
+	if err != nil {
+		return "", nil, errors.New("用户名或密码错误")
+	}
+	if user.Status == 0 {
+		return "", nil, errors.New("账号已禁用")
+	}
+	if !passwordutil.Verify(user.Password, password) {
+		return "", nil, errors.New("用户名或密码错误")
+	}
+
+	const tenantID = 0
+	const userType = "platform"
+	token, err := jwtutil.GenerateToken(int(user.ID), user.Account, tenantID, userType)
+	if err != nil {
+		return "", nil, err
+	}
+
+	loginUser := toPlatformLoginUser(&user)
+	return token, loginUser, nil
+}
+
+// BackendLogin backend 登录：先校验租户，再校验租户下用户
+func BackendLogin(tenantName, account, password string) (string, *PlatformLoginUser, error) {
 	tenantName = strings.TrimSpace(tenantName)
 	account = strings.TrimSpace(account)
 	password = strings.TrimSpace(password)
@@ -88,27 +121,28 @@ func PlatformLogin(tenantName, account, password string) (string, *PlatformLogin
 		return "", nil, errors.New("用户名或密码错误")
 	}
 
-	// 3) 读取用户主档用于返回资料与角色信息
-	var user models.AdminUser
-	err = models.Orm.QueryTable(new(models.AdminUser)).
-		Filter("id", tenantUser.Uid).
-		One(&user)
-	if err != nil {
-		return "", nil, errors.New("用户不存在")
-	}
-	if user.Status == 0 {
-		return "", nil, errors.New("账号已禁用")
-	}
-
 	tenantID := int(tenant.ID)
-	const userType = "platform"
-	token, err := jwtutil.GenerateToken(int(user.ID), user.Account, tenantID, userType)
+	const userType = "backend"
+	token, err := jwtutil.GenerateToken(int(tenantUser.Uid), account, tenantID, userType)
 	if err != nil {
 		return "", nil, err
 	}
 
-	loginUser := toPlatformLoginUser(&user)
-	loginUser.Tid = tenant.ID
+	loginUser := &PlatformLoginUser{
+		ID:       tenantUser.Uid,
+		Account:  account,
+		Name:     "",
+		Tid:      tenant.ID,
+		Rid:      0,
+		Avatar:   "",
+		RoleName: "",
+	}
+	if tenantUser.Account != nil && strings.TrimSpace(*tenantUser.Account) != "" {
+		loginUser.Account = strings.TrimSpace(*tenantUser.Account)
+	}
+	if tenantUser.Name != nil {
+		loginUser.Name = strings.TrimSpace(*tenantUser.Name)
+	}
 	return token, loginUser, nil
 }