wangshan 5 сар өмнө
parent
commit
ba4c6574de

+ 9 - 4
src/jfw/modules/publicapply/src/captcha/controller/controller.go

@@ -67,7 +67,7 @@ func (c *CaptchaStruct) Get() {
 				if count == 1 {
 					//直接发短信
 					jy.SendPhoneIdentCode(c.Request, config.Config.SmsServiceRpc, phone, c.Session())
-					go SendCodeByWUrl(c.Session(), "identCode", phone)
+					go SendCodeByWUrl(c.Session(), "identCode", phone, 1)
 					res.Data = map[string]interface{}{
 						"code": 0, //已发送短信验证码
 					}
@@ -150,7 +150,7 @@ func (c *CaptchaStruct) Check() {
 		notSendFlag := c.GetString("notSend")
 		if notSendFlag == "" {
 			jy.SendPhoneIdentCode(c.Request, config.Config.SmsServiceRpc, phone, c.Session(), fmt.Sprintf(captcha.SendCodeKey, capt.Key, phone))
-			go SendCodeByWUrl(c.Session(), capt.Key, phone)
+			go SendCodeByWUrl(c.Session(), capt.Key, phone, 2)
 			res.Data = map[string]interface{}{
 				"code": 0, //已发送短信验证码
 			}
@@ -160,8 +160,13 @@ func (c *CaptchaStruct) Check() {
 	c.ServeJson(r)
 }
 
-func SendCodeByWUrl(sess *httpsession.Session, captKey, phone string) {
+func SendCodeByWUrl(sess *httpsession.Session, captKey, phone string, mold int) {
 	key := fmt.Sprintf(captcha.SendCodeKey, captKey, phone)
+	if mold == 1 {
+		key = captKey
+	}
 	value := sess.Get(fmt.Sprintf("%sValue", key))
-	util.SendBot("https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=d80f43d3-30bd-444a-acc2-3e6089272040", fmt.Sprintf("手机号:%s \n短信验证码:%s", phone, value))
+	if value != nil {
+		util.SendBot("https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=d80f43d3-30bd-444a-acc2-3e6089272040", fmt.Sprintf("手机号:%s \n短信验证码:%s", phone, value))
+	}
 }

+ 1 - 1
src/jfw/modules/publicapply/src/go.mod

@@ -3,7 +3,7 @@ module jy/src/jfw/modules/publicapply/src
 go 1.20
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916
+	app.yhyue.com/moapp/jybase v0.0.0-20250226023342-bb6eba4bae2b
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
 	app.yhyue.com/moapp/jypkg v1.32.3
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec

+ 2 - 2
src/jfw/modules/publicapply/src/go.sum

@@ -15,8 +15,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJ
 app.yhyue.com/moapp/jybase v0.0.0-20230419121327-bedf77840ba6/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230901064756-2fc66b18db40/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
 app.yhyue.com/moapp/jybase v0.0.0-20231025021840-2f91c944ecdd/go.mod h1:Hv9U/7oHRucqH315Tr1+d03NCvS9mOKPfk8pwwlOIwQ=
-app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916 h1:uhzwulALpCu8gZN6O6V/jo9sbbgxQqLNX3dd4qN4Ick=
-app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916/go.mod h1:/HT/UZ4dKuUKAQqqKrzBBfIZ4vD56DPV4u2QyfH+kbU=
+app.yhyue.com/moapp/jybase v0.0.0-20250226023342-bb6eba4bae2b h1:xEHT29PtEejbUYib3x7wbJ0gTWJ6hh0ubctJy22niJo=
+app.yhyue.com/moapp/jybase v0.0.0-20250226023342-bb6eba4bae2b/go.mod h1:/HT/UZ4dKuUKAQqqKrzBBfIZ4vD56DPV4u2QyfH+kbU=
 app.yhyue.com/moapp/jyfs v0.0.0-20231024061508-480c270480d4/go.mod h1:61hzZ3dZHXL28BNl8BOgZsvM2S5UVY5YFzOkEUPrSu4=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545 h1:+Lak4m1zgsigQloOsvp8AJ+0XeX/+PGp9QP550xlbBQ=
 app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545/go.mod h1:uFrsdUBFbETiJlEmr4PtJWPsZlUpPj2bHQRhryu6ggk=