Эх сурвалжийг харах

提交代码修改 增加打印

DESKTOP-HN5QP3V\Administrator 2 сар өмнө
parent
commit
4fc21a68f1

+ 2 - 3
app/service/subscribe.go

@@ -61,8 +61,6 @@ func (this *SubscribeOpenService) updateSubscribe(deviceId string, openId string
 }
 
 func (this *SubscribeOpenService) Open() error {
-	logger.Info("user sign subscribe device_id: %s  open_id: %s, module: %s", this.DeviceId, this.OpenId, this.Module)
-
 	subscribeOne := new(subscribe.Subscribe)
 	err := mgm.Coll(&subscribe.Subscribe{}).First(bson.M{"device_id": this.DeviceId}, subscribeOne)
 	if err != nil {
@@ -143,7 +141,7 @@ func (this *SubscribeSendService) Send() error {
 	for _, v := range list {
 		openIds = append(openIds, v.OpenId)
 	}
-	logger.Info("send openIds to SubscribeTask  %v", openIds)
+
 	task.SubscribeTask.Send(openIds, this.Module)
 	return err
 }
@@ -169,6 +167,7 @@ func (this *SubscribeTaskService) Task() error {
 
 	this.Timestamp = util.GetNowSecond() + 5*1000
 	if this.Status {
+		logger.Info("Subscribe task append key %s, device id %s duration %d", key, this.DeviceId, this.Timestamp/1000)
 		task.SubscribeTask.Append(key, this.DeviceId, this.Timestamp, this.Module)
 	} else {
 		task.SubscribeTask.Remove(key)

+ 2 - 0
app/task/subscribe.go

@@ -2,6 +2,7 @@ package task
 
 import (
 	"dsbqj-admin/pkg/helper/wechat"
+	"dsbqj-admin/pkg/logger"
 	"dsbqj-admin/pkg/sender"
 	"dsbqj-admin/pkg/util"
 	"sync"
@@ -46,6 +47,7 @@ func (this *Subscribe) Exec() {
 	this.Unlock()
 
 	for _, item := range needPush {
+		logger.Info("Subscribe exec neePush module %s, device id %s", item.Module, item.DeviceId)
 		this.sender.Send(&sender.SubscribeSend{
 			DeviceId: item.DeviceId,
 			Module:   item.Module,

+ 2 - 1
pkg/sender/subscribe.go

@@ -63,6 +63,7 @@ func (this *SubscribeSender) Start() {
 
 func (this *SubscribeSender) worker(id int) {
 	for task := range this.queue {
+		logger.Info("Subscribe worker(%d) do safe send module %s, openid_len %d device id %s", id, task.Module, len(task.OpenIds), task.DeviceId)
 		this.safeSend(task)
 	}
 }
@@ -109,7 +110,7 @@ func (this *SubscribeSender) SendHangupSubscribe(deviceId string) {
 
 func (this *SubscribeSender) SendAutoFightSubscribe(deviceId string) {
 	subscribeOne := new(subscribe.Subscribe)
-	err := mgm.Coll(&subscribe.Subscribe{}).First(bson.M{"device_id": deviceId, "modules.hangup.enabled": true}, subscribeOne)
+	err := mgm.Coll(&subscribe.Subscribe{}).First(bson.M{"device_id": deviceId, "modules.autofight.enabled": true}, subscribeOne)
 	if err != nil {
 		return
 	}