chore: 优化Auth认证服务

Author: tangtanglove

engine.go

@@ -22,7 +22,7 @@ const (
 	AppName = "QuarkGo"
 
 	// 版本号
-	Version = "3.8.11"
+	Version = "3.8.12"
 
 	// 包名
 	PkgName = "github.com/quarkcloudio/quark-go/v3"

service/attachment.go

@@ -35,7 +35,7 @@ func (p *AttachmentService) GetListBySearch(adminId interface{}, attachmentType
 	if name != "" {
 		query.Where("name LIKE %?%", name)
 	}
-	if createtime != nil && len(createtime) == 2 {
+	if len(createtime) == 2 {
 		query.Where("created_at BETWEEN ? AND ?", createtime[0], createtime[1])
 	}
 

service/auth.go

@@ -42,31 +42,31 @@ func (p *AuthService) MakeToken(user model.User, guardName string, expireSecond
 	return p.ctx.JwtToken(userClaims)
 }
 
-// 管理员用户名、密码登录
-func (p *AuthService) AdminLogin(username string, password string) (token string, err error) {
+// 用户名、密码登录
+func (p *AuthService) Login(username string, password string, guardName string) (token string, err error) {
 	user, err := NewUserService().GetInfoByUsername(username)
 	if err != nil {
 		return
 	}
 	if !hash.Check(user.Password, password) {
 		return "", errors.New("the username or password is incorrect")
 	}
-	token, err = p.MakeToken(user, "admin", 24*60*60)
+	token, err = p.MakeToken(user, guardName, 24*60*60)
 	if err != nil {
 		return
 	}
 	err = NewUserService().UpdateLastLogin(user.Id, p.ctx.ClientIP(), datetime.Now())
 	return
 }
 
-// 获取登录管理员信息
-func (p *AuthService) GetAdmin() (user model.User, err error) {
+// 获取登录信息
+func (p *AuthService) GetInfo(guardName string) (user model.User, err error) {
 	userClaims := dto.UserClaims{}
 	err = p.ctx.JwtAuthUser(&userClaims)
 	if err != nil {
 		return user, err
 	}
-	if userClaims.GuardName != "admin" {
+	if userClaims.GuardName != guardName {
 		return user, errors.New("401 unauthozied")
 	}
 	userInfo, err := NewUserService().GetInfoById(userClaims.Id)
@@ -76,45 +76,46 @@ func (p *AuthService) GetAdmin() (user model.User, err error) {
 	return userInfo, err
 }
 
+// 获取登录ID
+func (p *AuthService) GetId(guardName string) (id int, err error) {
+	user, err := p.GetInfo(guardName)
+	return user.Id, err
+}
+
+// 管理员用户名、密码登录
+func (p *AuthService) AdminLogin(username string, password string) (token string, err error) {
+	token, err = p.Login(username, password, "admin")
+	if err != nil {
+		return
+	}
+	return
+}
+
+// 获取登录管理员信息
+func (p *AuthService) GetAdmin() (user model.User, err error) {
+	return p.GetInfo("admin")
+}
+
 // 获取登录管理员ID
 func (p *AuthService) GetAdminId() (userId int, err error) {
-	admin, err := p.GetAdmin()
-	return admin.Id, err
+	return p.GetId("admin")
 }
 
 // 普通用户用户名、密码登录
 func (p *AuthService) UserLogin(username string, password string) (token string, err error) {
-	user, err := NewUserService().GetInfoByUsername(username)
+	token, err = p.Login(username, password, "user")
 	if err != nil {
 		return
 	}
-	if !hash.Check(user.Password, password) {
-		return "", errors.New("the username or password is incorrect")
-	}
-	token, err = p.MakeToken(user, "user", 24*60*60)
-	if err != nil {
-		return
-	}
-	err = NewUserService().UpdateLastLogin(user.Id, p.ctx.ClientIP(), datetime.Now())
 	return
 }
 
 // 获取登录用户信息
 func (p *AuthService) GetUser() (user model.User, err error) {
-	userClaims := dto.UserClaims{}
-	err = p.ctx.JwtAuthUser(&userClaims)
-	if err != nil {
-		return user, err
-	}
-	userInfo, err := NewUserService().GetInfoById(userClaims.Id)
-	if userInfo.Status == 0 {
-		return user, errors.New("the user has been disabled")
-	}
-	return userInfo, err
+	return p.GetInfo("user")
 }
 
 // 获取登录用户ID
 func (p *AuthService) GetUid() (userId int, err error) {
-	user, err := p.GetUser()
-	return user.Id, err
+	return p.GetId("user")
 }