✨ github oauth2 login /gitee oauth2 login

service/user_role_service/user_role_service.go

@@ -8,7 +8,7 @@ import (
 // GetUserRoleIdsByUserId 通过用户ID获取用户角色ID列表
 func (UserRoleService) GetUserRoleIdsByUserId(userId int64) ([]*int64, error) {
 	var roleIds []*int64
-	if err := global.DB.Table("sca_auth_user_role").Where("user_id = ?", userId).Pluck("role_id", &roleIds).Error; err != nil {
+	if err := global.DB.Table("sca_auth_user_role").Where("user_id = ? and deleted = 0 ", userId).Pluck("role_id", &roleIds).Error; err != nil {
 		return nil, err
 	}
 	return roleIds, nil

service/user_service/user_service.go

@@ -14,10 +14,13 @@ func (UserService) GetUserList() []*model.ScaAuthUser {
 }
 
 // QueryUserByUsername 根据用户名查询用户
-func (UserService) QueryUserByUsername(username string) model.ScaAuthUser {
+func (UserService) QueryUserByUsername(username string) (model.ScaAuthUser, error) {
 	authUser := model.ScaAuthUser{}
-	global.DB.Where("username = ? and deleted = 0", username).First(&authUser)
-	return authUser
+	err := global.DB.Where("username = ? and deleted = 0", username).First(&authUser).Error
+	if err != nil {
+		return model.ScaAuthUser{}, err
+	}
+	return authUser, nil
 }
 
 // QueryUserByUuid 根据用户uuid查询用户

service/user_social_service/user_social_service.go

@@ -29,3 +29,16 @@ func (UserSocialService) QueryUserSocialByOpenID(openID string) (model.ScaAuthUs
 	}
 	return user, nil
 }
+
+// QueryUserSocialByUUID 根据uuid查询用户信息
+func (UserSocialService) QueryUserSocialByUUID(openID string) (model.ScaAuthUserSocial, error) {
+	var user model.ScaAuthUserSocial
+	result := global.DB.Where("uuid = ? and deleted = 0", openID).First(&user)
+	if result.Error != nil {
+		if errors.Is(result.Error, gorm.ErrRecordNotFound) {
+			return model.ScaAuthUserSocial{}, result.Error
+		}
+		return model.ScaAuthUserSocial{}, result.Error
+	}
+	return user, nil
+}