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

23
conf/mail.go
View File

@@ -1,8 +1,9 @@
package conf
import (
"github.com/astaxie/beego"
"strings"
"github.com/beego/beego/v2/adapter"
)
type SmtpConf struct {
@@ -14,18 +15,18 @@ type SmtpConf struct {
SmtpPort int
FormUserName string
MailExpired int
Secure string
Secure string
}
func GetMailConfig() *SmtpConf {
user_name := beego.AppConfig.String("smtp_user_name")
password := beego.AppConfig.String("smtp_password")
smtp_host := beego.AppConfig.String("smtp_host")
smtp_port := beego.AppConfig.DefaultInt("smtp_port", 25)
form_user_name := beego.AppConfig.String("form_user_name")
enable_mail := beego.AppConfig.String("enable_mail")
mail_number := beego.AppConfig.DefaultInt("mail_number", 5)
secure := beego.AppConfig.DefaultString("secure","NONE")
user_name := adapter.AppConfig.String("smtp_user_name")
password := adapter.AppConfig.String("smtp_password")
smtp_host := adapter.AppConfig.String("smtp_host")
smtp_port := adapter.AppConfig.DefaultInt("smtp_port", 25)
form_user_name := adapter.AppConfig.String("form_user_name")
enable_mail := adapter.AppConfig.String("enable_mail")
mail_number := adapter.AppConfig.DefaultInt("mail_number", 5)
secure := adapter.AppConfig.DefaultString("secure", "NONE")
if secure != "NONE" && secure != "LOGIN" && secure != "SSL" {
secure = "NONE"
@@ -38,7 +39,7 @@ func GetMailConfig() *SmtpConf {
SmtpPassword: password,
FormUserName: form_user_name,
SmtpPort: smtp_port,
Secure:secure,
Secure: secure,
}
return c
}