修复若干问题 (#229)

* 优化图标和LOGO

* 修改登录页面动画的速度为3

* 增加对websocket的异常处理

* 修复了用户组和用户名唯一判断错误的问题

* 提示版本号
This commit is contained in:
dushixiang
2022-03-05 16:19:32 +08:00
committed by GitHub
parent 60b9380fe2
commit 11daa8bd4e
12 changed files with 85 additions and 32 deletions

View File

@ -209,7 +209,11 @@ func (service userService) ReloadToken() error {
func (service userService) CreateUser(user model.User) (err error) {
return env.GetDB().Transaction(func(tx *gorm.DB) error {
c := service.Context(tx)
if repository.UserRepository.ExistByUsername(c, user.Username) {
exist, err := repository.UserRepository.ExistByUsername(c, user.Username)
if err != nil {
return err
}
if exist {
return fmt.Errorf("username %s is already used", user.Username)
}
password := user.Password
@ -307,3 +311,29 @@ func (service userService) SaveLoginLog(clientIP, clientUserAgent string, userna
func (service userService) DeleteALlLdapUser(ctx context.Context) error {
return repository.UserRepository.DeleteBySource(ctx, constant.SourceLdap)
}
func (service userService) UpdateUser(id string, user model.User) error {
return env.GetDB().Transaction(func(tx *gorm.DB) error {
ctx := service.Context(tx)
dbUser, err := repository.UserRepository.FindById(ctx, id)
if err != nil {
return err
}
if dbUser.Username != user.Username {
// 修改了登录账号
exist, err := repository.UserRepository.ExistByUsername(ctx, user.Username)
if err != nil {
return err
}
if exist {
return fmt.Errorf("username %s is already used", user.Username)
}
}
return repository.UserRepository.Update(ctx, &user)
})
}