lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-27 04:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore!(all): attempt to update beego to v2

Browse Source 
BREAKING CHANGE: beego has update to v2, and this version of mindoc IS
NOT TESTED AND STABLE!!!
This commit is contained in:
roberChen
2021-03-23 21:55:50 +08:00
parent 79f70d830d
commit 90c1329de2
56 changed files with 1021 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
controllers/AccountController.go
View File

@@ -8,7 +8,7 @@ import (
"html/template"
"github.com/astaxie/beego"
"github.com/beego/beego/v2/adapter/logs"
"github.com/lifei6671/gocaptcha"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/mail"
@@ -124,7 +124,7 @@ func (c *AccountController) Login() {
c.JsonResult(0, "ok", c.referer())
} else {
beego.Error("用户登录 ->", err)
logs.Error("用户登录 ->", err)
c.JsonResult(500, "账号或密码错误", nil)
}
} else {
@@ -249,7 +249,7 @@ func (c *AccountController) FindPassword() {
count, err := models.NewMemberToken().FindSendCount(email, time.Now().Add(-1*time.Hour), time.Now())
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6008, "发送邮件失败")
}
if count > mailConf.MailNumber {
@@ -274,7 +274,7 @@ func (c *AccountController) FindPassword() {
body, err := c.ExecuteViewPathTemplate("account/mail_template.tpl", data)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6003, "邮件发送失败")
}
@@ -288,7 +288,7 @@ func (c *AccountController) FindPassword() {
Secure: mailConf.Secure,
Identity: "",
}
beego.Info(mailConfig)
logs.Info(mailConfig)
c := mail.NewSMTPClient(mailConfig)
m := mail.NewMail()
@@ -300,9 +300,9 @@ func (c *AccountController) FindPassword() {
m.AddTo(email)
if e := c.Send(m); e != nil {
beego.Error("发送邮件失败：" + e.Error())
logs.Error("发送邮件失败：" + e.Error())
} else {
beego.Info("邮件发送成功：" + email)
logs.Info("邮件发送成功：" + email)
}
//auth := smtp.PlainAuth(
// "",
@@ -322,7 +322,7 @@ func (c *AccountController) FindPassword() {
// []byte(subject+mime+"\n"+body),
//)
//if err != nil {
// beego.Error("邮件发送失败 => ", email, err)
// logs.Error("邮件发送失败 => ", email, err)
//}
}(mailConf, email, body)
@@ -336,12 +336,12 @@ func (c *AccountController) FindPassword() {
memberToken, err := models.NewMemberToken().FindByFieldFirst("token", token)
if err != nil {
beego.Error(err)
logs.Error(err)
c.Data["ErrorMessage"] = "邮件已失效"
c.TplName = "errors/error.tpl"
return
}
subTime := memberToken.SendTime.Sub(time.Now())
subTime := time.Until(memberToken.SendTime)
if !strings.EqualFold(memberToken.Email, email) || subTime.Minutes() > float64(mailConf.MailExpired) || !memberToken.ValidTime.IsZero() {
c.Data["ErrorMessage"] = "验证码已过期，请重新操作。"
@@ -388,10 +388,10 @@ func (c *AccountController) ValidEmail() {
memberToken, err := models.NewMemberToken().FindByFieldFirst("token", token)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6007, "邮件已失效")
}
subTime := memberToken.SendTime.Sub(time.Now())
subTime := time.Until(memberToken.SendTime)
if !strings.EqualFold(memberToken.Email, email) || subTime.Minutes() > float64(mailConf.MailExpired) || !memberToken.ValidTime.IsZero() {
@@ -399,13 +399,13 @@ func (c *AccountController) ValidEmail() {
}
member, err := models.NewMember().Find(memberToken.MemberId)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6005, "用户不存在")
}
hash, err := utils.PasswordHash(password1)
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6006, "保存密码失败")
}
@@ -417,7 +417,7 @@ func (c *AccountController) ValidEmail() {
memberToken.InsertOrUpdate()
if err != nil {
beego.Error(err)
logs.Error(err)
c.JsonResult(6006, "保存密码失败")
}
c.JsonResult(0, "ok", conf.URLFor("AccountController.Login"))
@@ -441,7 +441,7 @@ func (c *AccountController) Captcha() {
captchaImage := gocaptcha.NewCaptchaImage(140, 40, gocaptcha.RandLightColor())
//if err != nil {
// beego.Error(err)
// logs.Error(err)
// c.Abort("500")
//}