管理后台登录判断

models/system/admin.go

@@ -74,14 +74,6 @@ func (item *Admin) Update(cols []string) (err error) {
 	return
 }
 
-func CheckSysUser(userName, password string) (item *Admin, err error) {
-	sql := ` SELECT a.*,b.role_type_code FROM admin AS a
-			 INNER JOIN sys_role AS b ON a.role_id=b.role_id WHERE a.admin_name=? AND a.password=? LIMIT 1`
-	o := orm.NewOrm()
-	err = o.Raw(sql, userName, password).QueryRow(&item)
-	return
-}
-
 func GetSysUserById(sysUserId int) (item *Admin, err error) {
 	sql := `SELECT * FROM admin WHERE admin_id=? LIMIT 1`
 	o := orm.NewOrm()
@@ -155,46 +147,15 @@ func (item *Admin) GetItemsByCondition(condition string, pars []interface{}, fie
 	return
 }
 
-// GetSysUserByMobile 手机号获取用户
-func GetSysUserByMobile(mobile string) (item *Admin, err error) {
+// GetAdminByAdminName 账号获取用户
+func GetAdminByAdminName(adminName string) (item *Admin, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
-				a.*, b.role_type_code
-			FROM
-				admin AS a
-			INNER JOIN sys_role AS b ON a.role_id = b.role_id
-			WHERE
-				a.mobile = ?
-			LIMIT 1`
-	err = o.Raw(sql, mobile).QueryRow(&item)
-	return
-}
-
-// GetSysUserByEmail 邮箱获取用户
-func GetSysUserByEmail(email string) (item *Admin, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-				a.*, b.role_type_code
-			FROM
-				admin AS a
-			INNER JOIN sys_role AS b ON a.role_id = b.role_id
-			WHERE
-				a.email = ?
-			LIMIT 1`
-	err = o.Raw(sql, email).QueryRow(&item)
-	return
-}
-
-// GetSysUserByAdminName 账号获取用户
-func GetSysUserByAdminName(adminName string) (item *Admin, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT
-				a.*, b.role_type_code
+				*
 			FROM
-				admin AS a
-			INNER JOIN sys_role AS b ON a.role_id = b.role_id
+				admin 
 			WHERE
-				a.admin_name = ?
+				admin_name = ?
 			LIMIT 1`
 	err = o.Raw(sql, adminName).QueryRow(&item)
 	return

services/login.go

@@ -9,7 +9,7 @@ import (
 
 func ThirdLogin(adminName string) (login system.LoginResp, err error) {
 	// 获取用户信息
-	sysUser, e := system.GetSysUserByAdminName(adminName)
+	sysUser, e := system.GetAdminByAdminName(adminName)
 	if e != nil {
 		if e.Error() == utils.ErrNoRow() {
 			err = fmt.Errorf("用户不存在")
@@ -18,7 +18,10 @@ func ThirdLogin(adminName string) (login system.LoginResp, err error) {
 		err = fmt.Errorf("获取失败, 获取用户信息失败, err: " + e.Error())
 		return
 	}
-
+	if sysUser.Enabled != 1 {
+		err = fmt.Errorf("账号已被禁用, 登录账号: %s, 账户名称: %s", sysUser.AdminName, sysUser.RealName)
+		return
+	}
 	var token string
 	account := utils.MD5(adminName)
 	// 获取用户未过期的session, 避免过于频繁生成token