|
@@ -151,7 +151,7 @@ func (this *UserLoginController) GetVerifyCode() {
|
|
|
}
|
|
|
_, e := system.GetSysUserByMobile(req.Mobile)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "您的手机号未绑定账号, 请检查"
|
|
|
return
|
|
|
}
|
|
@@ -171,7 +171,7 @@ func (this *UserLoginController) GetVerifyCode() {
|
|
|
}
|
|
|
_, e := system.GetSysUserByEmail(req.Email)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "您的邮箱未绑定账号, 请检查"
|
|
|
return
|
|
|
}
|
|
@@ -418,7 +418,7 @@ func (this *UserLoginController) Login() {
|
|
|
recordOb := new(system.AdminVerifyCodeRecord)
|
|
|
_, e := recordOb.GetItemByCondition(recordCond, recordPars)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "验证码错误, 请重新输入"
|
|
|
return
|
|
|
}
|
|
@@ -429,7 +429,7 @@ func (this *UserLoginController) Login() {
|
|
|
|
|
|
mobileUser, e := system.GetSysUserByMobile(req.Mobile)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "您的手机号未绑定账号, 请检查"
|
|
|
return
|
|
|
}
|
|
@@ -466,7 +466,7 @@ func (this *UserLoginController) Login() {
|
|
|
recordOb := new(system.AdminVerifyCodeRecord)
|
|
|
_, e := recordOb.GetItemByCondition(recordCond, recordPars)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "验证码错误, 请重新输入"
|
|
|
return
|
|
|
}
|
|
@@ -477,7 +477,7 @@ func (this *UserLoginController) Login() {
|
|
|
|
|
|
emailUser, e := system.GetSysUserByEmail(req.Email)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "您的邮箱未绑定账号, 请检查"
|
|
|
return
|
|
|
}
|
|
@@ -649,7 +649,7 @@ func (this *UserLoginController) ForgetAccountGet() {
|
|
|
|
|
|
sysUser, e := system.GetSysUserByAdminName(req.UserName)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "用户不存在, 请检查"
|
|
|
return
|
|
|
}
|
|
@@ -735,7 +735,7 @@ func (this *UserLoginController) ForgetCodeVerify() {
|
|
|
recordOb := new(system.AdminVerifyCodeRecord)
|
|
|
_, e := recordOb.GetItemByCondition(recordCond, recordPars)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "验证码错误, 请重新输入"
|
|
|
return
|
|
|
}
|
|
@@ -765,7 +765,7 @@ func (this *UserLoginController) ForgetCodeVerify() {
|
|
|
recordOb := new(system.AdminVerifyCodeRecord)
|
|
|
_, e := recordOb.GetItemByCondition(recordCond, recordPars)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "验证码错误, 请重新输入"
|
|
|
return
|
|
|
}
|
|
@@ -847,7 +847,7 @@ func (this *UserLoginController) ForgetResetPass() {
|
|
|
|
|
|
sysUser, e := system.GetSysAdminByName(req.UserName)
|
|
|
if e != nil {
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Msg = "用户不存在, 请检查"
|
|
|
return
|
|
|
}
|
|
@@ -973,7 +973,7 @@ func (this *UserLoginController) CheckUserLdap() {
|
|
|
accountUser, e := system.GetSysUserByAdminName(req.UserName)
|
|
|
if e != nil {
|
|
|
// 无该用户视作普通用户
|
|
|
- if e.Error() == utils.ErrNoRow() {
|
|
|
+ if utils.IsErrNoRow(e) {
|
|
|
br.Ret = 200
|
|
|
br.Data = false
|
|
|
br.Success = true
|
|
@@ -1058,25 +1058,24 @@ func (this *UserLoginController) BaseInfo() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-
|
|
|
type BaseInfoResp struct {
|
|
|
- Icp *models.BusinessConf `description:"Icp信息"`
|
|
|
- ETATitle *models.BusinessConf `description:"eta系统名称"`
|
|
|
- TabName *models.BusinessConf `description:"tab页名称"`
|
|
|
- LogoCn *models.BusinessConf `description:"中文logo"`
|
|
|
- LogoEn *models.BusinessConf `description:"英文logo"`
|
|
|
- LogoCnMini *models.BusinessConf `description:"中文logoMini"`
|
|
|
- LogoEnMini *models.BusinessConf `description:"英文logoMini"`
|
|
|
+ Icp *models.BusinessConf `description:"Icp信息"`
|
|
|
+ ETATitle *models.BusinessConf `description:"eta系统名称"`
|
|
|
+ TabName *models.BusinessConf `description:"tab页名称"`
|
|
|
+ LogoCn *models.BusinessConf `description:"中文logo"`
|
|
|
+ LogoEn *models.BusinessConf `description:"英文logo"`
|
|
|
+ LogoCnMini *models.BusinessConf `description:"中文logoMini"`
|
|
|
+ LogoEnMini *models.BusinessConf `description:"英文logoMini"`
|
|
|
}
|
|
|
|
|
|
resp := BaseInfoResp{
|
|
|
- Icp: icp,
|
|
|
- ETATitle: title,
|
|
|
- TabName: tabName,
|
|
|
- LogoCn: logoCn,
|
|
|
- LogoEn: logoEn,
|
|
|
- LogoCnMini: logoCnMini,
|
|
|
- LogoEnMini: logoEnMini,
|
|
|
+ Icp: icp,
|
|
|
+ ETATitle: title,
|
|
|
+ TabName: tabName,
|
|
|
+ LogoCn: logoCn,
|
|
|
+ LogoEn: logoEn,
|
|
|
+ LogoCnMini: logoCnMini,
|
|
|
+ LogoEnMini: logoEnMini,
|
|
|
}
|
|
|
|
|
|
br.Data = resp
|