|
@@ -58,7 +58,7 @@ func (a *AuthController) Login(c *gin.Context) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- password := utils.MD5(req.Password+utils.KEY)
|
|
|
+ password := utils.MD5(req.Password + utils.KEY)
|
|
|
sysUser, err := english_report_email.CheckUserPwd(req.Type, req.CountryCode, req.Account, password)
|
|
|
if err != nil {
|
|
|
resp.FailData("Login failed. Please check your entries and try again.", "Err:"+err.Error(), c)
|
|
@@ -135,14 +135,14 @@ func (a *AuthController) Register(c *gin.Context) {
|
|
|
return
|
|
|
}
|
|
|
userId := 0
|
|
|
- password := utils.MD5(req.Password+utils.KEY)
|
|
|
+ password := utils.MD5(req.Password + utils.KEY)
|
|
|
if emailItem != nil {
|
|
|
if emailItem.Status == 1 && emailItem.Password == "" {
|
|
|
//已经是正式用户,更新密码即可
|
|
|
emailItem.Password = password
|
|
|
emailItem.ModifyTime = time.Now()
|
|
|
emailItem.RegisterTime = time.Now()
|
|
|
- err = emailItem.Update([]string{"Password", "ModifyTime","RegisterTime"})
|
|
|
+ err = emailItem.Update([]string{"Password", "ModifyTime", "RegisterTime"})
|
|
|
if err != nil {
|
|
|
resp.FailMsg("修改密码失败", "修改密码失败,Err:"+err.Error(), c)
|
|
|
return
|
|
@@ -159,12 +159,12 @@ func (a *AuthController) Register(c *gin.Context) {
|
|
|
} else {
|
|
|
//状态为临时
|
|
|
user := english_report_email.Email{
|
|
|
- Name: req.Name,
|
|
|
- CompanyName: req.CompanyName,
|
|
|
- Email: req.Email,
|
|
|
- Password: password,
|
|
|
- Enable: 1,
|
|
|
- Status: 2,
|
|
|
+ Name: req.Name,
|
|
|
+ CompanyName: req.CompanyName,
|
|
|
+ Email: req.Email,
|
|
|
+ Password: password,
|
|
|
+ Enable: 1,
|
|
|
+ Status: 2,
|
|
|
RegisterTime: time.Now(),
|
|
|
}
|
|
|
user.Set()
|
|
@@ -176,23 +176,23 @@ func (a *AuthController) Register(c *gin.Context) {
|
|
|
}
|
|
|
userId = int(user.Id)
|
|
|
}
|
|
|
-
|
|
|
- account := utils.MD5(req.Email)
|
|
|
- token, err := utils.GenToken(account)
|
|
|
sysSession := new(session.EnglishYbSession)
|
|
|
- sysSession.UserId = userId
|
|
|
- //现在要求永不过期
|
|
|
- sysSession.ExpireTime = time.Now().AddDate(99, 0, 0)
|
|
|
- sysSession.CreatedTime = time.Now()
|
|
|
- sysSession.LastUpdatedTime = time.Now()
|
|
|
- sysSession.AccessToken = token
|
|
|
- err = sysSession.AddSession()
|
|
|
- fmt.Println("id:", sysSession.SessionId)
|
|
|
- if err != nil {
|
|
|
- resp.FailData("新增session信息失败", "Err:"+err.Error(), c)
|
|
|
- return
|
|
|
+ if userId > 0 {
|
|
|
+ account := utils.MD5(req.Email)
|
|
|
+ token, err := utils.GenToken(account)
|
|
|
+ sysSession.UserId = userId
|
|
|
+ //现在要求永不过期
|
|
|
+ sysSession.ExpireTime = time.Now().AddDate(99, 0, 0)
|
|
|
+ sysSession.CreatedTime = time.Now()
|
|
|
+ sysSession.LastUpdatedTime = time.Now()
|
|
|
+ sysSession.AccessToken = token
|
|
|
+ err = sysSession.AddSession()
|
|
|
+ fmt.Println("id:", sysSession.SessionId)
|
|
|
+ if err != nil {
|
|
|
+ resp.FailData("新增session信息失败", "Err:"+err.Error(), c)
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
respItem := session.LoginResp{
|
|
|
Email: req.Email,
|
|
|
Name: req.Name,
|
|
@@ -236,7 +236,7 @@ func (a *AuthController) ModifyPwd(c *gin.Context) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- password := utils.MD5(req.NewPwd+utils.KEY)
|
|
|
+ password := utils.MD5(req.NewPwd + utils.KEY)
|
|
|
emailitem := english_report_email.Email{
|
|
|
Id: userinfo.Id,
|
|
|
Password: password,
|
|
@@ -458,7 +458,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- password := utils.MD5(req.Password+utils.KEY)
|
|
|
+ password := utils.MD5(req.Password + utils.KEY)
|
|
|
emailitem := english_report_email.Email{
|
|
|
Id: userEmail.Id,
|
|
|
Password: password,
|