From 6087a60105313bff5c6be593354f89711c489339 Mon Sep 17 00:00:00 2001
From: "Mr. Lan" <fdevops@163.com>
Date: Mon, 17 Aug 2020 22:38:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90ldap=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 handler/auth.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/handler/auth.go b/handler/auth.go
index 4644d66..a3ffd34 100644
--- a/handler/auth.go
+++ b/handler/auth.go
@@ -1,6 +1,7 @@
 package handler
 
 import (
+	"errors"
 	"ferry/global/orm"
 	"ferry/models/system"
 	jwt "ferry/pkg/jwtauth"
@@ -106,26 +107,26 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 		// ldap登陆
 		err = l.LdapLogin(loginVal.Username, loginVal.Password)
 		if err != nil {
-			return nil, jwt.ErrInvalidVerificationode
+			return nil, errors.New("登陆失败，用户名或密码不正确。")
 		}
 		// 2. 将ldap用户信息写入到用户数据表中
 		err = orm.Eloquent.Table("sys_user").
 			Where("username = ?", userInfo.Username).
 			Count(&authUserCount).Error
 		if err != nil {
-			return nil, jwt.ErrInvalidVerificationode
+			return nil, errors.New(fmt.Sprintf("查询用户失败。%v", err))
 		}
 		if authUserCount == 0 {
 			addUserInfo.Username = userInfo.Username
 			// 获取默认权限ID
 			err = orm.Eloquent.Table("sys_role").Where("role_key = 'common'").Find(&roleValue).Error
 			if err != nil {
-				return nil, jwt.ErrInvalidVerificationode
+				return nil, errors.New(fmt.Sprintf("查询角色失败。%v", err))
 			}
 			addUserInfo.RoleId = roleValue.RoleId // 绑定通用角色
 			err = orm.Eloquent.Table("sys_user").Create(&addUserInfo).Error
 			if err != nil {
-				return nil, jwt.ErrInvalidVerificationode
+				return nil, errors.New(fmt.Sprintf("创建本地用户失败。%v", err))
 			}
 		}
 	}