Merge branch 'master' into feature/v4.8.40

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

@@ -24,9 +24,9 @@ import (
 
 	"app.yhyue.com/moapp/jypkg/public"
 
+	"app.yhyue.com/moapp/jybase/dchest/captcha"
 	"app.yhyue.com/moapp/jybase/go-xweb/httpsession"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
-	"app.yhyue.com/moapp/jybase/dchest/captcha"
 	"go.mongodb.org/mongo-driver/bson"
 )
 
@@ -240,17 +240,17 @@ func (l *Login) Login() error {
 							//邀请新用户 调用队列
 							if redisDisArr := strings.Split(redisDis, "##"); len(redisDisArr) > 1 {
 								fromUserId := redisDisArr[1]
-								err := jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1)
+								err := jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invite, fromUserId)
 								}
-								err = jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jywx_subscribe_invited, _id, jy.Jyapp_node1)
+								err = jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jywx_subscribe_invited, _id, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invited, _id)
 								}
 							}
 						} else {
-							err := jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jyapp_phone_register, _id, jy.Jyapp_node1)
+							err := jy.Publish(public.Mgo_Log, addr, nsq_topic, jy.Jyapp_phone_register, _id, jy.Jyapp_node1, nil)
 							if err != nil {
 								log.Println("nsq队列写入失败-->", err, jy.Jyapp_phone_register, _id)
 							}
@@ -506,17 +506,17 @@ func (l *Login) Register() error {
 							//邀请新用户 调用队列
 							if redisDisArr := strings.Split(redisDis, "##"); len(redisDisArr) > 1 {
 								fromUserId := redisDisArr[1]
-								err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1)
+								err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invite, fromUserId)
 								}
-								err = jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invited, saveid, jy.Jyapp_node1)
+								err = jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invited, saveid, jy.Jyapp_node1, nil)
 								if err != nil {
 									log.Println("nsq队列写入失败-->", err, jy.Jywx_subscribe_invited, saveid)
 								}
 							}
 						} else {
-							err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jyapp_phone_register, saveid, jy.Jyapp_node1)
+							err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jyapp_phone_register, saveid, jy.Jyapp_node1, nil)
 							if err != nil {
 								log.Println("nsq队列写入失败-->", err, jy.Jyapp_phone_register, saveid)
 							}
@@ -692,17 +692,17 @@ func (l *Login) WxLogin() {
 					redisDis := redis.GetStr("other", "DIS_"+disWord[1:])
 					if redisDisArr := strings.Split(redisDis, "##"); len(redisDisArr) > 1 {
 						fromUserId := redisDisArr[1]
-						err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1)
+						err := jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invite, fromUserId, jy.Jyapp_node1, nil)
 						if err != nil {
 							log.Println("nsq队列写入失败-->", jy.Jywx_subscribe_invite, fromUserId)
 						}
