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

+ 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(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, 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(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, 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(l.Request, public.BaseMysql, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
+			} else if jy.SendPhoneIdentCode(l.Request, qutil.ObjToString(config.Sysconfig["smsServiceRpc"]), phone, l.Session()) {
 				return "y"
 			}
 		} else if reqType == "nextStep" {

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

@@ -3,9 +3,9 @@ module jy/src/jfw/modules/app/src
 go 1.20
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395
+	app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.31.5
+	app.yhyue.com/moapp/jypkg v1.31.8
 	bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20231226074509-942d80dc34eb
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67

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

@@ -17,13 +17,13 @@ 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-20241218100930-3aa57dbda395 h1:HcYhZ7lTC1yYNsLPyh/DV9sltKnpZ/BhHodGxaQzwiU=
-app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
+app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd h1:KlNtol66E3XSVSTCc6lqqfixj3trS9XwSYZInXDxkL0=
+app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 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.31.5 h1:v73crHYvfcFKrmPkUQYVmPra6PhlJjhLPUQ8eS40w7w=
-app.yhyue.com/moapp/jypkg v1.31.5/go.mod h1:vgYq53YPPj1dGDczZffFY5/YDWzRlI+dwLKMmUjgzHw=
+app.yhyue.com/moapp/jypkg v1.31.8 h1:nbdjgRCvtVLA/27lM9WqoNqhU1sIb7qcOO5WnxX3MGg=
+app.yhyue.com/moapp/jypkg v1.31.8/go.mod h1:bdHYv0sag7HhH89ft9nbOXHk21cNKes4xu1Ocpc021Y=
 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=

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

@@ -3,9 +3,9 @@ module jy/src/jfw/modules/publicapply/src
 go 1.20
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395
+	app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.31.5
+	app.yhyue.com/moapp/jypkg v1.31.8
 	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20241213060113-ac41966a58ec
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.21
 	github.com/ClickHouse/clickhouse-go/v2 v2.2.0

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

@@ -15,13 +15,13 @@ 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-20241218100930-3aa57dbda395 h1:HcYhZ7lTC1yYNsLPyh/DV9sltKnpZ/BhHodGxaQzwiU=
-app.yhyue.com/moapp/jybase v0.0.0-20241218100930-3aa57dbda395/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
+app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd h1:KlNtol66E3XSVSTCc6lqqfixj3trS9XwSYZInXDxkL0=
+app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 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.31.5 h1:v73crHYvfcFKrmPkUQYVmPra6PhlJjhLPUQ8eS40w7w=
-app.yhyue.com/moapp/jypkg v1.31.5/go.mod h1:vgYq53YPPj1dGDczZffFY5/YDWzRlI+dwLKMmUjgzHw=
+app.yhyue.com/moapp/jypkg v1.31.8 h1:nbdjgRCvtVLA/27lM9WqoNqhU1sIb7qcOO5WnxX3MGg=
+app.yhyue.com/moapp/jypkg v1.31.8/go.mod h1:bdHYv0sag7HhH89ft9nbOXHk21cNKes4xu1Ocpc021Y=
 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=

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

@@ -1,68 +1,67 @@
 package message
 
 import (
-    . "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/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"
+	"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(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},
-    })
+	phoneNum := this.GetString("phoneNum")
+	ok, errMsg := func() (bool, string) {
+		if !phoneReg.MatchString(phoneNum) {
+			return false, "手机格式不正确"
+		}
+		go func() {
+			jy.SendPhoneIdentCode(this.Request, 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 - 2
src/jfw/modules/subscribepay/src/go.mod

@@ -3,9 +3,9 @@ module jy/src/jfw/modules/subscribepay/src
 go 1.20
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20240626030750-115a3c0929fb
+	app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.31.5
+	app.yhyue.com/moapp/jypkg v1.31.8
 	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

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

@@ -15,13 +15,13 @@ 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-20240626030750-115a3c0929fb h1:LstR4tQbICqo2MO0A6za4rci4Y/lw+Nf898GlImARZM=
-app.yhyue.com/moapp/jybase v0.0.0-20240626030750-115a3c0929fb/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
+app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd h1:KlNtol66E3XSVSTCc6lqqfixj3trS9XwSYZInXDxkL0=
+app.yhyue.com/moapp/jybase v0.0.0-20250218064808-f3105db833dd/go.mod h1:XHNATN6tsJKHdCB0DbUtFdPPHXexTUFyB3RlO+lUUoM=
 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.31.5 h1:v73crHYvfcFKrmPkUQYVmPra6PhlJjhLPUQ8eS40w7w=
-app.yhyue.com/moapp/jypkg v1.31.5/go.mod h1:vgYq53YPPj1dGDczZffFY5/YDWzRlI+dwLKMmUjgzHw=
+app.yhyue.com/moapp/jypkg v1.31.8 h1:nbdjgRCvtVLA/27lM9WqoNqhU1sIb7qcOO5WnxX3MGg=
+app.yhyue.com/moapp/jypkg v1.31.8/go.mod h1:bdHYv0sag7HhH89ft9nbOXHk21cNKes4xu1Ocpc021Y=
 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=

+ 184 - 184
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(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
+	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, 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)
 }

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

@@ -50,7 +50,7 @@ func (this *ExceptionVerification) PhoneVerification() {
 			if phone == "" {
 				return nil, fmt.Errorf("未查询到手机号")
 			}
-			if !jy.SendPhoneIdentCode(this.Request, util.BaseMysql, config.Config.SmsServiceRpc, phone, this.Session(), virtualPhoneFlag) {
+			if !jy.SendPhoneIdentCode(this.Request, config.Config.SmsServiceRpc, phone, this.Session(), virtualPhoneFlag) {
 				return nil, fmt.Errorf("验证码发送频繁")
 			}
 		case "codeVerification":

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

@@ -114,7 +114,7 @@ func phoneStep_coll(r *http.Request, sess *httpsession.Session, step int, phone,
 		if !jy.PhoneReg.MatchString(phone) {
 			return "", fmt.Errorf("手机号格式不正确")
 		}
-		if !jy.SendPhoneIdentCode(r, util.BaseMysql, config.Config.SmsServiceRpc, phone, sess) {
+		if !jy.SendPhoneIdentCode(r, config.Config.SmsServiceRpc, phone, sess) {
 			return "", fmt.Errorf("验证码发送频繁")
 		}
 		return phone, nil

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

@@ -1151,7 +1151,7 @@ func phoneStep(r *http.Request, sess *httpsession.Session, step int, phone, code
 				return "", fmt.Errorf("手机号已被使用")
 			}
 		}
-		if !jy.SendPhoneIdentCode(r, util.BaseMysql, config.Config.SmsServiceRpc, phone, sess, fmt.Sprintf("%s_%s", customSendPhoneMsgSessionKey, sign)) {
+		if !jy.SendPhoneIdentCode(r, 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(t.Request, util.BaseMysql, config.Config.SmsServiceRpc, phoneNum, MsgCode)
+			jy.SendSMS(t.Request, config.Config.SmsServiceRpc, phoneNum, MsgCode)
 		}()
 		return true, ""
 	}()