|
|
@@ -2,14 +2,15 @@ package service
|
|
|
|
|
|
import (
|
|
|
"context"
|
|
|
- "dashoo.cn/micro/app/dao"
|
|
|
- "dashoo.cn/micro/app/model"
|
|
|
+ "dashoo.cn/opms_admin/app/dao"
|
|
|
+ "dashoo.cn/opms_admin/app/model"
|
|
|
"dashoo.cn/opms_libary/myerrors"
|
|
|
"dashoo.cn/opms_libary/plugin/dingtalk"
|
|
|
"dashoo.cn/opms_libary/request"
|
|
|
"dashoo.cn/opms_libary/utils"
|
|
|
"database/sql"
|
|
|
"errors"
|
|
|
+ "fmt"
|
|
|
"github.com/gogf/gf/container/garray"
|
|
|
"github.com/gogf/gf/container/gset"
|
|
|
"github.com/gogf/gf/database/gdb"
|
|
|
@@ -49,6 +50,8 @@ func (s *UserService) Login(username, password string) (*request.UserInfo, error
|
|
|
return nil, myerrors.TipsError("账号错误或已限制登录")
|
|
|
}
|
|
|
// 验证密码
|
|
|
+ pass := utils.EncryptPassword(password, sysUserInfo.UserSalt)
|
|
|
+ fmt.Println(pass)
|
|
|
if utils.EncryptPassword(password, sysUserInfo.UserSalt) != sysUserInfo.Password {
|
|
|
s.Dao.WherePri(sysUserInfo.Id).Decrement(s.Dao.C.AllowErrorNum, 1)
|
|
|
return nil, myerrors.TipsError("账号密码错误")
|