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