Merge branch 'feature/nh_idap_0111' into debug

controllers/user_login.go

@@ -143,7 +143,7 @@ func (this *UserLoginController) GetVerifyCode() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if req.TelAreaCode == "86" && !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}
@@ -250,13 +250,14 @@ func (this *UserLoginController) Login() {
 
 	// 入参
 	type UserLoginReq struct {
-		LoginType  int    `description:"登录方式: 1-账号; 2-手机号; 3-邮箱"`
-		Username   string `description:"账号"`
-		Password   string `description:"密码"`
-		Mobile     string `description:"手机号"`
-		Email      string `description:"邮箱"`
-		VerifyCode string `description:"验证码"`
-		ReqTime    string `description:"登录时间戳"`
+		LoginType   int    `description:"登录方式: 1-账号; 2-手机号; 3-邮箱"`
+		Username    string `description:"账号"`
+		Password    string `description:"密码"`
+		Mobile      string `description:"手机号"`
+		Email       string `description:"邮箱"`
+		VerifyCode  string `description:"验证码"`
+		ReqTime     string `description:"登录时间戳"`
+		TelAreaCode string `description:"区号"`
 	}
 	var req UserLoginReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -299,7 +300,7 @@ func (this *UserLoginController) Login() {
 			return
 		}
 
-		// 判断账号是否为异常登录, 算作异常的话就需要换另外的方式去做登录了
+		// 判断账号是否为异常登录, 算作异常的话就需要换另外的方式去登录了
 		abnormalKey := fmt.Sprint(utils.CACHE_ABNORMAL_LOGIN, req.Username)
 		isAbnormal, _ := utils.Rc.RedisString(abnormalKey)
 		if isAbnormal != "" {
@@ -333,52 +334,75 @@ func (this *UserLoginController) Login() {
 			return
 		}
 
-		// 账号密码校验
-		dbPass := utils.MD5(fmt.Sprintf("%s%s%s", accountUser.Password, utils.UserLoginSalt, req.ReqTime))
-		if req.Password != dbPass {
-			br.Ret = models.BaseRespCodeLoginErr
-			br.Msg = "登录失败, 账号或密码错误"
-			// 错误密码计数, 超过6次标记异常
-			if !utils.Rc.IsExist(errPassKey) {
-				_ = utils.Rc.Put(errPassKey, 1, utils.GetTodayLastSecond())
+		// 系统用户-账号密码校验
+		if accountUser.IsLdap == 0 {
+			dbPass := utils.MD5(fmt.Sprintf("%s%s%s", accountUser.Password, utils.UserLoginSalt, req.ReqTime))
+			if req.Password != dbPass {
+				br.Ret = models.BaseRespCodeLoginErr
+				br.Msg = "登录失败, 账号或密码错误"
+				// 错误密码计数, 超过6次标记异常
+				if !utils.Rc.IsExist(errPassKey) {
+					_ = utils.Rc.Put(errPassKey, 1, utils.GetTodayLastSecond())
+					return
+				}
+				errNum, _ := utils.Rc.RedisInt(errPassKey)
+				errNum += 1
+				if errNum < 6 {
+					_ = utils.Rc.Put(errPassKey, errNum, utils.GetTodayLastSecond())
+					return
+				}
+				// 标记异常登录, 重置计数
+				br.Ret = models.BaseRespCodeAbnormalLogin
+				br.Msg = "账号异常, 请进行手机号/邮箱校验"
+				_ = utils.Rc.Put(abnormalKey, "true", utils.GetTodayLastSecond())
+				_ = utils.Rc.Delete(errPassKey)
 				return
 			}
-			errNum, _ := utils.Rc.RedisInt(errPassKey)
-			errNum += 1
-			if errNum < 6 {
-				_ = utils.Rc.Put(errPassKey, errNum, utils.GetTodayLastSecond())
+
+			if accountUser.Enabled == 0 {
+				br.Msg = "您的账号已被禁用, 如需登录, 请联系管理员"
+				br.ErrMsg = fmt.Sprintf("账号已被禁用, 登录账号: %s, 账户名称: %s", accountUser.AdminName, accountUser.RealName)
 				return
 			}
-			// 标记异常登录, 重置计数
-			br.Ret = models.BaseRespCodeAbnormalLogin
-			br.Msg = "账号异常, 请进行手机号/邮箱校验"
-			_ = utils.Rc.Put(abnormalKey, "true", utils.GetTodayLastSecond())
-			_ = utils.Rc.Delete(errPassKey)
-			return
-		}
 
-		if accountUser.Enabled == 0 {
-			br.Msg = "您的账号已被禁用, 如需登录, 请联系管理员"
-			br.ErrMsg = fmt.Sprintf("账号已被禁用, 登录账号: %s, 账户名称: %s", accountUser.AdminName, accountUser.RealName)
-			return
+			// 异常登录-是否登录间隔大于60天
+			if isAbnormal == "" {
+				abnormalTime := time.Now().AddDate(0, 0, -60)
+				lastLogin, _ := time.ParseInLocation(utils.FormatDateTime, accountUser.LastLoginTime, time.Local)
+				if !lastLogin.IsZero() && lastLogin.Before(abnormalTime) {
+					br.Msg = "请进行异常登录校验"
+					br.Ret = models.BaseRespCodeAbnormalLogin
+					// 标记异常登录
+					_ = utils.Rc.Put(abnormalKey, "true", utils.GetTodayLastSecond())
+					return
+				}
+			}
 		}
 
-		// 异常登录-是否登录间隔大于60天
-		if isAbnormal == "" {
-			abnormalTime := time.Now().AddDate(0, 0, -60)
-			lastLogin, _ := time.ParseInLocation(utils.FormatDateTime, accountUser.LastLoginTime, time.Local)
-			if !lastLogin.IsZero() && lastLogin.Before(abnormalTime) {
-				br.Msg = "请进行异常登录校验"
-				br.Ret = models.BaseRespCodeAbnormalLogin
-				// 标记异常登录
-				_ = utils.Rc.Put(abnormalKey, "true", utils.GetTodayLastSecond())
+		// 如果是域账号, 那么取出原始密码走AD域校验
+		if accountUser.IsLdap == 1 {
+			passDecode, e := base64.StdEncoding.DecodeString(req.Password)
+			if e != nil {
+				br.Ret = models.BaseRespCodeLoginErr
+				br.Msg = "登录失败, 账号或密码错误"
+				br.ErrMsg = "Pass Decode err: " + e.Error()
+				return
+			}
+			originPass := strings.Replace(string(passDecode), utils.UserLoginSalt, "", 1)
+			pass, e := services.LdapUserCheck(req.Username, originPass)
+			if e != nil {
+				br.Ret = models.BaseRespCodeLoginErr
+				br.Msg = "登录失败, 账号或密码错误"
+				br.ErrMsg = "LdapLogin err: " + e.Error()
+				return
+			}
+			if !pass {
+				br.Ret = models.BaseRespCodeLoginErr
+				br.Msg = "登录失败, 账号或密码错误"
 				return
 			}
 		}
 
-		// 登录成功, 清除异常标记
-		_ = utils.Rc.Delete(abnormalKey)
-		_ = utils.Rc.Delete(errPassKey)
 		sysUser = accountUser
 	}
 
@@ -388,7 +412,8 @@ func (this *UserLoginController) Login() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if !utils.ValidateMobileFormatat(req.Mobile) {
+		// 大陆校验区号
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}
@@ -668,11 +693,12 @@ func (this *UserLoginController) ForgetCodeVerify() {
 	}()
 
 	type ForgetCodeVerifyReq struct {
-		FindType   int    `description:"密码找回方式: 1-手机号; 2-邮箱"`
-		VerifyCode string `description:"验证码"`
-		UserName   string `description:"用户名"`
-		Mobile     string `description:"手机号"`
-		Email      string `description:"邮箱"`
+		FindType    int    `description:"密码找回方式: 1-手机号; 2-邮箱"`
+		VerifyCode  string `description:"验证码"`
+		UserName    string `description:"用户名"`
+		Mobile      string `description:"手机号"`
+		Email       string `description:"邮箱"`
+		TelAreaCode string `description:"区号"`
 	}
 	var req ForgetCodeVerifyReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
@@ -699,7 +725,7 @@ func (this *UserLoginController) ForgetCodeVerify() {
 			br.Msg = "请输入手机号"
 			return
 		}
-		if !utils.ValidateMobileFormatat(req.Mobile) {
+		if req.TelAreaCode == utils.TelAreaCodeHome && !utils.ValidateMobileFormatat(req.Mobile) {
 			br.Msg = "您的手机号输入有误, 请检查"
 			return
 		}
@@ -904,3 +930,59 @@ func (this *UserLoginController) AreaCodeList() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// CheckUserLdap
+// @Title 校验用户是否为域用户
+// @Description 校验用户是否为域用户
+// @Param	request	body CheckUserLdapReq true "type json string"
+// @Success 200 Ret=200 获取成功
+// @router /ldap/user_check [post]
+func (this *UserLoginController) CheckUserLdap() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	type CheckUserLdapReq struct {
+		UserName string `description:"用户名"`
+	}
+	var req CheckUserLdapReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	req.UserName = strings.TrimSpace(req.UserName)
+	if req.UserName == "" {
+		br.Msg = "请输入账号"
+		return
+	}
+
+	isLdap := false
+	accountUser, e := system.GetSysUserByAdminName(req.UserName)
+	if e != nil {
+		// 无该用户视作普通用户
+		if e.Error() == utils.ErrNoRow() {
+			br.Data = false
+			br.Success = true
+			br.Msg = "操作成功"
+			return
+		}
+		br.Msg = "操作失败"
+		br.ErrMsg = "获取用户信息失败, Err: " + e.Error()
+		return
+	}
+	if accountUser.IsLdap == 1 {
+		isLdap = true
+	}
+
+	br.Data = isLdap
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

go.mod

@@ -16,6 +16,7 @@ require (
 	github.com/go-xorm/xorm v0.7.9
 	github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b
 	github.com/gorilla/websocket v1.4.2
+	github.com/jtblin/go-ldap-client v0.0.0-20170223121919-b73f66626b33
 	github.com/kgiannakakis/mp3duration v0.0.0-20191013070830-d834f8d5ed53
 	github.com/minio/minio-go/v7 v7.0.63
 	github.com/mojocn/base64Captcha v1.3.5
@@ -100,7 +101,9 @@ require (
 	golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/ldap.v2 v2.5.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	xorm.io/builder v0.3.6 // indirect

go.sum

@@ -293,6 +293,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jtblin/go-ldap-client v0.0.0-20170223121919-b73f66626b33 h1:XDpFOMOZq0u0Ar4F0p/wklqQXp/AMV1pTF5T5bDoUfQ=
+github.com/jtblin/go-ldap-client v0.0.0-20170223121919-b73f66626b33/go.mod h1:+0BcLY5d54TVv6irFzHoiFvwAHR6T0g9B+by/UaS9T0=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
@@ -835,6 +837,8 @@ google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
+gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
+gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -850,6 +854,8 @@ gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ldap.v2 v2.5.1 h1:wiu0okdNfjlBzg6UWvd1Hn8Y+Ux17/u/4nlk4CQr6tU=
+gopkg.in/ldap.v2 v2.5.1/go.mod h1:oI0cpe/D7HRtBQl8aTg+ZmzFUAvu4lsv3eLXMLGFxWk=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=

models/business_conf.go

@@ -9,19 +9,44 @@ import (
 )
 
 const (
-	BusinessConfUseXf             = "UseXf"
-	BusinessConfXfAppid           = "XfAppid"
-	BusinessConfXfApiKey          = "XfApiKey"
-	BusinessConfXfApiSecret       = "XfApiSecret"
-	BusinessConfXfVcn             = "XfVcn"
-	BusinessConfEnPptCoverImgs    = "EnPptCoverImgs"
-	BusinessConfIsReportApprove   = "IsReportApprove"
-	BusinessConfReportApproveType = "ReportApproveType"
+	BusinessConfUseXf                     = "UseXf"
+	BusinessConfXfAppid                   = "XfAppid"
+	BusinessConfXfApiKey                  = "XfApiKey"
+	BusinessConfXfApiSecret               = "XfApiSecret"
+	BusinessConfXfVcn                     = "XfVcn"
+	BusinessConfEnPptCoverImgs            = "EnPptCoverImgs"
+	BusinessConfIsReportApprove           = "IsReportApprove"
+	BusinessConfReportApproveType         = "ReportApproveType"
+	BusinessConfCompanyName               = "CompanyName"
+	BusinessConfCompanyWatermark          = "CompanyWatermark"
+	BusinessConfWatermarkChart            = "WatermarkChart"
+	BusinessConfLoginSmsTpId              = "LoginSmsTpId"
+	BusinessConfLoginSmsGjTpId            = "LoginSmsGjTpId"
+	BusinessConfSmsJhgnAppKey             = "SmsJhgnAppKey"
+	BusinessConfSmsJhgjAppKey             = "SmsJhgjAppKey"
+	BusinessConfLdapHost                  = "LdapHost"
+	BusinessConfLdapBase                  = "LdapBase"
+	BusinessConfLdapPort                  = "LdapPort"
+	BusinessConfEmailClient               = "EmailClient"
+	BusinessConfEmailServerHost           = "EmailServerHost"
+	BusinessConfEmailServerPort           = "EmailServerPort"
+	BusinessConfEmailSender               = "EmailSender"
+	BusinessConfEmailSenderUserName       = "EmailSenderUserName"
+	BusinessConfEmailSenderPassword       = "EmailSenderPassword"
+	BusinessConfSmsClient                 = "SmsClient"
+	BusinessConfNanHuaSmsAppKey           = "NanHuaSmsAppKey"
+	BusinessConfNanHuaSmsAppSecret        = "NanHuaSmsAppSecret"
+	BusinessConfNanHuaSmsApiHost          = "NanHuaSmsApiHost"
+	BusinessConfLoginSmsTplContent        = "LoginSmsTplContent"
+	BusinessConfLoginEmailTemplateSubject = "LoginEmailTemplateSubject"
+	BusinessConfLoginEmailTemplateContent = "LoginEmailTemplateContent"
 )
 
 const (
 	BusinessConfReportApproveTypeEta   = "eta"
 	BusinessConfReportApproveTypeOther = "other"
+	BusinessConfClientFlagNanHua       = "nhqh" // 南华标记
+	BusinessConfEmailClientSmtp        = "smtp" // 普通邮箱标记
 )
 
 // BusinessConf 商户配置表

models/system/admin_verify_code_record.go

@@ -30,6 +30,7 @@ type AdminVerifyCodeRecord struct {
 	ExpiredTime time.Time `description:"验证码过期时间"`
 	SendResult  string    `description:"发送结果"`
 	SendStatus  int       `description:"发送状态：0-待发送；1-已发送；2-发送失败"`
+	RequestId   string    `description:"请求ID"`
 	CreateTime  time.Time `description:"创建时间"`
 	ModifyTime  time.Time `description:"更新时间"`
 }

models/system/sys_user.go

@@ -62,6 +62,7 @@ type Admin struct {
 	CityCode                  string    `description:"市编码"`
 	EmployeeId                string    `description:"员工工号(钉钉/每刻报销)"`
 	TelAreaCode               string    `description:"手机区号"`
+	IsLdap                    int       `description:"是否为域用户：0-系统账户；1-域用户"`
 }
 
 // Update 更新用户基础信息

routers/commentsRouter.go

@@ -2581,6 +2581,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers:UserLoginController"],
+        beego.ControllerComments{
+            Method: "CheckUserLdap",
+            Router: `/ldap/user_check`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mobile/controllers:UserLoginController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers:UserLoginController"],
         beego.ControllerComments{
             Method: "Login",

services/email.go

@@ -0,0 +1,64 @@
+package services
+
+import (
+	"eta/eta_mobile/models"
+	"fmt"
+	"gopkg.in/gomail.v2"
+	"strconv"
+)
+
+type SendEmailReq struct {
+	Title   string   `description:"标题"`
+	Content string   `description:"内容"`
+	ToUser  []string `description:"收信人邮箱"`
+}
+
+func SendEmail(req SendEmailReq) (success bool, err error) {
+	if req.Title == "" {
+		err = fmt.Errorf("邮件主题不可为空")
+		return
+	}
+	if req.Content == "" {
+		err = fmt.Errorf("邮件内容不可为空")
+		return
+	}
+	if len(req.ToUser) <= 0 {
+		err = fmt.Errorf("收信人不可为空")
+		return
+	}
+
+	// 邮箱配置
+	confMap, e := models.GetBusinessConf()
+	if e != nil {
+		err = fmt.Errorf("GetBusinessConf err: %s", e.Error())
+		return
+	}
+	checkArr := []string{
+		models.BusinessConfEmailServerHost, models.BusinessConfEmailServerPort,
+		models.BusinessConfEmailSender, models.BusinessConfEmailSenderUserName,
+		models.BusinessConfEmailSenderPassword,
+	}
+	for _, v := range checkArr {
+		if confMap[v] == "" {
+			err = fmt.Errorf("%s配置有误", v)
+			return
+		}
+	}
+
+	port, _ := strconv.Atoi(confMap[models.BusinessConfEmailServerPort])
+	if port <= 0 {
+		port = 587 // 默认587端口
+	}
+	m := gomail.NewMessage()
+	m.SetHeader("From", confMap[models.BusinessConfEmailSender])
+	m.SetHeader("To", req.ToUser...)
+	m.SetHeader("Subject", req.Title)
+	m.SetBody("text/html", req.Content)
+	d := gomail.NewDialer(confMap[models.BusinessConfEmailServerHost], port, confMap[models.BusinessConfEmailSenderUserName], confMap[models.BusinessConfEmailSenderPassword])
+	if e = d.DialAndSend(m); e != nil {
+		err = fmt.Errorf("邮件发送失败, Err: %s", e.Error())
+		return
+	}
+	success = true
+	return
+}

services/nanhua_sms.go

@@ -0,0 +1,131 @@
+package services
+
+import (
+	"encoding/json"
+	"eta/eta_mobile/models"
+	"eta/eta_mobile/utils"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"strings"
+)
+
+// NanHuaSms 南华短信服务
+type NanHuaSms struct{}
+
+func (cli *NanHuaSms) SendUserLoginCode(req UserLoginSmsCodeReq) (result UserLoginSmsCodeResult, err error) {
+	// 短信内容
+	confMap, e := models.GetBusinessConf()
+	if e != nil {
+		err = fmt.Errorf("GetBusinessConf err: %s", e.Error())
+		return
+	}
+	tpl := confMap[models.BusinessConfLoginSmsTplContent]
+	if tpl == "" {
+		err = fmt.Errorf("短信模板有误")
+		return
+	}
+	smsContent := strings.Replace(tpl, "{{VERIFY_CODE}}", req.VerifyCode, 1)
+	smsContent = strings.Replace(smsContent, "{{EXPIRED_MINUTE}}", strconv.Itoa(utils.VerifyCodeExpireMinute), 1)
+
+	var params NanHuaSmsApiParams
+	var mobileRequest NanHuaSmsApiRequest
+	mobileRequest.Mobile = req.Mobile
+	params.ApiHost = confMap[models.BusinessConfNanHuaSmsApiHost]
+	params.AppKey = confMap[models.BusinessConfNanHuaSmsAppKey]
+	params.AppSecret = confMap[models.BusinessConfNanHuaSmsAppSecret]
+	params.Content = smsContent
+	params.TypeCode = 1
+	params.Requests = append(params.Requests, mobileRequest)
+
+	// 请求接口
+	res, e := CurlNanHuaSmsApi(params)
+	if e != nil {
+		err = fmt.Errorf("CurlNanHuaSmsApi err: %s", e.Error())
+		return
+	}
+	result.Success = res.Success
+	result.Message = res.Message
+	if len(res.Data.SmsResponses) > 0 {
+		result.RequestId = res.Data.SmsResponses[0].RecId
+	}
+	return
+}
+
+// NanHuaSmsApiParams 南华短信接口请求参数
+type NanHuaSmsApiParams struct {
+	ApiHost   string                `json:"-" description:"api-host"`
+	AppKey    string                `json:"-" description:"app-key"`
+	AppSecret string                `json:"-" description:"app-secret"`
+	Content   string                `json:"content" description:"短信内容，必填"`
+	Username  string                `json:"username" description:"使用人南华域账号，非必填"`
+	TypeCode  int                   `json:"typeCode" description:"1-普通短信；2-营销短信"`
+	Requests  []NanHuaSmsApiRequest `json:"requests" description:"手机号、内容信息"`
+}
+
+// NanHuaSmsApiRequest 南华短信接口请求-手机号信息
+type NanHuaSmsApiRequest struct {
+	Content        string `json:"content" description:"短信内容，非必填，填写则该手机号使用此内容单独发送"`
+	Mobile         string `json:"mobile" description:"手机号，必填"`
+	OrgId          string `json:"orgId" description:"客户所属ctp机构ID，非必填，用来计费（建议填写）"`
+	OaDepartmentId string `json:"oaDepartmentId" description:"客户所属oa部门ID，非必填，用来计费"`
+}
+
+// NanHuaSmsApiResult 南华短信接口-响应体
+type NanHuaSmsApiResult struct {
+	ErrorCode int    `json:"errorcode" description:"状态码：0-成功；400-失败"`
+	Success   bool   `json:"success" description:"true-成功；false-失败"`
+	Message   string `json:"message" description:"请求失败提示"`
+	Data      struct {
+		SmsResponses []struct {
+			Mobile string `json:"mobile" description:"手机号"`
+			RecId  string `json:"recId" description:"短信id，用来回查发送状态"`
+		} `json:"smsResponses"`
+	} `json:"data"`
+}
+
+// CurlNanHuaSmsApi 请求南华短信接口
+func CurlNanHuaSmsApi(params NanHuaSmsApiParams) (result NanHuaSmsApiResult, err error) {
+	url := fmt.Sprint(params.ApiHost)
+	byteParams, e := json.Marshal(params)
+	if e != nil {
+		err = fmt.Errorf("data json marshal err: %s", e.Error())
+		return
+	}
+
+	body := ioutil.NopCloser(strings.NewReader(string(byteParams)))
+	client := &http.Client{}
+	req, e := http.NewRequest("POST", url, body)
+	if e != nil {
+		err = fmt.Errorf("http create request err: %s", e.Error())
+		return
+	}
+
+	contentType := "application/json;charset=utf-8"
+	req.Header.Set("Content-Type", contentType)
+	req.Header.Set("App-Key", params.AppKey)
+	req.Header.Set("App-Secret", params.AppSecret)
+	resp, e := client.Do(req)
+	if e != nil {
+		err = fmt.Errorf("http client do err: %s", e.Error())
+		return
+	}
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	b, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(b) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+	if e = json.Unmarshal(b, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	return
+}

services/sms.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"encoding/json"
+	"eta/eta_mobile/models"
 	"eta/eta_mobile/services/alarm_msg"
 	"eta/eta_mobile/utils"
 	"fmt"
@@ -27,8 +28,25 @@ func SendSmsCode(mobile, vCode, tplId string) (flag bool) {
 			go alarm_msg.SendAlarmMsg(tips, 2)
 		}
 	}()
-
-	result, e := sendSms(mobile, tplId, vCode)
+	// 获取配置好的短信模版
+	smsCond := ` AND conf_key = ? `
+	smsPars := make([]interface{}, 0)
+	smsPars = append(smsPars, "SmsJhgnAppKey")
+	conf := new(models.BusinessConf)
+	conf, e := conf.GetItemByCondition(smsCond, smsPars)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			err = fmt.Errorf("请先配置聚合短信Appkey")
+			return
+		}
+		err = fmt.Errorf("获取聚合短信配置信息失败, Err: %s", e.Error())
+		return
+	}
+	if conf.ConfVal == "" {
+		err = fmt.Errorf("请先配置聚合短信Appkey")
+		return
+	}
+	result, e := sendSms(conf.ConfVal, mobile, tplId, vCode)
 	if e != nil {
 		err = fmt.Errorf("send sms err: %s", e.Error())
 		return
@@ -58,7 +76,7 @@ func SendSmsCode(mobile, vCode, tplId string) (flag bool) {
 }
 
 // sendSms 发送国内短信
-func sendSms(mobile, tplId, code string) (rs []byte, err error) {
+func sendSms(jhGnAppKey, mobile, tplId, code string) (rs []byte, err error) {
 	var Url *url.URL
 	apiURL := "http://v.juhe.cn/sms/send"
 	//初始化参数
@@ -67,8 +85,8 @@ func sendSms(mobile, tplId, code string) (rs []byte, err error) {
 	param.Set("mobile", mobile) //接受短信的用户手机号码
 	param.Set("tpl_id", tplId)  //您申请的短信模板ID，根据实际情况修改
 	tplVal := fmt.Sprintf(`#code#=%s&#m#=%d`, code, utils.VerifyCodeExpireMinute)
-	param.Set("tpl_value", tplVal)     //您设置的模板变量，根据实际情况
-	param.Set("key", utils.JhGnAppKey) //应用APPKEY(应用详细页查询)
+	param.Set("tpl_value", tplVal) //您设置的模板变量，根据实际情况
+	param.Set("key", jhGnAppKey)   //应用APPKEY(应用详细页查询)
 
 	Url, err = url.Parse(apiURL)
 	if err != nil {
@@ -87,9 +105,34 @@ func sendSms(mobile, tplId, code string) (rs []byte, err error) {
 }
 
 // SendSmsCodeGj 发送国际短信
-func SendSmsCodeGj(mobile, vCode, areaNum string) bool {
-	flag := false
-	result, err := sendSmsGj(mobile, vCode, areaNum)
+func SendSmsCodeGj(mobile, vCode, areaNum, tplId string) bool {
+	var err error
+	defer func() {
+		if err != nil {
+			tips := fmt.Sprintf("短信验证码发送失败, Err: %s", err.Error())
+			utils.FileLog.Info("%s", tips)
+			go alarm_msg.SendAlarmMsg(tips, 2)
+		}
+	}()
+	// 获取配置好的短信模版
+	smsCond := ` AND conf_key = ? `
+	smsPars := make([]interface{}, 0)
+	smsPars = append(smsPars, "SmsJhgjAppKey")
+	conf := new(models.BusinessConf)
+	conf, e := conf.GetItemByCondition(smsCond, smsPars)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			err = fmt.Errorf("请先配置聚合短信Appkey")
+			return false
+		}
+		err = fmt.Errorf("获取聚合短信配置信息失败, Err: %s", e.Error())
+		return false
+	}
+	if conf.ConfVal == "" {
+		err = fmt.Errorf("请先配置聚合短信Appkey")
+		return false
+	}
+	result, err := sendSmsGj(conf.ConfVal, mobile, vCode, areaNum, tplId)
 	if err != nil {
 		fmt.Println("发送短信失败")
 		return false
@@ -98,34 +141,33 @@ func SendSmsCodeGj(mobile, vCode, areaNum string) bool {
 	var netReturn map[string]interface{}
 	err = json.Unmarshal(result, &netReturn)
 	if err != nil {
-		//go SendEmail("短信验证码发送失败", "err:"+err.Error()+" result"+string(result), utils.EmailSendToUsers)
-		go alarm_msg.SendAlarmMsg("短信验证码发送失败, Err:"+err.Error()+";Result:"+string(result), 2)
-		flag = false
+		err = fmt.Errorf("短信验证码发送失败, Err:" + err.Error() + ";Result:" + string(result))
+		return false
 	}
 	if netReturn["error_code"].(float64) == 0 {
 		fmt.Printf("接口返回result字段是:\r\n%v", netReturn["result"])
-		flag = true
+		return true
 	} else {
 		// 忽略错误的手机号码这种错误
 		if netReturn["error_code"].(float64) != 205401 {
-			go alarm_msg.SendAlarmMsg("短信验证码发送失败, Result:"+string(result), 2)
+			err = fmt.Errorf("短信验证码发送失败, Result:" + string(result))
 		}
-		flag = false
+		return false
 	}
-	return flag
 }
 
 // sendSmsGj 发送国际短信
-func sendSmsGj(mobile, code, areaNum string) (rs []byte, err error) {
+func sendSmsGj(jhGjAppKey, mobile, code, areaNum, tplId string) (rs []byte, err error) {
 	var Url *url.URL
 	apiURL := "http://v.juhe.cn/smsInternational/send.php"
 	//初始化参数
 	param := url.Values{}
 	//配置请求参数,方法内部已处理urlencode问题,中文参数可以直接传参
-	param.Set("mobile", mobile)           //接受短信的用户手机号码
-	param.Set("tplId", "10054")           //您申请的短信模板ID，根据实际情况修改
+	param.Set("mobile", mobile) //接受短信的用户手机号码
+	//param.Set("tplId", "10054")           //您申请的短信模板ID，根据实际情况修改
+	param.Set("tplId", tplId)             //您申请的短信模板ID，根据实际情况修改
 	param.Set("tplValue", "#code#="+code) //您设置的模板变量，根据实际情况
-	param.Set("key", utils.JhGjAppKey)    //应用APPKEY(应用详细页查询)
+	param.Set("key", jhGjAppKey)          //应用APPKEY(应用详细页查询)
 	param.Set("areaNum", areaNum)         //应用APPKEY(应用详细页查询)
 
 	Url, err = url.Parse(apiURL)
@@ -146,3 +188,111 @@ func sendSmsGj(mobile, code, areaNum string) (rs []byte, err error) {
 	utils.FileLog.Info("sendSmsGj:result:" + string(body))
 	return body, err
 }
+
+type SmsClient interface {
+	SendUserLoginCode(UserLoginSmsCodeReq) (UserLoginSmsCodeResult, error)
+}
+
+func NewSmsClient() (cli SmsClient, err error) {
+	confMap, e := models.GetBusinessConf()
+	if e != nil {
+		err = fmt.Errorf("GetBusinessConf err: %s", e.Error())
+		return
+	}
+	if confMap[models.BusinessConfSmsClient] == models.BusinessConfClientFlagNanHua {
+		return new(NanHuaSms), nil
+	}
+	return new(HzSms), nil
+}
+
+type HzSms struct{}
+
+type UserLoginSmsCodeReq struct {
+	TelAreaCode string `description:"区号"`
+	Mobile      string `description:"手机号"`
+	VerifyCode  string `description:"短信验证码"`
+}
+
+type UserLoginSmsCodeResult struct {
+	Success   bool   `description:"发送是否成功"`
+	Message   string `description:"提示信息"`
+	RequestId string `description:"发送ID，用于回查发送状态"`
+}
+
+// SendUserLoginCode 发送用户登录验证码
+func (cli *HzSms) SendUserLoginCode(req UserLoginSmsCodeReq) (result UserLoginSmsCodeResult, err error) {
+	if req.Mobile == "" || req.VerifyCode == "" {
+		err = fmt.Errorf("参数有误, Mobile: %s, VerifyCode: %s", req.Mobile, req.VerifyCode)
+		return
+	}
+	confMap, e := models.GetBusinessConf()
+	if e != nil {
+		err = fmt.Errorf("GetBusinessConf err: %s", e.Error())
+		return
+	}
+
+	// 国内短信
+	var netReturn map[string]interface{}
+	if req.TelAreaCode == utils.TelAreaCodeHome {
+		tplId := confMap[models.BusinessConfLoginSmsTpId]
+		if tplId == "" {
+			err = fmt.Errorf("请先配置短信模板")
+			return
+		}
+		appKey := confMap[models.BusinessConfSmsJhgnAppKey]
+		if appKey == "" {
+			err = fmt.Errorf("请先配置聚合短信AppKey")
+			return
+		}
+
+		smsRes, e := sendSms(appKey, req.Mobile, tplId, req.VerifyCode)
+		if e != nil {
+			err = fmt.Errorf("send sms err: %s", e.Error())
+			return
+		}
+		if e = json.Unmarshal(smsRes, &netReturn); e != nil {
+			err = fmt.Errorf("json unmarshal err: %s", e.Error())
+			return
+		}
+	}
+
+	// 国际短信
+	if req.TelAreaCode != utils.TelAreaCodeHome {
+		tplId := confMap[models.BusinessConfLoginSmsGjTpId]
+		if tplId == "" {
+			err = fmt.Errorf("请先配置短信模板")
+			return
+		}
+		appKey := confMap[models.BusinessConfSmsJhgjAppKey]
+		if appKey == "" {
+			err = fmt.Errorf("请先配置聚合短信AppKey")
+			return
+		}
+
+		smsRes, e := sendSmsGj(appKey, req.Mobile, req.VerifyCode, req.TelAreaCode, tplId)
+		if e != nil {
+			err = fmt.Errorf("send gj sms err: %s", e.Error())
+			return
+		}
+		if e = json.Unmarshal(smsRes, &netReturn); e != nil {
+			err = fmt.Errorf("json unmarshal err: %s", e.Error())
+			return
+		}
+	}
+
+	errCode, ok := netReturn["error_code"].(float64)
+	if !ok {
+		err = fmt.Errorf("result code err")
+		return
+	}
+	// 忽略错误的手机号码这种错误
+	if errCode != 0 && errCode != 205401 {
+		err = fmt.Errorf("err code %f", errCode)
+		return
+	}
+	// 发送成功
+	if errCode == 0 {
+		result.Success = true
+	}
+	return
+}

services/user_login.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_mobile/models/system"
 	"eta/eta_mobile/utils"
 	"fmt"
+	"github.com/jtblin/go-ldap-client"
 	"strconv"
 	"strings"
 	"time"
@@ -14,6 +15,19 @@ import (
 
 // SendAdminMobileVerifyCode 发送用户手机验证码
 func SendAdminMobileVerifyCode(source int, mobile, areaCode string) (ok bool, err error) {
+	defer func() {
+		if err != nil {
+			tips := fmt.Sprintf("SendAdminMobileVerifyCode ErrMsg: %s", err.Error())
+			utils.FileLog.Info(tips)
+			fmt.Println(tips)
+		}
+	}()
+	smsClient, e := NewSmsClient()
+	if e != nil {
+		err = fmt.Errorf("NewSmsClient err: %s", e.Error())
+		return
+	}
+
 	verifyCode := utils.GetRandDigit(6)
 	record := new(system.AdminVerifyCodeRecord)
 	record.VerifyType = system.AdminVerifyCodeRecordTypeMobile
@@ -28,17 +42,23 @@ func SendAdminMobileVerifyCode(source int, mobile, areaCode string) (ok bool, er
 		return
 	}
 
-	tplId := utils.SmsNewLoginTplId
-	if areaCode == "86" {
-		ok = SendSmsCode(mobile, verifyCode, tplId)
-	} else {
-		ok = SendSmsCodeGj(mobile, verifyCode, areaCode)
+	var smsReq UserLoginSmsCodeReq
+	smsReq.Mobile = mobile
+	smsReq.TelAreaCode = areaCode
+	smsReq.VerifyCode = verifyCode
+	smsResult, e := smsClient.SendUserLoginCode(smsReq)
+	if e != nil {
+		err = fmt.Errorf("SendUserLoginCode err: %s", e.Error())
+		return
 	}
+	ok = smsResult.Success
+
 	record.SendStatus = system.AdminVerifyCodeRecordStatusSuccess
 	if !ok {
 		record.SendStatus = system.AdminVerifyCodeRecordStatusFail
 	}
-	cols := []string{"SendStatus"}
+	record.RequestId = smsResult.RequestId
+	cols := []string{"SendStatus", "RequestId"}
 	if e := record.Update(cols); e != nil {
 		err = fmt.Errorf("更新验证码记录失败, Err: %s", e.Error())
 	}
@@ -47,7 +67,37 @@ func SendAdminMobileVerifyCode(source int, mobile, areaCode string) (ok bool, er
 
 // SendAdminEmailVerifyCode 发送用户邮箱验证码
 func SendAdminEmailVerifyCode(source int, email string) (ok bool, err error) {
+	defer func() {
+		if err != nil {
+			tips := fmt.Sprintf("SendAdminEmailVerifyCode ErrMsg: %s", err.Error())
+			utils.FileLog.Info(tips)
+			fmt.Println(tips)
+		}
+	}()
+	// 读取配置
+	confMap, e := models.GetBusinessConf()
+	if e != nil {
+		err = fmt.Errorf("GetBusinessConf err: %s", e.Error())
+		return
+	}
+	subjectConf := confMap[models.BusinessConfLoginEmailTemplateSubject]
+	contentConf := confMap[models.BusinessConfLoginEmailTemplateContent]
+	if subjectConf == "" {
+		err = fmt.Errorf("请先配置邮件模版主题")
+		return
+	}
+	if contentConf == "" {
+		err = fmt.Errorf("请先配置邮件模版内容")
+		return
+	}
 	verifyCode := utils.GetRandDigit(6)
+	t := time.Now().Format("2006年01月02日")
+	emailContent := contentConf
+	emailContent = strings.Replace(emailContent, "{{VERIFY_CODE}}", verifyCode, 1)
+	emailContent = strings.Replace(emailContent, "{{EXPIRED_MINUTE}}", strconv.Itoa(utils.VerifyCodeExpireMinute), 1)
+	emailContent = strings.Replace(emailContent, "{{DATE_TIME}}", t, 1)
+
+	// 验证码记录
 	record := new(system.AdminVerifyCodeRecord)
 	record.VerifyType = system.AdminVerifyCodeRecordTypeEmail
 	record.Email = email
@@ -61,84 +111,111 @@ func SendAdminEmailVerifyCode(source int, email string) (ok bool, err error) {
 		return
 	}
 
-	// 获取邮件配置
-	authKey := "english_report_email_conf"
-	emailConf, e := company.GetConfigDetailByCode(authKey)
-	if e != nil {
-		err = fmt.Errorf("获取群发邮件权限失败, Err: %s", e.Error())
-		return
+	var result string
+	if confMap[models.BusinessConfEmailClient] == models.BusinessConfEmailClientSmtp {
+		// 普通邮箱
+		var emailReq SendEmailReq
+		emailReq.Title = subjectConf
+		emailReq.Content = emailContent
+		emailReq.ToUser = append(emailReq.ToUser, email)
+		ok, e = SendEmail(emailReq)
+		if e != nil {
+			err = fmt.Errorf("邮箱推送失败, Err: %s", e.Error())
+			return
+		}
+	} else {
+		// 默认阿里云邮箱
+		// 读取发信人昵称配置...后面可以优化一下
+		authKey := "english_report_email_conf"
+		emailConf, e := company.GetConfigDetailByCode(authKey)
+		if e != nil {
+			err = fmt.Errorf("获取群发邮件权限失败, Err: %s", e.Error())
+			return
+		}
+		if emailConf.ConfigValue == "" {
+			err = fmt.Errorf("邮件配置为空, 不可推送")
+			return
+		}
+		conf := new(models.EnglishReportEmailConf)
+		if e = json.Unmarshal([]byte(emailConf.ConfigValue), &conf); e != nil {
+			err = fmt.Errorf("邮件配置有误, 不可推送")
+			return
+		}
+
+		req := new(EnglishReportSendEmailRequest)
+		req.Subject = subjectConf
+		req.Email = email
+		req.FromAlias = conf.FromAlias // 发信人昵称
+		req.HtmlBody = emailContent
+
+		aliEmail := new(AliyunEmail)
+		o, r, e := aliEmail.SendEmail(req)
+		if e != nil {
+			err = fmt.Errorf("阿里云邮箱推送失败, Err: %s", e.Error())
+			return
+		}
+		ok = o
+		result = r
 	}
-	if emailConf.ConfigValue == "" {
-		err = fmt.Errorf("邮件配置为空, 不可推送")
-		return
+
+	record.SendStatus = system.AdminVerifyCodeRecordStatusSuccess
+	if !ok {
+		record.SendStatus = system.AdminVerifyCodeRecordStatusFail
 	}
-	conf := new(models.EnglishReportEmailConf)
-	if e = json.Unmarshal([]byte(emailConf.ConfigValue), &conf); e != nil {
-		err = fmt.Errorf("邮件配置有误, 不可推送")
-		return
+	record.SendResult = result
+	cols := []string{"SendStatus", "SendResult"}
+	if e = record.Update(cols); e != nil {
+		err = fmt.Errorf("更新验证码记录失败, Err: %s", e.Error())
 	}
+	return
+}
 
-	// 获取邮箱模板
-	// 获取配置好的短信模版
-	cond := ` AND (conf_key = ? OR conf_key = ?)`
-	pars := make([]interface{}, 0)
-	pars = append(pars, "LoginEmailTemplateSubject", "LoginEmailTemplateContent")
-	busiConf := new(models.BusinessConf)
-	emailConfList, e := busiConf.GetItemsByCondition(cond, pars, []string{"conf_key, conf_val"}, "")
-	if e != nil {
-		if e.Error() == utils.ErrNoRow() {
-			err = fmt.Errorf("请先配置邮件模版")
-			return
+// LdapUserCheck AD域用户校验
+func LdapUserCheck(userName, password string) (pass bool, err error) {
+	defer func() {
+		if err != nil {
+			tips := fmt.Sprintf("LdapUserCheck ErrMsg: %s", err.Error())
+			utils.FileLog.Info(tips)
+			fmt.Println(tips)
 		}
-		err = fmt.Errorf("获取邮件模版失败, Err: %s", e.Error())
+	}()
+	if userName == "" || password == "" {
+		err = fmt.Errorf("账号密码有误")
 		return
 	}
-	var emaiContent, emailSubject string
-	for _, v := range emailConfList {
-		if v.ConfKey == "LoginEmailTemplateContent" {
-			emaiContent = v.ConfVal
-		} else if v.ConfKey == "LoginEmailTemplateSubject" {
-			emailSubject = v.ConfVal
-		}
+	confMap, e := models.GetBusinessConf()
+	if e != nil {
+		err = fmt.Errorf("GetBusinessConf err: %s", e.Error())
+		return
 	}
-	if emailSubject == "" {
-		err = fmt.Errorf("请先配置邮件模版主题")
+	if confMap[models.BusinessConfLdapHost] == "" || confMap[models.BusinessConfLdapBase] == "" {
+		err = fmt.Errorf("AD域配置有误")
 		return
 	}
-	if emaiContent == "" {
-		err = fmt.Errorf("请先配置邮件模版内容")
+	ldapPort, _ := strconv.Atoi(confMap[models.BusinessConfLdapPort])
+	if ldapPort <= 0 {
+		err = fmt.Errorf("AD域端口号有误, Port: %d", ldapPort)
 		return
 	}
 
-	req := new(EnglishReportSendEmailRequest)
-	req.Subject = emailSubject
-	req.Email = email
-	// todo 发信人昵称
-	req.FromAlias = conf.FromAlias
-	// 填充模板
-	t := time.Now().Format("2006年01月02日")
-	ct := emaiContent
-	ct = strings.Replace(ct, "{{VERIFY_CODE}}", verifyCode, 1)
-	ct = strings.Replace(ct, "{{EXPIRED_MINUTE}}", strconv.Itoa(utils.VerifyCodeExpireMinute), 1)
-	ct = strings.Replace(ct, "{{DATE_TIME}}", t, 1)
-	req.HtmlBody = ct
+	client := &ldap.LDAPClient{
+		Base: confMap[models.BusinessConfLdapBase],
+		Host: confMap[models.BusinessConfLdapHost],
+		Port: ldapPort,
+		//UseSSL:       false,
+		//BindDN:       "uid=readonlysuer,ou=People,dc=example,dc=com",
+		//BindPassword: "readonlypassword",
+		//UserFilter:   "(uid=%s)",
+		//GroupFilter:  "(memberUid=%s)",
+		//Attributes:   []string{"givenName", "sn", "mail", "uid"},
+	}
+	defer client.Close()
 
-	aliEmail := new(AliyunEmail)
-	o, result, e := aliEmail.SendEmail(req)
+	ok, _, e := client.Authenticate(userName, password)
 	if e != nil {
-		err = fmt.Errorf("邮箱推送失败, Err: %s", e.Error())
+		err = fmt.Errorf("AD域校验账号密码失败, Err: %s", e.Error())
 		return
 	}
-	ok = o
-
-	record.SendStatus = system.AdminVerifyCodeRecordStatusSuccess
-	if !ok {
-		record.SendStatus = system.AdminVerifyCodeRecordStatusFail
-	}
-	record.SendResult = result
-	cols := []string{"SendStatus", "SendResult"}
-	if e = record.Update(cols); e != nil {
-		err = fmt.Errorf("更新验证码记录失败, Err: %s", e.Error())
-	}
+	pass = ok
 	return
-}
+}

utils/constants.go

@@ -358,13 +358,6 @@ const (
 	SmsNewLoginTplId       = "254663"            // 【弘则研究】您的验证码是XXX，有效期15分钟
 )
 
-// TODO:2023-0915 聚合短信相关配置在ETA1.0.6版本中被改成了商家配置, 还未上线, 上线后这里也改成配置
-// 聚合短信
-var (
-	JhGnAppKey = "4c8504c49dd335e99cfd7b6a3a9e2415" //聚合国内AppKey
-	JhGjAppKey = "3326ad2c1047a4cd92ace153e6044ca3" //聚合国内AppKey
-)
-
 const LoginCacheTime = 60 // 登录缓存时长, 分钟
 
 // DIR_MOD 目录创建权限
@@ -406,3 +399,7 @@ const (
 	WindDbWsd = "wsd"
 	ThsDs     = "thsds"
 )
+
+const (
+	TelAreaCodeHome = "86" // 大陆区号
+)