Merge branch 'feature/nh_idap_0111' into debug

controllers/user_login.go

@@ -390,6 +390,7 @@ func (this *UserLoginController) Login() {
 				return
 			}
 			originPass := strings.Replace(string(passDecode), utils.UserLoginSalt, "", 1)
+			fmt.Println("originPass: ", originPass)
 			pass, e := services.LdapUserCheck(req.Username, originPass)
 			if e != nil {
 				br.Ret = models.BaseRespCodeLoginErr

services/email.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"crypto/tls"
 	"eta/eta_api/models"
 	"eta/eta_api/utils"
 	"fmt"
@@ -274,6 +275,9 @@ func SendEmail(req SendEmailReq) (success bool, err error) {
 	m.SetHeader("Subject", req.Title)
 	m.SetBody("text/html", req.Content)
 	d := gomail.NewDialer(confMap[models.BusinessConfEmailServerHost], port, confMap[models.BusinessConfEmailSenderUserName], confMap[models.BusinessConfEmailSenderPassword])
+	// 解决x509报错的问题。证书不通过。跳过证书验证
+	config := &tls.Config{ServerName: confMap[models.BusinessConfEmailServerHost], InsecureSkipVerify: true}
+	d.TLSConfig = config
 	if e = d.DialAndSend(m); e != nil {
 		err = fmt.Errorf("邮件发送失败, Err: %s", e.Error())
 		return

services/user_login.go

@@ -205,7 +205,7 @@ func LdapUserCheck(userName, password string) (pass bool, err error) {
 		//UseSSL:       false,
 		//BindDN:       "uid=readonlysuer,ou=People,dc=example,dc=com",
 		//BindPassword: "readonlypassword",
-		//UserFilter:   "(uid=%s)",
+		UserFilter: "(uid=%s)",
 		//GroupFilter:  "(memberUid=%s)",
 		//Attributes:   []string{"givenName", "sn", "mail", "uid"},
 	}