Ver código fonte

Revert "update 完善登录:账号不存在"

This reverts commit 09d6732d0a2c175ee5493a93427e5828a9b90c62.
Alvin 8 meses atrás
pai
commit
87b6ecf246

+ 1 - 2
game/config/data/codeConfig.json

@@ -28,6 +28,5 @@
   {"code":16013,"message":"管理员不存在"},
   {"code":16014,"message":"admin-超级账户不能修改角色"},
   {"code":16015,"message":"token验证失败"},
-  {"code":16016,"message":"Ip 禁用"},
-  {"code":16017,"message":"帐号不存在"}
+  {"code":16016,"message":"Ip 禁用"}
 ]

+ 0 - 1
game/game_cluster/internal/code/code.go

@@ -49,5 +49,4 @@ var (
 	AdminMustNotUpdateError         int32 = 16014 // admin-超级账户不能修改角色
 	UnauthorizedError               int32 = 16015 // token验证失败
 	ForbiddenError                  int32 = 16016 // Ip 禁用
-	AccountNotExistError            int32 = 16017 // 帐号不存在
 )

+ 2 - 9
game/game_cluster/nodes/webadmin/service/admin.go

@@ -58,10 +58,6 @@ func (a *Admin) Login(ctx *gin.Context, username string, password string) (*enti
 	user, err := a.QueryUserByUsername(ctx, username)
 	if err != nil {
 		mhayaLogger.Warnf("Login QueryUserByUsername error:", err)
-		if errors.Is(err, mongo.ErrNoDocuments) {
-			return nil, common.NewResult(code.AccountNotExistError)
-		}
-
 		return nil, common.NewResult(code.InternalError)
 	}
 
@@ -188,11 +184,7 @@ func (a *Admin) loginAuthSetRoleRedis(roleID, generateToken string) error {
 func (a *Admin) QueryUserByUsername(ctx context.Context, username string) (*model.Admin, error) {
 	admin := &model.Admin{}
 	err := mdb.MDB.Collection(a.GetDBName()).FindOne(ctx, bson.M{"username": username}).Decode(&admin)
-	if errors.Is(err, mongo.ErrNoDocuments) {
-		if username != "admin" {
-			return nil, err
-		}
-
+	if errors.Is(err, mongo.ErrNoDocuments) && username == "admin" {
 		// 如果是admin 登录的话 创建一个初始的admin并且存入数据库
 		pwd, err := HashPassword("123456")
 		if err != nil {
@@ -230,6 +222,7 @@ func (a *Admin) QueryUserByUsername(ctx context.Context, username string) (*mode
 	}
 
 	return admin, nil
+
 }
 
 // ChangePassword 修改管理员密码