邮箱配置

services/user_login.go

@@ -32,7 +32,7 @@ func SendAdminMobileVerifyCode(source int, mobile, areaCode string) (ok bool, er
 	smsPars := make([]interface{}, 0)
 	smsPars = append(smsPars, "LoginSmsTpId")
 	conf := new(models.BusinessConf)
-	_, e := conf.GetItemByCondition(smsCond, smsPars)
+	conf, e := conf.GetItemByCondition(smsCond, smsPars)
 	if e != nil {
 		if e.Error() == utils.ErrNoRow() {
 			err = fmt.Errorf("请先配置短信模版")
@@ -103,10 +103,10 @@ func SendAdminEmailVerifyCode(source int, email string) (ok bool, err error) {
 	pars := make([]interface{}, 0)
 	pars = append(pars, "LoginEmailTemplateSubject", "LoginEmailTemplateContent")
 	busiConf := new(models.BusinessConf)
-	emailConfList, e := busiConf.GetItemsByCondition(cond, pars, []string{"conf_val"}, "")
+	emailConfList, e := busiConf.GetItemsByCondition(cond, pars, []string{"conf_key, conf_val"}, "")
 	if e != nil {
 		if e.Error() == utils.ErrNoRow() {
-			err = fmt.Errorf("请先邮件模版")
+			err = fmt.Errorf("请先配置邮件模版")
 			return
 		}
 		err = fmt.Errorf("获取邮件模版失败, Err: %s", e.Error())
@@ -121,17 +121,18 @@ func SendAdminEmailVerifyCode(source int, email string) (ok bool, err error) {
 		}
 	}
 	if emailSubject == "" {
-		err = fmt.Errorf("请先邮件模版主题")
+		err = fmt.Errorf("请先配置邮件模版主题")
 		return
 	}
 	if emaiContent == "" {
-		err = fmt.Errorf("请先邮件模版内容")
+		err = fmt.Errorf("请先配置邮件模版内容")
 		return
 	}
 
 	req := new(EnglishReportSendEmailRequest)
 	req.Subject = emailSubject
 	req.Email = email
+	// todo 发信人昵称
 	req.FromAlias = conf.FromAlias
 	// 填充模板
 	t := time.Now().Format("2006年01月02日")