Bläddra i källkod

短信发送黑名单

wangshan 5 månader sedan
förälder
incheckning
5cdbdfe387

+ 2 - 2
src/go.mod

@@ -6,8 +6,8 @@ require (
 	app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230308011651-df591d32df88
 	app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.27.8
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20
+	app.yhyue.com/moapp/jypkg v1.31.5
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/bwmarrin/snowflake v0.3.0
 	github.com/fsnotify/fsnotify v1.7.0

+ 4 - 4
src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395/go.mod h1:XHNATN6t
 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=
-app.yhyue.com/moapp/jypkg v1.27.8 h1:zgQUNAcPAUz0pH66x648+biL435NJVMVpNY4W3VZLMA=
-app.yhyue.com/moapp/jypkg v1.27.8/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
+app.yhyue.com/moapp/jypkg v1.31.5 h1:v73crHYvfcFKrmPkUQYVmPra6PhlJjhLPUQ8eS40w7w=
+app.yhyue.com/moapp/jypkg v1.31.5/go.mod h1:vgYq53YPPj1dGDczZffFY5/YDWzRlI+dwLKMmUjgzHw=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -41,8 +41,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3 h1:lk3he0hY+8VK1/Hm+ZSlc
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20 h1:CbqAy+9NFPMApXgLa77KM3Rnb+DOKsY2JLP8VAKfEFY=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20/go.mod h1:KANYV7j5Xw6KQPk+o4rOftQF8mTEv198xZGiTRrkyU8=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21 h1:XWTYzWEOPedM0CNjtqya+VTpYQl5rL4MMmlqmuasIK0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21/go.mod h1:UB56iVLBV0H06VbTdXychssHSaGoqZMThfOuXZyrUAs=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

+ 1 - 1
src/jfw/front/applysub.go

@@ -122,7 +122,7 @@ func (a *Applysub) SendMsg() error {
 				session.Set("phoneNum", phoneNum)
 				session.Set("lastSendMsgTime", time.Now().Unix())
 				go func() {
-					jy.SendSMS(util.ObjToString(config.Sysconfig["smsServiceRpc"]), phoneNum, MsgCode)
+					jy.SendSMS(a.Request, public.BaseMysql, util.ObjToString(config.Sysconfig["smsServiceRpc"]), phoneNum, MsgCode)
 				}()
 				log.Println("手机号码", phoneNum, "验证码", MsgCode)
 			} else {

+ 2 - 2
src/jfw/front/login.go

@@ -139,7 +139,7 @@ func (l *Login) Login() error {
 				return -1, false
 			} else if tmp := l.GetSession("CheckCodeId"); tmp == nil || !captcha.VerifyString(tmp.(string), l.GetString("code")) {
 				return -2, false
-			} else if jy.SendPhoneIdentCode(qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return 1, false
 			}
 			return 0, false
@@ -340,7 +340,7 @@ func (l *Login) ForgetPwd() error {
 			//手机号是否已被注册
 			if !phoneIsExists(phone) {
 				return "phoneNotExists"
-			} else if jy.SendPhoneIdentCode(qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return "y"
 			}
 		} else if reqType == "nextStep" {

+ 1 - 1
src/jfw/front/otherAct.go

@@ -70,7 +70,7 @@ func (f *Front) SendMessage() {
 				session.Set("phoneNum", phoneNum)
 				session.Set("lastSendMsgTime", time.Now().Unix())
 				go func() {
-					jy.SendSMS(util.ObjToString(config.Sysconfig["smsServiceRpc"]), phoneNum, MsgCode)
+					jy.SendSMS(f.Request, public.BaseMysql, util.ObjToString(config.Sysconfig["smsServiceRpc"]), phoneNum, MsgCode)
 				}()
 				fmt.Println("手机号码", phoneNum, "验证码", MsgCode)
 			} else {

+ 1 - 1
src/jfw/front/pchelper.go

@@ -195,7 +195,7 @@ func (l *PcHelper) Login() error {
 				return -2
 			} else if !phoneReg.MatchString(phone) {
 				return -1
-			} else if jy.SendPhoneIdentCode(util.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, public.BaseMysql, util.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return 1
 			}
 			return 0

+ 3 - 3
src/jfw/modules/app/src/app/front/login.go

@@ -218,7 +218,7 @@ func (l *Login) Login() error {
 				return -2, -1
 			} else if !phoneReg.MatchString(phone) {
 				return -1, -1
-			} else if jy.SendPhoneIdentCode(qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return 1, -1
 			}
 			return 0, -1
@@ -634,7 +634,7 @@ func (l *Login) Register() error {
 			//手机号是否已被注册
 			if userIsExists(phone) {
 				return "phoneExists"
-			} else if jy.SendPhoneIdentCode(qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return "y"
 			}
 		} else if reqType == "nextStep" {
@@ -1013,7 +1013,7 @@ func (l *Login) ForgetPwd() error {
 					{"s_m_phone": phone}},
 			}) == 0 {
 				return "phoneNotExists"
-			} else if jy.SendPhoneIdentCode(qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return "y"
 			}
 		} else if reqType == "nextStep" {

+ 2 - 2
src/jfw/modules/app/src/go.mod

@@ -5,9 +5,9 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.27.8
+	app.yhyue.com/moapp/jypkg v1.31.5
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20231226074509-942d80dc34eb
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.7.0
 	github.com/pkg/errors v0.9.1

+ 4 - 4
src/jfw/modules/app/src/go.sum

@@ -22,8 +22,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395/go.mod h1:XHNATN6t
 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=
-app.yhyue.com/moapp/jypkg v1.27.8 h1:zgQUNAcPAUz0pH66x648+biL435NJVMVpNY4W3VZLMA=
-app.yhyue.com/moapp/jypkg v1.27.8/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
+app.yhyue.com/moapp/jypkg v1.31.5 h1:v73crHYvfcFKrmPkUQYVmPra6PhlJjhLPUQ8eS40w7w=
+app.yhyue.com/moapp/jypkg v1.31.5/go.mod h1:vgYq53YPPj1dGDczZffFY5/YDWzRlI+dwLKMmUjgzHw=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -43,8 +43,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3 h1:lk3he0hY+8VK1/Hm+ZSlc
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18 h1:aJNS24p6SOAOsCMvdOF0togsiO6HxmLIExVyTjog8Io=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18/go.mod h1:03bxckJBVCjal3uQ1loJmupbYHWRnaRC3V5LG4bgg6Y=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21 h1:XWTYzWEOPedM0CNjtqya+VTpYQl5rL4MMmlqmuasIK0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21/go.mod h1:UB56iVLBV0H06VbTdXychssHSaGoqZMThfOuXZyrUAs=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

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

@@ -5,9 +5,9 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.26.8
+	app.yhyue.com/moapp/jypkg v1.31.5
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/alibabacloud-go/darabonba-openapi/v2 v2.0.5

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

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395/go.mod h1:XHNATN6t
 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=
-app.yhyue.com/moapp/jypkg v1.26.8 h1:TC4MsRTYPpDxynVJA2ApM1VdldnYZcdhomumG9UyGgE=
-app.yhyue.com/moapp/jypkg v1.26.8/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
+app.yhyue.com/moapp/jypkg v1.31.5 h1:v73crHYvfcFKrmPkUQYVmPra6PhlJjhLPUQ8eS40w7w=
+app.yhyue.com/moapp/jypkg v1.31.5/go.mod h1:vgYq53YPPj1dGDczZffFY5/YDWzRlI+dwLKMmUjgzHw=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -41,8 +41,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3 h1:lk3he0hY+8VK1/Hm+ZSlc
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20 h1:CbqAy+9NFPMApXgLa77KM3Rnb+DOKsY2JLP8VAKfEFY=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.20/go.mod h1:KANYV7j5Xw6KQPk+o4rOftQF8mTEv198xZGiTRrkyU8=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21 h1:XWTYzWEOPedM0CNjtqya+VTpYQl5rL4MMmlqmuasIK0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21/go.mod h1:UB56iVLBV0H06VbTdXychssHSaGoqZMThfOuXZyrUAs=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=

+ 47 - 46
src/jfw/modules/publicapply/src/message/message.go

@@ -1,67 +1,68 @@
 package message
 
 import (
-	. "app.yhyue.com/moapp/jybase/api"
-	"jy/src/jfw/modules/publicapply/src/config"
-	qu "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
-	"regexp"
+    . "app.yhyue.com/moapp/jybase/api"
+    qu "app.yhyue.com/moapp/jybase/common"
+    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+    "jy/src/jfw/modules/publicapply/src/config"
+    "jy/src/jfw/modules/publicapply/src/db"
+    "regexp"
 
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
+    "app.yhyue.com/moapp/jybase/go-xweb/xweb"
 )
 
 type Message struct {
-	*xweb.Action
+    *xweb.Action
 
-	captcha      xweb.Mapper `xweb:"/captcha"`
-	checkCaptcha xweb.Mapper `xweb:"/checkCaptcha"`
+    captcha      xweb.Mapper `xweb:"/captcha"`
+    checkCaptcha xweb.Mapper `xweb:"/checkCaptcha"`
 }
 
 func init() {
-	xweb.AddAction(&Message{})
+    xweb.AddAction(&Message{})
 }
 
 var (
-	phoneReg = regexp.MustCompile("^[1][3-9][0-9]{9}$")
+    phoneReg = regexp.MustCompile("^[1][3-9][0-9]{9}$")
 )
 
 func (this *Message) Captcha() {
-	phoneNum := this.GetString("phoneNum")
-	ok, errMsg := func() (bool, string) {
-		if !phoneReg.MatchString(phoneNum) {
-			return false, "手机格式不正确"
-		}
-		go func() {
-			jy.SendPhoneIdentCode(config.Config.SmsServiceRpc, phoneNum, this.Session())
-		}()
-		return true, ""
-	}()
-	this.ServeJson(Result{
-		Error_msg:  errMsg,
-		Error_code: qu.IntAllDef(qu.If(ok, 0, -1), 0),
-		Data:       map[string]interface{}{"status": ok},
-	})
+    phoneNum := this.GetString("phoneNum")
+    ok, errMsg := func() (bool, string) {
+        if !phoneReg.MatchString(phoneNum) {
+            return false, "手机格式不正确"
+        }
+        go func() {
+            jy.SendPhoneIdentCode(this.Request, db.BaseMysql, config.Config.SmsServiceRpc, phoneNum, this.Session())
+        }()
+        return true, ""
+    }()
+    this.ServeJson(Result{
+        Error_msg:  errMsg,
+        Error_code: qu.IntAllDef(qu.If(ok, 0, -1), 0),
+        Data:       map[string]interface{}{"status": ok},
+    })
 }
 
 func (this *Message) CheckCaptcha() {
-	code := this.GetString("code")
-	phone := this.GetString("phoneNum")
-	ok, errMsg := func() (bool, string) {
-		if code == "" || phone == "" {
-			return false, "验证码错误"
-		}
-		newphone := jy.CheckPhoneIdent(this.Session(), code)
-		if newphone == "" {
-			return false, "验证码错误"
-		}
-		if newphone != phone {
-			return false, "验证码错误"
-		}
-		return true, ""
-	}()
-	this.ServeJson(Result{
-		Error_msg:  errMsg,
-		Error_code: qu.IntAllDef(qu.If(ok, 0, -1), 0),
-		Data:       map[string]interface{}{"status": ok},
-	})
+    code := this.GetString("code")
+    phone := this.GetString("phoneNum")
+    ok, errMsg := func() (bool, string) {
+        if code == "" || phone == "" {
+            return false, "验证码错误"
+        }
+        newphone := jy.CheckPhoneIdent(this.Session(), code)
+        if newphone == "" {
+            return false, "验证码错误"
+        }
+        if newphone != phone {
+            return false, "验证码错误"
+        }
+        return true, ""
+    }()
+    this.ServeJson(Result{
+        Error_msg:  errMsg,
+        Error_code: qu.IntAllDef(qu.If(ok, 0, -1), 0),
+        Data:       map[string]interface{}{"status": ok},
+    })
 }

+ 2 - 4
src/jfw/modules/subscribepay/src/go.mod

@@ -5,11 +5,11 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20240626030750-115a3c0929fb
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.27.8
+	app.yhyue.com/moapp/jypkg v1.31.5
 	bp.jydev.jianyu360.cn/BaseService/jyMicroservices v0.0.2
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230911091604-2faa31032743
-	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18
+	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.7.0
@@ -101,13 +101,11 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.15.0 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
-	github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
 	github.com/zeromicro/go-zero v1.6.4 // indirect
-	github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb // indirect
 	go.etcd.io/etcd/api/v3 v3.5.13 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.13 // indirect

+ 4 - 8
src/jfw/modules/subscribepay/src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20240626030750-115a3c0929fb/go.mod h1:XHNATN6t
 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=
-app.yhyue.com/moapp/jypkg v1.27.8 h1:zgQUNAcPAUz0pH66x648+biL435NJVMVpNY4W3VZLMA=
-app.yhyue.com/moapp/jypkg v1.27.8/go.mod h1:7f9hBxeF9RTp6vhTMZ24k4VLsn7HJHyAXOx6qzA3xOw=
+app.yhyue.com/moapp/jypkg v1.31.5 h1:v73crHYvfcFKrmPkUQYVmPra6PhlJjhLPUQ8eS40w7w=
+app.yhyue.com/moapp/jypkg v1.31.5/go.mod h1:vgYq53YPPj1dGDczZffFY5/YDWzRlI+dwLKMmUjgzHw=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161 h1:WGi4OEIoqw6NpNFGioUEBZnjK9aBa+xJqf/5WY+QyhM=
 app.yhyue.com/moapp/message v0.0.0-20231204024949-8c7145bfc161/go.mod h1:0Oj8SB4pVjdCLD28sy2zyM3hS0WHGpNuVcakLW43GmI=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=
@@ -42,8 +42,8 @@ bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3 h1:lk3he0hY+8VK1/Hm+ZSlc
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.1.3/go.mod h1:rRiGzKG4F/fmkNxXQCxrkxNWc8yf1SmW8qWCKfGIQSM=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220418072311-2062bed1e700/go.mod h1:KjcrxTzM96tBc6G4B8tlLBn1lrVy5UJYF8+eTdP4xAE=
 bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20220421015128-4a36f3eac5c5/go.mod h1:GT0QC4aaKDuXxAvaU4G02XjCc31TU1ctqBGqxQYOfC4=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18 h1:aJNS24p6SOAOsCMvdOF0togsiO6HxmLIExVyTjog8Io=
-bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.18/go.mod h1:03bxckJBVCjal3uQ1loJmupbYHWRnaRC3V5LG4bgg6Y=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21 h1:XWTYzWEOPedM0CNjtqya+VTpYQl5rL4MMmlqmuasIK0=
+bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21/go.mod h1:UB56iVLBV0H06VbTdXychssHSaGoqZMThfOuXZyrUAs=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw=
@@ -1724,8 +1724,6 @@ github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/tealeg/xlsx v1.0.5 h1:+f8oFmvY8Gw1iUXzPk+kz+4GpbDZPK1FhPiQRd+ypgE=
 github.com/tealeg/xlsx v1.0.5/go.mod h1:btRS8dz54TDnvKNosuAqxrM1QgN1udgk9O34bDCnORM=
-github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed h1:1+oKuPuDQ4AbN1WRMFxl9WQClH80GuZ81X/4FsOshjI=
-github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed/go.mod h1:WE5pZgSp3RwicfhHQmOJOexA0n4AKTzBqmnSu7R8Nbk=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
@@ -1774,8 +1772,6 @@ github.com/zeromicro/go-zero v1.5.5/go.mod h1:AGCspTFitHzYjl5ddAmYWLfdt341+Brhef
 github.com/zeromicro/go-zero v1.5.6/go.mod h1:FX2a2MQd5EvAYO7neJBm2GAmPU5XfFnj3JMM/qj+kpY=
 github.com/zeromicro/go-zero v1.6.4 h1:GvZXxxwl1Lby/gIHxHwN/ZNmXl1WFJa1DvoVgqgttUs=
 github.com/zeromicro/go-zero v1.6.4/go.mod h1:dQ39Zoz20/6x/SUhFXyEEg8lWjl+CO3dzg8Je2xG63Q=
-github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb h1:uWiILQloLUVdtPYr1ZZo2zqtlpzo4G8vUpglo/Fs2H8=
-github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb/go.mod h1:J3xKssoVdrwZ2E29fIox/EKxOZWimS7AZ4fOTCFkOLo=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
 go.etcd.io/etcd/api/v3 v3.5.2/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=

+ 183 - 183
src/jfw/modules/subscribepay/src/service/equityCode.go

@@ -1,212 +1,212 @@
 package service
 
 import (
-	"encoding/json"
-	"fmt"
-	"jy/src/jfw/modules/subscribepay/src/config"
-	"jy/src/jfw/modules/subscribepay/src/entity"
-	"jy/src/jfw/modules/subscribepay/src/util"
-	"log"
-	"strings"
-	"time"
+    "encoding/json"
+    "fmt"
+    "jy/src/jfw/modules/subscribepay/src/config"
+    "jy/src/jfw/modules/subscribepay/src/entity"
+    "jy/src/jfw/modules/subscribepay/src/util"
+    "log"
+    "strings"
+    "time"
 
-	. "app.yhyue.com/moapp/jybase/api"
-	qutil "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/dchest/captcha"
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
-	"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
+    . "app.yhyue.com/moapp/jybase/api"
+    qutil "app.yhyue.com/moapp/jybase/common"
+    "app.yhyue.com/moapp/jybase/dchest/captcha"
+    "app.yhyue.com/moapp/jybase/go-xweb/xweb"
+    "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
 )
 
 type EquityCode struct {
-	*xweb.Action
-	exchange xweb.Mapper `xweb:"/equityCode/exchange"` //权益码兑换
-	list     xweb.Mapper `xweb:"/equityCode/list"`     //权益码兑换列表
-	submit   xweb.Mapper `xweb:"/equityCode/submit"`   //新的权益码兑换-提交
-	captcha  xweb.Mapper `xweb:"/equityCode/captcha"`  //新的权益码兑换-图形验证码
+    *xweb.Action
+    exchange xweb.Mapper `xweb:"/equityCode/exchange"` //权益码兑换
+    list     xweb.Mapper `xweb:"/equityCode/list"`     //权益码兑换列表
+    submit   xweb.Mapper `xweb:"/equityCode/submit"`   //新的权益码兑换-提交
+    captcha  xweb.Mapper `xweb:"/equityCode/captcha"`  //新的权益码兑换-图形验证码
 }
 
 // Exchange 权益码兑换
 func (e *EquityCode) Exchange() {
-	defer qutil.Catch()
-	var userId string
-	r := func() *entity.FuncResult {
-		userId, _ = e.GetSession("userId").(string)
-		phone, _ := e.GetSession("phone").(string)
-		nickName, _ := e.GetSession("s_nickname").(string)
-		openId := qutil.ObjToString(e.GetSession("s_m_openid"))
-		//验证用户是否登录
-		if userId == "" {
-			return &entity.FuncResult{
-				Success: false,
-				Err:     fmt.Errorf("未登录"),
-				Data:    nil,
-			}
-		}
-		//验证码
-		equityCode := e.GetString("code")
-		msg, flag := entity.GetNewEquityCode(equityCode, userId, phone, nickName, openId, e.Request, e.Session()).Exchange()
-		return &entity.FuncResult{Success: flag, Err: fmt.Errorf(msg)}
-	}()
-	if r.Err != nil {
-		log.Printf("%s 权益码兑换异常 err:%v\n", userId, r.Err.Error())
-	}
-	e.ServeJson(r.Format())
+    defer qutil.Catch()
+    var userId string
+    r := func() *entity.FuncResult {
+        userId, _ = e.GetSession("userId").(string)
+        phone, _ := e.GetSession("phone").(string)
+        nickName, _ := e.GetSession("s_nickname").(string)
+        openId := qutil.ObjToString(e.GetSession("s_m_openid"))
+        //验证用户是否登录
+        if userId == "" {
+            return &entity.FuncResult{
+                Success: false,
+                Err:     fmt.Errorf("未登录"),
+                Data:    nil,
+            }
+        }
+        //验证码
+        equityCode := e.GetString("code")
+        msg, flag := entity.GetNewEquityCode(equityCode, userId, phone, nickName, openId, e.Request, e.Session()).Exchange()
+        return &entity.FuncResult{Success: flag, Err: fmt.Errorf(msg)}
+    }()
+    if r.Err != nil {
+        log.Printf("%s 权益码兑换异常 err:%v\n", userId, r.Err.Error())
+    }
+    e.ServeJson(r.Format())
 }
 
 // List  权益码兑换
 func (e *EquityCode) List() {
-	defer qutil.Catch()
-	var userId string
-	r := func() *entity.FuncResult {
-		userId, _ = e.GetSession("userId").(string)
-		phone, _ := e.GetSession("phone").(string)
-		nickName, _ := e.GetSession("s_nickname").(string)
-		openId := qutil.ObjToString(e.GetSession("s_m_openid"))
-		//验证用户是否登录
-		if userId == "" {
-			return &entity.FuncResult{
-				Success: false,
-				Err:     fmt.Errorf("未登录"),
-				Data:    nil,
-			}
-		}
-		//权益码
-		equityCode := e.GetString("code")
-		ers, err := entity.GetNewEquityCode(equityCode, userId, phone, nickName, openId, e.Request, e.Session()).ExchangeRecords()
-		log.Println(err, "res:", ers)
-		res := make(map[string]interface{})
-		if err == nil && ers != nil {
-			data, _ := json.Marshal(&ers)
-			json.Unmarshal(data, &res)
-		}
-		return &entity.FuncResult{Success: err == nil, Data: res}
-	}()
-	if r.Err != nil {
-		log.Printf("%s 权益码兑换异常 err:%v\n", userId, r.Err.Error())
-	}
-	e.ServeJson(r.Format())
+    defer qutil.Catch()
+    var userId string
+    r := func() *entity.FuncResult {
+        userId, _ = e.GetSession("userId").(string)
+        phone, _ := e.GetSession("phone").(string)
+        nickName, _ := e.GetSession("s_nickname").(string)
+        openId := qutil.ObjToString(e.GetSession("s_m_openid"))
+        //验证用户是否登录
+        if userId == "" {
+            return &entity.FuncResult{
+                Success: false,
+                Err:     fmt.Errorf("未登录"),
+                Data:    nil,
+            }
+        }
+        //权益码
+        equityCode := e.GetString("code")
+        ers, err := entity.GetNewEquityCode(equityCode, userId, phone, nickName, openId, e.Request, e.Session()).ExchangeRecords()
+        log.Println(err, "res:", ers)
+        res := make(map[string]interface{})
+        if err == nil && ers != nil {
+            data, _ := json.Marshal(&ers)
+            json.Unmarshal(data, &res)
+        }
+        return &entity.FuncResult{Success: err == nil, Data: res}
+    }()
+    if r.Err != nil {
+        log.Printf("%s 权益码兑换异常 err:%v\n", userId, r.Err.Error())
+    }
+    e.ServeJson(r.Format())
 }
 
 //新的权益码兑换接口
 func (e *EquityCode) Submit() {
-	reqType, _ := e.GetInt("reqType")
-	result := M{}
-	status := func() int {
-		if reqType == 1 { //发送登录短信验证码
-			phone := e.GetString("phone")
-			if !phoneReg.MatchString(phone) {
-				return -1 //手机号格式错误
-			} else if tmp := e.GetSession("EquityCode_CheckCodeId"); tmp == nil || !captcha.VerifyString(tmp.(string), e.GetString("code")) {
-				return -2 //图形验证码错误
-			} else if jy.SendPhoneIdentCode(config.Config.SmsServiceRpc, phone, e.Session()) {
-				return 1 //发送短信成功
-			}
-		} else if reqType == 2 {
-			sessVal := e.Session().GetMultiple()
-			phone := qutil.ObjToString(sessVal["identCodeKey"])
-			if jy.CheckPhoneIdent(e.Session(), e.GetString("identCode")) == "" { //验证码不正确
-				return -1 //短信验证码错误
-			}
-			equityCode := e.GetString("equityCode")
-			datas := util.ActivityMysql.SelectBySql(`SELECT a.id,a.userId,a.equityId,a.startTime,a.endTime,a.state,a.number,a.timeType,b.foreignCode,b.productName,c.province,c.name,e.name as eName FROM jyactivities.equity_record a
+    reqType, _ := e.GetInt("reqType")
+    result := M{}
+    status := func() int {
+        if reqType == 1 { //发送登录短信验证码
+            phone := e.GetString("phone")
+            if !phoneReg.MatchString(phone) {
+                return -1 //手机号格式错误
+            } else if tmp := e.GetSession("EquityCode_CheckCodeId"); tmp == nil || !captcha.VerifyString(tmp.(string), e.GetString("code")) {
+                return -2 //图形验证码错误
+            } else if jy.SendPhoneIdentCode(e.Request, util.BaseMysql, config.Config.SmsServiceRpc, phone, e.Session()) {
+                return 1 //发送短信成功
+            }
+        } else if reqType == 2 {
+            sessVal := e.Session().GetMultiple()
+            phone := qutil.ObjToString(sessVal["identCodeKey"])
+            if jy.CheckPhoneIdent(e.Session(), e.GetString("identCode")) == "" { //验证码不正确
+                return -1 //短信验证码错误
+            }
+            equityCode := e.GetString("equityCode")
+            datas := util.ActivityMysql.SelectBySql(`SELECT a.id,a.userId,a.equityId,a.startTime,a.endTime,a.state,a.number,a.timeType,b.foreignCode,b.productName,c.province,c.name,e.name as eName FROM jyactivities.equity_record a
 				INNER JOIN jyactivities.product b ON (a.equityCode=? AND a.parentCode=b.productCode)
 				inner join jyactivities.gift c on (a.giftCode=c.giftCode)
 				INNER JOIN jyactivities.equity d ON (a.equityId=d.id)
 				INNER JOIN jyactivities.enterprise e ON (d.entid=e.id)`, equityCode)
-			if datas == nil || len(*datas) == 0 {
-				log.Println(phone, equityCode, "兑换码不存在")
-				return -2 //兑换码不存在
-			}
-			if qutil.IntAll((*datas)[0]["state"]) != 1 {
-				log.Println(phone, equityCode, "兑换码已失效")
-				return -3 //兑换码已失效
-			} else if qutil.ObjToString((*datas)[0]["userId"]) != "" {
-				log.Println(phone, equityCode, "兑换码已被兑换")
-				return -4 //兑换码已被兑换
-			}
-			now := time.Now()
-			if startTime := qutil.ObjToString((*datas)[0]["startTime"]); startTime != "" {
-				if st, err := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local); err == nil {
-					//权益码兑换还未开始
-					if st.Unix() > now.Unix() {
-						log.Println(phone, equityCode, "兑换码兑换还未开始")
-						return -5 //兑换码兑换还未开始
-					}
-				}
-			}
-			//是否已过期
-			if endTime := qutil.ObjToString((*datas)[0]["endTime"]); endTime != "" {
-				if et, err := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local); err == nil {
-					if et.Unix() < now.Unix() {
-						log.Println(phone, equityCode, "兑换码已过期")
-						return -6 //兑换码已过期
-					}
-				}
-			}
-			foreignCode := qutil.ObjToString((*datas)[0]["foreignCode"])
-			if foreignCode == "" {
-				log.Println(phone, equityCode, "没有找到对应的小程序code")
-				return 0
-			}
-			foreignCodes := strings.Split(foreignCode, ",")
-			giftName := qutil.ObjToString((*datas)[0]["name"])
-			wh, args := qutil.WhArgs(foreignCodes)
-			mps := util.ActivityMysql.SelectBySql(`select a.name as aName,a.qrcode,b.name as bName,b.code as bCode from debris_product.miniprogram a 
+            if datas == nil || len(*datas) == 0 {
+                log.Println(phone, equityCode, "兑换码不存在")
+                return -2 //兑换码不存在
+            }
+            if qutil.IntAll((*datas)[0]["state"]) != 1 {
+                log.Println(phone, equityCode, "兑换码已失效")
+                return -3 //兑换码已失效
+            } else if qutil.ObjToString((*datas)[0]["userId"]) != "" {
+                log.Println(phone, equityCode, "兑换码已被兑换")
+                return -4 //兑换码已被兑换
+            }
+            now := time.Now()
+            if startTime := qutil.ObjToString((*datas)[0]["startTime"]); startTime != "" {
+                if st, err := time.ParseInLocation("2006-01-02 15:04:05", startTime, time.Local); err == nil {
+                    //权益码兑换还未开始
+                    if st.Unix() > now.Unix() {
+                        log.Println(phone, equityCode, "兑换码兑换还未开始")
+                        return -5 //兑换码兑换还未开始
+                    }
+                }
+            }
+            //是否已过期
+            if endTime := qutil.ObjToString((*datas)[0]["endTime"]); endTime != "" {
+                if et, err := time.ParseInLocation("2006-01-02 15:04:05", endTime, time.Local); err == nil {
+                    if et.Unix() < now.Unix() {
+                        log.Println(phone, equityCode, "兑换码已过期")
+                        return -6 //兑换码已过期
+                    }
+                }
+            }
+            foreignCode := qutil.ObjToString((*datas)[0]["foreignCode"])
+            if foreignCode == "" {
+                log.Println(phone, equityCode, "没有找到对应的小程序code")
+                return 0
+            }
+            foreignCodes := strings.Split(foreignCode, ",")
+            giftName := qutil.ObjToString((*datas)[0]["name"])
+            wh, args := qutil.WhArgs(foreignCodes)
+            mps := util.ActivityMysql.SelectBySql(`select a.name as aName,a.qrcode,b.name as bName,b.code as bCode from debris_product.miniprogram a
 					inner join debris_product.industry b on (a.code in (`+wh+`) and a.industry_code=b.code)`, args...)
-			if mps == nil || len(*mps) == 0 {
-				log.Println(phone, equityCode, "没有关联上对应的小程序code", foreignCode)
-				return 0
-			}
-			industryCode := qutil.ObjToString((*mps)[0]["bCode"])
-			industry := qutil.ObjToString((*mps)[0]["bName"])
-			//
-			disChannel := "x045"
-			items := util.ActivityMysql.SelectBySql(`select item_code from jianyu.dict_item where parent_code='x04' and item_name=?`, qutil.ObjToString((*datas)[0]["eName"]))
-			if items != nil && len(*items) > 0 {
-				disChannel = qutil.ObjToString((*items)[0]["item_code"])
-			}
-			res := entity.GetNewEquityCode(equityCode, "", phone, "", "", e.Request, e.Session()).Submit(foreignCodes, disChannel, qutil.ObjToString((*datas)[0]["productName"]), industryCode, qutil.IntAll((*datas)[0]["province"]), qutil.IntAll((*datas)[0]["number"]), qutil.IntAll((*datas)[0]["timeType"]))
-			if res == 1 {
-				result["name"] = giftName
-				list := []map[string]interface{}{}
-				for _, v := range *mps {
-					result["industry"] = industry
-					list = append(list, map[string]interface{}{
-						"qrcode": qutil.ObjToString(v["qrcode"]),
-						"name":   qutil.ObjToString(v["aName"]),
-					})
-				}
-				result["list"] = list
-			}
-			return res
-		}
-		return 0
-	}()
-	result["status"] = status
-	ads, ok := util.MQFW.FindOneByField("ad", map[string]interface{}{"s_code": "mini-app-mine-customer"}, `{"a_son":1}`)
-	if ok && ads != nil && len(*ads) > 0 {
-		a_sons, _ := (*ads)["a_son"].([]interface{})
-		if len(a_sons) > 0 {
-			a_son, _ := a_sons[0].(map[string]interface{})
-			result["kfcode"] = qutil.ObjToString(a_son["s_pic"])
-		}
-	}
-	e.ServeJson(Result{
-		Data: result,
-	})
+            if mps == nil || len(*mps) == 0 {
+                log.Println(phone, equityCode, "没有关联上对应的小程序code", foreignCode)
+                return 0
+            }
+            industryCode := qutil.ObjToString((*mps)[0]["bCode"])
+            industry := qutil.ObjToString((*mps)[0]["bName"])
+            //
+            disChannel := "x045"
+            items := util.ActivityMysql.SelectBySql(`select item_code from jianyu.dict_item where parent_code='x04' and item_name=?`, qutil.ObjToString((*datas)[0]["eName"]))
+            if items != nil && len(*items) > 0 {
+                disChannel = qutil.ObjToString((*items)[0]["item_code"])
+            }
+            res := entity.GetNewEquityCode(equityCode, "", phone, "", "", e.Request, e.Session()).Submit(foreignCodes, disChannel, qutil.ObjToString((*datas)[0]["productName"]), industryCode, qutil.IntAll((*datas)[0]["province"]), qutil.IntAll((*datas)[0]["number"]), qutil.IntAll((*datas)[0]["timeType"]))
+            if res == 1 {
+                result["name"] = giftName
+                list := []map[string]interface{}{}
+                for _, v := range *mps {
+                    result["industry"] = industry
+                    list = append(list, map[string]interface{}{
+                        "qrcode": qutil.ObjToString(v["qrcode"]),
+                        "name":   qutil.ObjToString(v["aName"]),
+                    })
+                }
+                result["list"] = list
+            }
+            return res
+        }
+        return 0
+    }()
+    result["status"] = status
+    ads, ok := util.MQFW.FindOneByField("ad", map[string]interface{}{"s_code": "mini-app-mine-customer"}, `{"a_son":1}`)
+    if ok && ads != nil && len(*ads) > 0 {
+        a_sons, _ := (*ads)["a_son"].([]interface{})
+        if len(a_sons) > 0 {
+            a_son, _ := a_sons[0].(map[string]interface{})
+            result["kfcode"] = qutil.ObjToString(a_son["s_pic"])
+        }
+    }
+    e.ServeJson(Result{
+        Data: result,
+    })
 }
 
 // 图片验证码
 func (e *EquityCode) Captcha() error {
-	id := captcha.NewLen(4) //此id为生成验证码的ID,并不是实际显示的数字,在提交校验时,需要根据此ID进行查询。
-	e.SetSession("EquityCode_CheckCodeId", id)
-	//校验时调用以下代码
-	//ccid,_:=c.GetSession("CheckCodeId").(string)
-	//captcha.VerifyString(ccid,"用户输入的校验码")//返回bool
-	w := e.ResponseWriter
-	w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
-	w.Header().Set("Pragma", "no-cache")
-	w.Header().Set("Expires", "0")
-	w.Header().Set("Content-Type", "image/png")
-	return captcha.WriteImage(w, id, 90, 30)
+    id := captcha.NewLen(4) //此id为生成验证码的ID,并不是实际显示的数字,在提交校验时,需要根据此ID进行查询。
+    e.SetSession("EquityCode_CheckCodeId", id)
+    //校验时调用以下代码
+    //ccid,_:=c.GetSession("CheckCodeId").(string)
+    //captcha.VerifyString(ccid,"用户输入的校验码")//返回bool
+    w := e.ResponseWriter
+    w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
+    w.Header().Set("Pragma", "no-cache")
+    w.Header().Set("Expires", "0")
+    w.Header().Set("Content-Type", "image/png")
+    return captcha.WriteImage(w, id, 90, 30)
 }

+ 2 - 2
src/jfw/modules/subscribepay/src/service/exceptionVerification.go

@@ -39,7 +39,7 @@ func (this *ExceptionVerification) PhoneVerification() {
 		case "sendIdentCode":
 			phone, _ := this.GetSession("phone").(string)
 			if phone == "" {
-				if res:= util.Compatible.Select( userId, `{"s_phone":1,"s_m_phone":1}`); res != nil && len(*res) > 0 {
+				if res := util.Compatible.Select(userId, `{"s_phone":1,"s_m_phone":1}`); res != nil && len(*res) > 0 {
 					if resPhone := qutil.ObjToString((*res)["s_phone"]); resPhone != "" {
 						phone = resPhone
 					} else if resPhone := qutil.ObjToString((*res)["s_m_phone"]); resPhone != "" {
@@ -50,7 +50,7 @@ func (this *ExceptionVerification) PhoneVerification() {
 			if phone == "" {
 				return nil, fmt.Errorf("未查询到手机号")
 			}
-			if !jy.SendPhoneIdentCode(config.Config.SmsServiceRpc, phone, this.Session(), virtualPhoneFlag) {
+			if !jy.SendPhoneIdentCode(this.Request, util.BaseMysql, config.Config.SmsServiceRpc, phone, this.Session(), virtualPhoneFlag) {
 				return nil, fmt.Errorf("验证码发送频繁")
 			}
 		case "codeVerification":

+ 8 - 7
src/jfw/modules/subscribepay/src/service/phoneCollent.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"jy/src/jfw/modules/subscribepay/src/config"
 	"jy/src/jfw/modules/subscribepay/src/util"
+	"net/http"
 	"time"
 
 	. "app.yhyue.com/moapp/jybase/api"
@@ -34,13 +35,13 @@ func (this *PhoneCollent) CollectPhone() {
 			return nil, fmt.Errorf("参数异常")
 		}
 		if step == 1 {
-			_, err := phoneStep_coll(this.Session(), step, phone, "")
+			_, err := phoneStep_coll(this.Request, this.Session(), step, phone, "")
 			if err != nil {
 				return nil, err
 			}
 		} else if step == 2 {
 			code := this.GetString("code")
-			phone, err := phoneStep_coll(this.Session(), step, phone, code)
+			phone, err := phoneStep_coll(this.Request, this.Session(), step, phone, code)
 			if err != nil {
 				return nil, err
 			}
@@ -79,7 +80,7 @@ func (this *PhoneCollent) NeedBind() {
 		if uid == "" {
 			return false
 		}
-		if person:= util.Compatible.Select( uid, `{"s_phone":1,"s_m_phone":1,"l_registedate":1}`); person != nil && len(*person) > 0  {
+		if person := util.Compatible.Select(uid, `{"s_phone":1,"s_m_phone":1,"l_registedate":1}`); person != nil && len(*person) > 0 {
 			s_phone := qutil.ObjToString((*person)["s_phone"])
 			if s_phone == "" {
 				s_phone = qutil.ObjToString((*person)["s_m_phone"])
@@ -104,16 +105,16 @@ func (this *PhoneCollent) NeedBind() {
 	this.ServeJson(NewResult(r, nil))
 }
 
-//手机号绑定流程
-//绑定=bind 更改=change
-func phoneStep_coll(sess *httpsession.Session, step int, phone, code string) (string, error) {
+// 手机号绑定流程
+// 绑定=bind 更改=change
+func phoneStep_coll(r *http.Request, sess *httpsession.Session, step int, phone, code string) (string, error) {
 	switch step {
 	case 1: //1 发送验证码
 		//校验手机号格式
 		if !jy.PhoneReg.MatchString(phone) {
 			return "", fmt.Errorf("手机号格式不正确")
 		}
-		if !jy.SendPhoneIdentCode(config.Config.SmsServiceRpc, phone, sess) {
+		if !jy.SendPhoneIdentCode(r, util.BaseMysql, config.Config.SmsServiceRpc, phone, sess) {
 			return "", fmt.Errorf("验证码发送频繁")
 		}
 		return phone, nil

+ 6 - 5
src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -10,6 +10,7 @@ import (
 	"jy/src/jfw/modules/subscribepay/src/entity"
 	"jy/src/jfw/modules/subscribepay/src/util"
 	"log"
+	"net/http"
 	"regexp"
 	"sort"
 	"strings"
@@ -556,7 +557,7 @@ func (this *UserAccount) Authentication(doType string) {
 			if phone == "" {
 				return nil, fmt.Errorf("未绑定手机号")
 			}
-			if _, err := phoneStep(this.Session(), step, phone, code, "auth"); err != nil {
+			if _, err := phoneStep(this.Request, this.Session(), step, phone, code, "auth"); err != nil {
 				return nil, err
 			}
 			//存入session 15分钟不用重复验证
@@ -601,7 +602,7 @@ func (this *UserAccount) PhoneBind() {
 			}
 		}
 		//发送验证码&校验验证码逻辑
-		phoneVerify, err := phoneStep(this.Session(), step, phone, code, "bind")
+		phoneVerify, err := phoneStep(this.Request, this.Session(), step, phone, code, "bind")
 		if err != nil {
 			return nil, err
 		}
@@ -782,7 +783,7 @@ func (this *UserAccount) PhoneChange() {
 			}
 		}
 		//发送验证码&校验验证码逻辑
-		phoneVerify, err := phoneStep(this.Session(), step, phone, code, "change")
+		phoneVerify, err := phoneStep(this.Request, this.Session(), step, phone, code, "change")
 		if err != nil {
 			return nil, err
 		}
@@ -1133,7 +1134,7 @@ func authenticationCheck(authStampInf interface{}) (bool, map[string]interface{}
 
 // 手机号绑定流程
 // 绑定=bind 更改=change
-func phoneStep(sess *httpsession.Session, step int, phone, code, sign string) (string, error) {
+func phoneStep(r *http.Request, sess *httpsession.Session, step int, phone, code, sign string) (string, error) {
 	switch step {
 	case 1: //1 发送验证码
 		//校验手机号格式
@@ -1150,7 +1151,7 @@ func phoneStep(sess *httpsession.Session, step int, phone, code, sign string) (s
 				return "", fmt.Errorf("手机号已被使用")
 			}
 		}
-		if !jy.SendPhoneIdentCode(config.Config.SmsServiceRpc, phone, sess, fmt.Sprintf("%s_%s", customSendPhoneMsgSessionKey, sign)) {
+		if !jy.SendPhoneIdentCode(r, util.BaseMysql, config.Config.SmsServiceRpc, phone, sess, fmt.Sprintf("%s_%s", customSendPhoneMsgSessionKey, sign)) {
 			return "", fmt.Errorf("验证码发送频繁")
 		}
 		incurKey := fmt.Sprintf(redisPhoneCaptchaFilter, qutil.ObjToString(sess.Get("mgoUserId")), time.Now().Day())

+ 1 - 1
src/jfw/modules/subscribepay/src/service/vipSubscribeTrial.go

@@ -134,7 +134,7 @@ func (t *TrialOrder) SendPhoneCaptcha() {
 		t.SetSession("subvip_trial_lastSend", time.Now().Unix())
 		log.Printf("%s 发送短信验证码 %s\n", t.GetSession("userId"), MsgCode)
 		go func() {
-			jy.SendSMS(config.Config.SmsServiceRpc, phoneNum, MsgCode)
+			jy.SendSMS(t.Request, util.BaseMysql, config.Config.SmsServiceRpc, phoneNum, MsgCode)
 		}()
 		return true, ""
 	}()