|
|
@@ -268,19 +268,7 @@ func (this *UserLoginController) Login() {
|
|
|
}
|
|
|
req.Username = strings.TrimSpace(req.Username)
|
|
|
req.Mobile = strings.TrimSpace(req.Mobile)
|
|
|
- if req.Mobile != "" {
|
|
|
- if !utils.ValidateMobileFormatat(req.Mobile) {
|
|
|
- br.Msg = "您的手机号输入有误, 请检查"
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
req.Email = strings.TrimSpace(req.Email)
|
|
|
- if req.Email != "" {
|
|
|
- if !utils.ValidateEmailFormatat(req.Email) {
|
|
|
- br.Msg = "您的邮箱输入有误, 请检查"
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
req.VerifyCode = strings.TrimSpace(req.VerifyCode)
|
|
|
if req.LoginType != 1 && req.LoginType != 2 && req.LoginType != 3 {
|
|
|
br.Msg = "登录方式有误"
|
|
|
@@ -512,7 +500,7 @@ func (this *UserLoginController) Login() {
|
|
|
account := utils.MD5(sysUser.AdminName)
|
|
|
token := utils.GenToken(account)
|
|
|
sysSession := new(system.SysSession)
|
|
|
- sysSession.UserName = req.Username
|
|
|
+ sysSession.UserName = sysUser.AdminName
|
|
|
sysSession.SysUserId = sysUser.AdminId
|
|
|
sysSession.ExpiredTime = time.Now().AddDate(0, 0, 90)
|
|
|
sysSession.IsRemember = 0 // 均需要做过期校验
|
