소스 검색

feat:增加参数

wangchuanjin 2 년 전
부모
커밋
635d0488af
2개의 변경된 파일11개의 추가작업 그리고 11개의 파일을 삭제
  1. 10 10
      src/jfw/modules/app/src/app/front/login.go
  2. 1 1
      src/jfw/modules/app/src/app/front/shorturl.go

+ 10 - 10
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)
 					}

+ 1 - 1
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)
 					}