-						err = jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invited, _id, jy.Jyapp_node1)
+						err = jy.Publish(public.Mgo_Log, addr, topic, jy.Jywx_subscribe_invited, _id, jy.Jyapp_node1, nil)
 						if err != nil {
 							log.Println("nsq队列写入失败-->", jy.Jywx_subscribe_invited, _id)
 						}
 					}
 				} else {
-					err = jy.Publish(public.Mgo_Log, addr, topic, jy.Jyapp_wx_register, _id, jy.Jyapp_node1)
+					err = jy.Publish(public.Mgo_Log, addr, topic, jy.Jyapp_wx_register, _id, jy.Jyapp_node1, nil)
 					if err != nil {
 						log.Println("nsq队列写入失败-->", jy.Jyapp_wx_register, _id)
 					}

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

@@ -197,7 +197,7 @@ func (s *Short) Article(stype, id string) error {
 				key := fmt.Sprintf("integral_article_%s_%s_%s", article_id, belongUserId, userId)
 				if redis.Incr("other", key) == 1 {
 					redis.SetExpire("other", key, 60*60*24)
-					err := jy.Publish(public.Mgo_Log, config.Sysconfig["nsq"].(string), config.Sysconfig["nsq_topic"].(string), jy.Jyweb_article_open, belongUserId, jy.Jyapp_node1)
+					err := jy.Publish(public.Mgo_Log, config.Sysconfig["nsq"].(string), config.Sysconfig["nsq_topic"].(string), jy.Jyweb_article_open, belongUserId, jy.Jyapp_node1, nil)
 					if err != nil {
 						log.Println("nsq队列写入失败-->", jy.Jyweb_article_open, belongUserId)
 					}

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

@@ -3,9 +3,9 @@ module jy/src/jfw/modules/app/src
 go 1.18
 
 require (
-	app.yhyue.com/moapp/jybase v0.0.0-20230614085041-f8f20842d5cb
+	app.yhyue.com/moapp/jybase v0.0.0-20230717034208-cbc04d86e255
 	app.yhyue.com/moapp/jylog v0.0.0-20230522075550-05d7230ca545
-	app.yhyue.com/moapp/jypkg v0.0.0-20230630032557-eac72f240f41
+	app.yhyue.com/moapp/jypkg v0.0.0-20230717054133-628d34c45f63
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.3.1

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

@@ -5,12 +5,12 @@ app.yhyue.com/moapp/jyMarketing v0.0.2-0.20230304035551-21bb1eedf547/go.mod h1:J
 app.yhyue.com/moapp/jyPoints v1.1.1/go.mod h1:SvP8p5L3jGrejHiH2LXfgCg/NPlFiKBC5Yd0gsI12FU=
 app.yhyue.com/moapp/jybase v0.0.0-20220427020729-974c1a148186/go.mod h1:qNRA0sHuYqcLoYoP8irpaWnW9YsXixe6obBIkwaXpD0=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jybase v0.0.0-20230614085041-f8f20842d5cb h1:fT7FIKElKjkRHTmDxXPeNr5LWe2RmyJU+5aod1nptek=
-app.yhyue.com/moapp/jybase v0.0.0-20230614085041-f8f20842d5cb/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
+app.yhyue.com/moapp/jybase v0.0.0-20230717034208-cbc04d86e255 h1:Rpmx9yegBP4Fadn5nt5f4vKO6qm1QVEHFFffwYC5WDk=
+app.yhyue.com/moapp/jybase v0.0.0-20230717034208-cbc04d86e255/go.mod h1:D40Ae0rQilH8Hc5o2Vtt04Tjh/DNEFpcS3/WkJMPJb8=
 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 v0.0.0-20230630032557-eac72f240f41 h1:AQUCZbYnB6lddbJGvOsWwWKkJnQGh4atRtYHqXT0Kdc=
-app.yhyue.com/moapp/jypkg v0.0.0-20230630032557-eac72f240f41/go.mod h1:wbDWBpLODtGhkQw4dCShvmRr6G8CazuW8kWq42paQOM=
+app.yhyue.com/moapp/jypkg v0.0.0-20230717054133-628d34c45f63 h1:5yUOGdOqlPhXhmL/6cc2iVLge3jS4QTHsS2ZPQumo+Q=
+app.yhyue.com/moapp/jypkg v0.0.0-20230717054133-628d34c45f63/go.mod h1:IhLQNbNHvSqEm8ZbkFHog5df3Dyng98mvYgT2lvLqqI=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a98c01ab0e h1:h+VEI3o1qC0jeCzkFGTrLI4f27cfa/W/y+0sXokWMgE=

src/web/staticres/frontRouter/pc/mesgCenter/js/index-pc.js

@@ -133,6 +133,7 @@ var vm = new Vue({
           message.checkMessage()
           if (url) {
             location.href = url
+            window.__canNextReadMessageStatus = false
           }
         }
       })
@@ -149,12 +150,17 @@ var vm = new Vue({
       })
     },
     linked(id, url, str, num, type, msgLogid) {
+      if (window.__canNextReadMessageStatus) {
+        return
+      }
+      window.__canNextReadMessageStatus = true
       this.clickMesg(msgLogid)
       if (str == 0) {
         this.readed(id, type, url)
       } else {
         if (url) {
           location.href = url
+          window.__canNextReadMessageStatus = false
         }
       }
     }

src/web/staticres/js/message.js

@@ -12,6 +12,7 @@ function topRead(ids, type, url) {
         message.checkOpened()
         if (url) {
             window.location.href = url
+            window.__canNextReadMessageStatus = false
         }
       }
     })
@@ -30,12 +31,17 @@ function clickMesge(msgLogid) {
 }
 // 消息悬浮窗列表跳转详情页
 function linked (ids, url, num, type, msgLogid) {
+    if (window.__canNextReadMessageStatus) {
+      return
+    }
+    window.__canNextReadMessageStatus = true
     this.clickMesge(msgLogid)
     if (num == 0) {
         topRead(ids, type, url)
     } else {
         if (url) {
             window.location.href = url
+            window.__canNextReadMessageStatus = false
         }
     }
 }
@@ -43,7 +49,7 @@ function Message() {
     this.isOpened = false
     this.imgArrs = ['quanbu', 'huodong', 'fuwu', 'dingyue', 'xiangmu', 'qiye', 'fenxi', 'xitong']
     this.messageInfoList = {}
-    
+
     // 初始化
     this.init = function () {
         if (!loginflag) return
@@ -126,7 +132,7 @@ function Message() {
             }
         })
     }
-    
+
     // 消息浮窗显示隐藏
     this.openedChange = function () {
         var isOpened = this.isOpened
@@ -143,7 +149,7 @@ function Message() {
             })
         }
     }
-    
+
     // 渲染浮窗消息列表数据
     this.renderMessageList = function () {
         var imgArrs = this.imgArrs