修复若干问题 (#229)

* 优化图标和LOGO

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

* 增加对websocket的异常处理

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

* 提示版本号

server/api/user.go

@@ -62,9 +62,8 @@ func (userApi UserApi) UserUpdateEndpoint(c echo.Context) error {
 	if err := c.Bind(&item); err != nil {
 		return err
 	}
-	item.ID = id
 
-	if err := repository.UserRepository.Update(context.TODO(), &item); err != nil {
+	if err := service.UserService.UpdateUser(id, item); err != nil {
 		return err
 	}
 

server/constant/const.go

@@ -5,7 +5,7 @@ import (
 )
 
 const (
-	Version = "v1.2.4"
+	Version = "v1.2.5"
 	Banner  = `
 	_______                   __    ___________                  .__              .__
 	\      \   ____ ___  ____/  |_  \__    ___/__________  _____ |__| ____ _____  |  |

server/repository/user.go

@@ -78,14 +78,17 @@ func (r userRepository) FindByUsername(c context.Context, username string) (o mo
 	return
 }
 
-func (r userRepository) ExistByUsername(c context.Context, username string) (exist bool) {
-	count := int64(0)
-	err := r.GetDB(c).Table("users").Where("username = ?", username).Count(&count).Error
+func (r userRepository) ExistByUsername(c context.Context, username string) (exist bool, err error) {
+	user := model.User{}
+	var count uint64
+	err = r.GetDB(c).Table(user.TableName()).Select("count(*)").
+		Where("username = ?", username).
+		Find(&count).
+		Error
 	if err != nil {
-		return false
+		return false, err
 	}
-
-	return count > 0
+	return count > 0, nil
 }
 
 func (r userRepository) FindOnlineUsers(c context.Context) (o []model.User, err error) {

server/repository/user_group.go

@@ -57,6 +57,19 @@ func (r userGroupRepository) FindByName(c context.Context, name string) (o model
 	return
 }
 
+func (r userGroupRepository) ExistByName(ctx context.Context, name string) (exists bool, err error) {
+	userGroup := model.UserGroup{}
+	var count uint64
+	err = r.GetDB(ctx).Table(userGroup.TableName()).Select("count(*)").
+		Where("name = ?", name).
+		Find(&count).
+		Error
+	if err != nil {
+		return false, err
+	}
+	return count > 0, nil
+}
+
 func (r userGroupRepository) Create(c context.Context, o *model.UserGroup) (err error) {
 	return r.GetDB(c).Create(o).Error
 }

server/service/backup.go

@@ -133,7 +133,11 @@ func (service backupService) Import(backup *dto.Backup) error {
 		if len(backup.Users) > 0 {
 			for _, item := range backup.Users {
 				oldId := item.ID
-				if repository.UserRepository.ExistByUsername(c, item.Username) {
+				exist, err := repository.UserRepository.ExistByUsername(c, item.Username)
+				if err != nil {
+					return err
+				}
+				if exist {
 					delete(userIdMapping, oldId)
 					continue
 				}

server/service/user.go

@@ -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)
+	})
+
+}

server/service/user_group.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"errors"
 
 	"next-terminal/server/constant"
 	"next-terminal/server/env"
@@ -36,14 +35,13 @@ func (service userGroupService) DeleteById(userGroupId string) error {
 }
 
 func (service userGroupService) Create(name string, members []string) (model.UserGroup, error) {
-	var err error
-	_, err = repository.UserGroupRepository.FindByName(context.TODO(), name)
-	if err == nil {
-		return model.UserGroup{}, constant.ErrNameAlreadyUsed
+	exist, err := repository.UserGroupRepository.ExistByName(context.TODO(), name)
+	if err != nil {
+		return model.UserGroup{}, err
 	}
 
-	if !errors.Is(gorm.ErrRecordNotFound, err) {
-		return model.UserGroup{}, err
+	if exist {
+		return model.UserGroup{}, constant.ErrNameAlreadyUsed
 	}
 
 	userGroupId := utils.UUID()
@@ -76,15 +74,21 @@ func (service userGroupService) Create(name string, members []string) (model.Use
 }
 
 func (service userGroupService) Update(userGroupId string, name string, members []string) (err error) {
-	var userGroup model.UserGroup
-	userGroup, err = repository.UserGroupRepository.FindByName(context.TODO(), name)
-	if err == nil && userGroup.ID != userGroupId {
-		return constant.ErrNameAlreadyUsed
-	}
-
-	if errors.Is(gorm.ErrRecordNotFound, err) {
+	dbUserGroup, err := repository.UserGroupRepository.FindById(context.TODO(), userGroupId)
+	if err != nil {
 		return err
 	}
+	if dbUserGroup.Name != name {
+		// 修改了名称
+		exist, err := repository.UserGroupRepository.ExistByName(context.TODO(), name)
+		if err != nil {
+			return err
+		}
+
+		if exist {
+			return constant.ErrNameAlreadyUsed
+		}
+	}
 
 	return env.GetDB().Transaction(func(tx *gorm.DB) error {
 		c := context.WithValue(context.TODO(), constant.DB, tx)

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-terminal",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "private": true,
   "dependencies": {
     "@ant-design/charts": "^1.2.13",

web/src/components/Login.js

@@ -169,7 +169,7 @@ class LoginForm extends Component {
                                 enable: true,
                                 outMode: "bounce",
                                 random: false,
-                                speed: 6,
+                                speed: 3,
                                 straight: false,
                             },
                             number: {

web/src/components/access/Access.js

@@ -444,6 +444,7 @@ class Access extends Component {
         client.onstatechange = this.onClientStateChange;
 
         client.onerror = this.onError;
+        tunnel.onerror = this.onError;
 
         // Get display div from document
         const display = document.getElementById("display");

web/src/images/logo.svg

@@ -1,10 +1,9 @@
-<svg width="130" height="140" xmlns="http://www.w3.org/2000/svg">
+<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg">
     <g fill="none">
-        <path fill="#40a9ff" d="M 10 10 V 110 L 65 135 L 120 110 V 10 Z"/>
         <g fill="none">
-            <path fill="#40a9ff" d="M 10 10 V 110 L 65 135 L 120 110 V 10 Z"/>
-            <path fill="white" d="M 65 50 l -55 20 v 20 l 55 -20 l 55 20 v -20 l -55 -20 Z"/>
-            <path fill="#0050b3" d="M 65 70 l -55 20 v 20 l 55 25 l 55 -25 v -20 l -55 -20 Z"/>
+            <path fill="#40a9ff" d="M 9 0 v 95 l 55 30 l 55 -30 v -95 h -90 z"/>
+            <path fill="white" d="M 64 35 l -55 25 v 20 l 55 -25 l 55 25 v -20 l -55 -25 z"/>
+            <path fill="#0050b3" d="M 64 55 l -55 25 v 15 l 55 30 l 55 -30 v -15 l -55 -25 z"/>
         </g>
     </g>
 </svg>