Merge remote-tracking branch 'origin/feature/v4.10.9' into feature/v4.10.9

src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916/go.mod h1:/HT/UZ4d
 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.33.5 h1:XVzoi4POBZ8Tprr9Sk/HSC0CB3WcbPFwMpuu0o3B4jI=
-app.yhyue.com/moapp/jypkg v1.33.5/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.33.6 h1:KVxcO5SBK7da/xkiic+wlzohlUZF8BbvUmjiLLj6BPc=
+app.yhyue.com/moapp/jypkg v1.33.6/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 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=

src/jfw/front/jyshare.go

@@ -1,13 +1,16 @@
 package front
 
 import (
-	jutil "jy/src/jfw/jyutil"
-	"strings"
+    "github.com/gogf/gf/v2/util/gconv"
+    jutil "jy/src/jfw/jyutil"
+    "log"
+    "net/url"
+    "strings"
 
-	. "jy/src/jfw/public"
+    . "jy/src/jfw/public"
 
-	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
-	"app.yhyue.com/moapp/jybase/redis"
+    "app.yhyue.com/moapp/jybase/go-xweb/xweb"
+    "app.yhyue.com/moapp/jybase/redis"
 )
 
 type Jyshare struct {
@@ -22,27 +25,35 @@ func init() {
 
 //电脑版微信二维码
 func (m *Jyshare) Share(pid string) error {
-	//生成的pid中，有时候结尾会带有/,pid是接收不到的，所以pid直接从url中取
-	pid = strings.TrimLeft(m.Url(), "/front/share/")
-	var pngdata = []byte{}
-	pid = se.DecodeString(pid)
-	if ret, _ := redis.GetBytes("sso", "p_share_"+pid); ret != nil {
-		pngdata = *ret
-	} else {
-		//id, _ := strconv.Atoi(pid)
-		GetShareQRStr(pid)
-		tmp, err := redis.GetBytes("sso", "p_share_"+pid)
-		if err == nil {
-			pngdata = *tmp
-		}
-	}
-	w := m.ResponseWriter
-	w.Header().Set("Cache-Control", "no-cache,no-store,must-revalidate")
-	w.Header().Set("Prama", "no-cache")
-	w.Header().Set("Expires", "0")
-	w.Header().Set("Content-Type", "image/png")
-	w.Write(pngdata)
-	return nil
+    //生成的pid中，有时候结尾会带有/,pid是接收不到的，所以pid直接从url中取
+    urlEntity, _ := url.Parse(m.Url())
+    log.Println(urlEntity)
+    pid = strings.TrimLeft(urlEntity.Path, "/front/share/")
+    code := m.GetString("source")
+    var pngdata = []byte{}
+    pid = se.DecodeString(pid)
+    if ret, _ := redis.GetBytes("sso", "p_share_"+pid); ret != nil {
+        pngdata = *ret
+    } else {
+        //id, _ := strconv.Atoi(pid)
+        GetShareQRStr(pid)
+        tmp, err := redis.GetBytes("sso", "p_share_"+pid)
+        if err == nil {
+            pngdata = *tmp
+        }
+    }
+    if ret, _ := redis.GetBytes("sso", "p_shareData_"+pid); ret != nil && code != "" {
+        newData := gconv.Map(ret)
+        newData["RSource"] = code
+        redis.Put("sso", "p_shareData_"+pid, newData, 20*60)
+    }
+    w := m.ResponseWriter
+    w.Header().Set("Cache-Control", "no-cache,no-store,must-revalidate")
+    w.Header().Set("Prama", "no-cache")
+    w.Header().Set("Expires", "0")
+    w.Header().Set("Content-Type", "image/png")
+    w.Write(pngdata)
+    return nil
 }
 
 //取微信分享图片

src/jfw/front/login.go

@@ -231,7 +231,7 @@ func (l *Login) Login() error {
 							_id,
 							phone,
 							"phone",
-							"pc",
+							jutil.IsAndroidOrIOS(l.UserAgent()),
 							source,
 							"",
 							Rref,

src/jfw/front/otherAct.go

@@ -155,27 +155,27 @@ func (f *Front) Lpsubmit() error {
 			}
 			_id := mongodb.Save("user", data)
 			if _id != "" {
-                //用户日志保存
-                referer := f.Refer()
-                source := f.GetString("source")
-                var Rref = f.GetString("rref")
-                if f.GetSession("RReferer") != nil && util.ObjToString(f.GetSession("RReferer")) != "" {
-                    Rref = gconv.String(f.GetSession("RReferer"))
-                }
-                go jy.SaveUserLog(public.Mgo_Log,
-                    _id,
-                    phoneNum,
-                    "phone",
-                    jyutil.IsAndroidOrIOS(f.UserAgent()),
-                    source,
-                    "",
-                    Rref,
-                    util.ObjToString(f.GetSession("RSource")),
-                    util.GetIp(f.Request),
-                    f.UserAgent(),
-                    "",
-                    "",
-                    referer)
+				//用户日志保存
+				referer := f.Refer()
+				source := f.GetString("source")
+				var Rref = f.GetString("rref")
+				if f.GetSession("RReferer") != nil && util.ObjToString(f.GetSession("RReferer")) != "" {
+					Rref = gconv.String(f.GetSession("RReferer"))
+				}
+				go jy.SaveUserLog(public.Mgo_Log,
+					_id,
+					phoneNum,
+					"phone",
+					jyutil.IsAndroidOrIOS(f.UserAgent()),
+					source,
+					"",
+					Rref,
+					util.ObjToString(f.GetSession("RSource")),
+					util.GetIp(f.Request),
+					f.UserAgent(),
+					"",
+					"",
+					referer)
 				deleteIdentSession(f.Session())
 				return "y"
 			}

src/jfw/front/pchelper.go

@@ -154,26 +154,27 @@ func (l *PcHelper) Login() error {
 						}
 						_id := mongodb.Save("user", data)
 						if _id != "" {
-                            referer := l.Refer()
-                            source := l.GetString("source")
-                            var Rref = l.GetString("rref")
-                            if l.GetSession("RReferer") != nil && util.ObjToString(l.GetSession("RReferer")) != "" {
-                                Rref = gconv.String(l.GetSession("RReferer"))
-                            }
-                            go jy.SaveUserLog(public.Mgo_Log,
+							referer := l.Refer()
+							source := l.GetString("source")
+							var Rref = l.GetString("rref")
+							if l.GetSession("RReferer") != nil && util.ObjToString(l.GetSession("RReferer")) != "" {
+								Rref = gconv.String(l.GetSession("RReferer"))
+							}
+							go jy.SaveUserLog(public.Mgo_Log,
                                 _id,
                                 phone,
                                 "phone",
-                                "pc",
+                                jyutil.IsAndroidOrIOS(l.UserAgent()),
                                 source,
                                 "",
                                 Rref,
                                 gconv.String(l.GetSession("RSource")),
                                 util.GetIp(l.Request),
                                 l.UserAgent(),
-                                "jybx",
                                 "",
-                                referer)
+                                "",
+                                referer,
+                            )
 							jy.ClearPhoneIdentSession(l.Session())
 							reToken = getUToken(mac, phone)
 							reOpenId = phone

src/jfw/modules/app/src/app/front/login.go

@@ -364,7 +364,7 @@ func (l *Login) Login() error {
                             phone,
                             "phone",
                             isAndroidOrIOS(l.Header("User-Agent")),
-                            qutil.If(strings.Contains(l.Request.Host, "h5"), "h5", "app").(string),,
+                            qutil.If(strings.Contains(l.Request.Host, "h5"), "h5", "app").(string),
                             "",
                             "",
                             gconv.String(data["s_rsource"]),
@@ -372,7 +372,8 @@ func (l *Login) Login() error {
                             l.Header("User-Agent"),
                             "",
                             "",
-                            referer)
+                            referer,
+                        )
                         if sourceLabel != "" {
                             go func() {
                                 redis.Del("limitation", fmt.Sprintf("firstVisitTagByWX_%s", l.Session().Id()))

src/jfw/modules/app/src/go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.33.5
+	app.yhyue.com/moapp/jypkg v1.33.6
 	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

src/jfw/modules/app/src/go.sum

@@ -22,8 +22,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250225094323-2f6419d0d916/go.mod h1:/HT/UZ4d
 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.33.5 h1:XVzoi4POBZ8Tprr9Sk/HSC0CB3WcbPFwMpuu0o3B4jI=
-app.yhyue.com/moapp/jypkg v1.33.5/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.33.6 h1:KVxcO5SBK7da/xkiic+wlzohlUZF8BbvUmjiLLj6BPc=
+app.yhyue.com/moapp/jypkg v1.33.6/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 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=
@@ -806,7 +806,6 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
 gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
 git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
-gitea.com/xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
 github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA=
@@ -1093,6 +1092,7 @@ github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg78
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
+github.com/go-xorm/xorm v0.7.9/go.mod h1:XiVxrMMIhFkwSkh96BW7PACl7UhLtx2iJIHMdmjh5sQ=
 github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
 github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
 github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg=

src/jfw/modules/subscribepay/src/go.mod

@@ -6,7 +6,7 @@ require (
 	app.yhyue.com/moapp/jyResourcesCenter v0.0.0-20250211075100-eb5d7cd299f8
 	app.yhyue.com/moapp/jybase v0.0.0-20250328063909-ff0268005add
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.33.5
+	app.yhyue.com/moapp/jypkg v1.33.6
 	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

src/jfw/modules/subscribepay/src/go.sum

@@ -22,8 +22,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250328063909-ff0268005add/go.mod h1:OEtMbsn7
 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.33.5 h1:XVzoi4POBZ8Tprr9Sk/HSC0CB3WcbPFwMpuu0o3B4jI=
-app.yhyue.com/moapp/jypkg v1.33.5/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.33.6 h1:KVxcO5SBK7da/xkiic+wlzohlUZF8BbvUmjiLLj6BPc=
+app.yhyue.com/moapp/jypkg v1.33.6/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 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=

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -1135,7 +1135,8 @@ func (this *UserAccount) WxUnBind() {
 				this.UserAgent(),
 				"",
 				"",
-				referer)
+				referer,
+			)
 
 			flushWxsession = true
 		}

src/jfw/modules/weixin/src/go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20250320080310-ef9b45180b29
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v1.33.5
+	app.yhyue.com/moapp/jypkg v1.33.6
 	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

src/jfw/modules/weixin/src/go.sum

@@ -20,8 +20,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20250320080310-ef9b45180b29/go.mod h1:/HT/UZ4d
 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.33.5 h1:XVzoi4POBZ8Tprr9Sk/HSC0CB3WcbPFwMpuu0o3B4jI=
-app.yhyue.com/moapp/jypkg v1.33.5/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
+app.yhyue.com/moapp/jypkg v1.33.6 h1:KVxcO5SBK7da/xkiic+wlzohlUZF8BbvUmjiLLj6BPc=
+app.yhyue.com/moapp/jypkg v1.33.6/go.mod h1:m/OMjugcf4XK5c/2mErxnXEyAZ+WNya8HP0x8jFGw4U=
 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=

src/jfw/modules/weixin/src/jrpc/jrpc.go

@@ -90,7 +90,7 @@ func (w *WeiXinRpc) SendBidOpenMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult) e
 	return nil
 }
 
-//数据报告订阅成功发送模板消息
+// 数据报告订阅成功发送模板消息
 func (w *WeiXinRpc) SendDataReportMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult) error {
 	_, err := w.Wwx.PostTemplateMessage(param.Openid, TPL_DATAREPORT_ID, param.Url,
 		weixin.TmplData{
@@ -111,7 +111,7 @@ func (w *WeiXinRpc) SendDataReportMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult
 	return nil
 }
 
-//发送保函消息
+// 发送保函消息
 func (w *WeiXinRpc) SendLOGApplyMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult) error {
 	_, err := w.Wwx.PostTemplateMessage(param.Openid, TPL_LOGAPPLY_ID, param.Url,
 		weixin.TmplData{
@@ -130,7 +130,7 @@ func (w *WeiXinRpc) SendLOGApplyMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult)
 	return nil
 }
 
-//发送年终活动消息
+// 发送年终活动消息
 func (w *WeiXinRpc) SendACTIVEApplyMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult) error {
 	*ret = "Y"
 	_, err := w.Wwx.PostTemplateMessage(param.Openid, TPL_ACTIVEAPPLY_ID, param.Url,
@@ -151,7 +151,7 @@ func (w *WeiXinRpc) SendACTIVEApplyMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResul
 	return nil
 }
 
-//取得JS接口参数
+// 取得JS接口参数
 func (w *WeiXinRpc) GetJSInterfaceParam(currenturl string, ret *[]string) (err error) {
 	timestamp := time.Now().Unix()
 	noncestr := util.Uuid(32)
@@ -165,11 +165,15 @@ func (w *WeiXinRpc) GetJSInterfaceParam(currenturl string, ret *[]string) (err e
 	return nil
 }
 
-/**生成分享二维码
+/*
+*生成分享二维码
 规则：自动生成二维码，存储并存储到redis中
+
 	开发在使用时，先查看redis，没有的话再调用此RPC方法
 	生成的二维码有效期为一个月
-**/
+
+*
+*/
 func (w *WeiXinRpc) GetShareQR(shareid uint32, ret *string) (err error) {
 	//构造自定义消息文本
 	var msg struct {
@@ -193,6 +197,7 @@ func (w *WeiXinRpc) GetShareQR(shareid uint32, ret *string) (err error) {
 	tmp := map[string]interface{}{}
 	json.Unmarshal(data, &tmp)
 	url := tmp["url"].(string)
+
 	//生二维码
 	r, _ := qr.Encode(url, qr.L)
 	pngdat := r.PNG()
@@ -207,7 +212,7 @@ func (w *WeiXinRpc) GetShareQR(shareid uint32, ret *string) (err error) {
 	return nil
 }
 
-//剑鱼标讯相关二维码
+// 剑鱼标讯相关二维码
 func (w *WeiXinRpc) GetShareQRStr(id string, ret *string) (err error) {
 	expire := 8640
 	if strings.Contains(id, "seal") {
@@ -227,7 +232,7 @@ func (w *WeiXinRpc) GetShareQRStr(id string, ret *string) (err error) {
 	return nil
 }
 
-//剑鱼标讯开放平台相关二维码
+// 剑鱼标讯开放平台相关二维码
 func (w *WeiXinRpc) Jyop_GetQrCode(id string, ret *string) (err error) {
 	expire := 8640
 	pngdat, err := tempQrCodeFromWx(id, expire, w.Wwx)
@@ -241,7 +246,7 @@ func (w *WeiXinRpc) Jyop_GetQrCode(id string, ret *string) (err error) {
 	return nil
 }
 
-//从微信获取临时二维码
+// 从微信获取临时二维码
 func tempQrCodeFromWx(id string, expire int, w *weixin.Weixin) ([]byte, error) {
 	//构造自定义消息文本
 	var msg struct {
@@ -273,7 +278,7 @@ func tempQrCodeFromWx(id string, expire int, w *weixin.Weixin) ([]byte, error) {
 	return r.PNG(), nil
 }
 
-//发送管理员通知
+// 发送管理员通知
 func (w *WeiXinRpc) SendFeedbackNotifyMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult) error {
 	_, err := w.Wwx.PostTemplateMessage(param.Openid, TPL_MANAGERNOTIFY_ID, param.Url,
 		weixin.TmplData{
@@ -290,7 +295,7 @@ func (w *WeiXinRpc) SendFeedbackNotifyMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcRe
 	return nil
 }
 
-//取得预生成订单编号，我们的系统要控制下，别订单重复了
+// 取得预生成订单编号，我们的系统要控制下，别订单重复了
 func (w *WeiXinRpc) GetPrepayId(param map[string]string, res *[]byte) error {
 	defer util.Catch()
 	attachmsg := param["attachmsg"]
@@ -371,7 +376,7 @@ func (w *WeiXinRpc) GetPrepayId(param map[string]string, res *[]byte) error {
 	return nil
 }
 
-//最通用的发送模板消息
+// 最通用的发送模板消息
 func (w *WeiXinRpc) SendTmplMsg(param *qrpc.WxTmplMsg, ret *qrpc.RpcResult) error {
 	tmplData := make(weixin.TmplData)
 	for k, v := range param.TmplData {
@@ -400,7 +405,7 @@ func (w *WeiXinRpc) SendTmplMsg(param *qrpc.WxTmplMsg, ret *qrpc.RpcResult) erro
 	return nil
 }
 
-//自定义模板消息
+// 自定义模板消息
 func (w *WeiXinRpc) SendCustomTplMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult) error {
 	_, err := w.Wwx.PostTemplateMessage(param.Openid, param.TplId, param.Url,
 		weixin.TmplData{
@@ -419,7 +424,7 @@ func (w *WeiXinRpc) SendCustomTplMsg(param *qrpc.NotifyMsg, ret *qrpc.RpcResult)
 	return nil
 }
 
-//自定义消息
+// 自定义消息
 func (w *WeiXinRpc) SendCustomMsg(p *[]byte, ret *string) error {
 	var d map[string]interface{}
 	err := json.Unmarshal(*p, &d)
@@ -444,7 +449,7 @@ func (w *WeiXinRpc) SendCustomMsg(p *[]byte, ret *string) error {
 	return nil
 }
 
-//支付订单关闭
+// 支付订单关闭
 func (w *WeiXinRpc) CloseOrder(param map[string]string, res *bool) error {
 	defer util.Catch()
 	appid := param["appid"]
@@ -492,7 +497,7 @@ func (w *WeiXinRpc) CloseOrder(param map[string]string, res *bool) error {
 	return nil
 }
 
-//分销系统分享相关二维码
+// 分销系统分享相关二维码
 func (w *WeiXinRpc) JyDis_GetQrCode(id string, ret *string) (err error) {
 	pngdat, err := permQrCodeFromWx(id, w.Wwx)
 	if err != nil {
@@ -505,7 +510,7 @@ func (w *WeiXinRpc) JyDis_GetQrCode(id string, ret *string) (err error) {
 	return nil
 }
 
-//从微信获取永久str二维码
+// 从微信获取永久str二维码
 func permQrCodeFromWx(id string, w *weixin.Weixin) ([]byte, error) {
 	//构造自定义消息文本
 	var msg struct {
@@ -536,7 +541,7 @@ func permQrCodeFromWx(id string, w *weixin.Weixin) ([]byte, error) {
 	return r.PNG(), nil
 }
 
-//剑鱼标讯获取未关注用户得unionid
+// 剑鱼标讯获取未关注用户得unionid
 func (w *WeiXinRpc) GetUnionid(openid string, unionid *string) (err error) {
 	bs, err := w.Wwx.GetUserInfo(openid)
 	if err != nil {

src/jfw/modules/weixin/src/wx/wx.go

@@ -34,9 +34,9 @@ import (
 var (
 	Mux *Weixin
 	// 锁
-	sharelock *sync.Mutex = &sync.Mutex{}
-	MSPOOL                = 20
-	MapScans              = make([]*MapScan, MSPOOL)
+	sharelock = &sync.Mutex{}
+	MSPOOL    = 20
+	MapScans  = make([]*MapScan, MSPOOL)
 	// 微信菜单 click；点击菜单 回复文案；
 	menuClickReplyTextMap map[string]string
 	//time.sleep 用户来源信息收集延时时间
@@ -305,6 +305,7 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 		if isJyopUser {
 			newUser["s_registersource"] = "openplatform"
 		}
+
 		newUser["s_rsource"] = RSource //新用户来源 例如SEM SEO
 		if CSource != "" {
 			newUser["s_newsource"] = CSource
@@ -377,19 +378,25 @@ func saveUser(u *UserInfo, source, pre, RSource, CSource string) (bool, string,
 		if _id != "" {
 			go tools.QRCodeRecord(source, ACTION_SUB)
 			//用户中台存储  开始
-			// formdata := map[string]interface{}{
-			// 	"appid":    "10000",
-			// 	"headimg":  u.HeadImageUrl,
-			// 	"nickname": util.If(u.Nickname != "", u.Nickname, newUser["s_jyname"]),
-			// 	"s_openid": u.OpenId,
-			// 	"unionid":  u.UnionId,
-			// }
-			// usercenter.AddBaseUser(tools.MQFW, util.ObjToString(config.Sysconfig["userCenterApi"]), _id, formdata, &http.Cookie{})
-			jy.SaveUserLog(tools.MGLOG, _id, "", "wx", "wx", "wx", u.OpenId, "", RSource, "", "", gconv.String(util.If(RSource == "jyzbw", "jyzbw", "jybx")), gconv.String(util.If(gconv.String(newUser["s_platform"]) == "pc", "wx_pc_scan", "wx_other")), "", map[string]interface{}{
-				"subscribe_scene": u.Subscribe_scene,
-				"qr_scene":        u.Qr_scene,
-				"qr_scene_str":    u.Qr_scene_str,
-			})
+
+			jy.SaveUserLog(tools.MGLOG,
+				_id,
+				"",
+				"wx",
+				"",
+				gconv.String(newUser["s_platform"]),
+				u.OpenId,
+				"",
+				RSource,
+				"",
+				"",
+				"",
+				gconv.String(util.If(gconv.String(newUser["s_platform"]) == "pc", "wx_pc_scan", "wx_other")),
+				"", map[string]interface{}{
+					"subscribe_scene": u.Subscribe_scene,
+					"qr_scene":        u.Qr_scene,
+					"qr_scene_str":    u.Qr_scene_str,
+				})
 			nickname := util.ObjToString(util.If(u.Nickname != "", u.Nickname, newUser["s_jyname"]))
 			if ok := jy.AddUser(tools.MQFW, _id, pb.UserAddReq{
 				Appid:    "10000",

src/web/staticres/common-module/order-list/js/order-list.js

@@ -2613,14 +2613,14 @@ var vm = new Vue({
     getBidCreditReportInfo: function (order) {
 
       var entName = {
-        label: '产品类型：',
+        label: '产品类型',
         split: '：',
         text: order.product_type
       }
       var teamCount = {
         label: '报告下载份数',
         split: '：',
-        text: order.buy_count + '份'
+        text: '1份'
       }
 
       return [entName, teamCount]