提交代码修改 订阅相关

app/service/subscribe.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"dsbqj-admin/app/task"
 	"dsbqj-admin/model/mongo/subscribe"
+	"dsbqj-admin/pkg/logger"
 	"dsbqj-admin/pkg/util"
 	"errors"
 	"fmt"
-	"github.com/goccy/go-json"
 	"github.com/kamva/mgm/v3"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -112,8 +112,8 @@ func (this *SubscribeCheckService) Check() error {
 }
 
 type SubscribeSendService struct {
-	Module string `json:"module"`
-	Data   string `json:"data"`
+	Module string   `json:"module"`
+	Data   []string `json:"data"`
 }
 
 func (this *SubscribeSendService) Send() error {
@@ -125,9 +125,7 @@ func (this *SubscribeSendService) Send() error {
 	}
 
 	if this.Module != "alliance" {
-		var deviceIds []string
-		json.Unmarshal([]byte(this.Data), &deviceIds)
-		filter["device_id"] = bson.M{"$in": deviceIds}
+		filter["device_id"] = bson.M{"$in": this.Data}
 	}
 
 	err := mgm.Coll(&subscribe.Subscribe{}).
@@ -142,7 +140,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
 }

pkg/sender/subscribe.go

@@ -7,8 +7,26 @@ import (
 	"github.com/kamva/mgm/v3"
 	"go.mongodb.org/mongo-driver/bson"
 	"log"
+	"os"
 )
 
+var templateMap = map[string]map[string]string{
+	"test": {
+		"hangup":     "0ByvFSV3B3U5-1XyvruRe7AMHAxiwQBFUL50lmoatCY",
+		"autofight":  "5rwMjLs6nVQ0SMtS0EAPEpmXZduOdEgSWbIjSNG5T7M",
+		"guildgame":  "e6D_r9_5tKNZK0cvM8fjzMXy9z1-aoNYQ9TSvAEuklU",
+		"alliance":   "e6D_r9_5tKNZK0cvM8fjzMXy9z1-aoNYQ9TSvAEuklU",
+		"warheavens": "e6D_r9_5tKNZK0cvM8fjzMXy9z1-aoNYQ9TSvAEuklU",
+	},
+	"product": {
+		"hangup":     "wAXZWcbt8Hkxmt2iZXR7ieiM1A_Mqt7cFU5ky6dZNMo",
+		"autofight":  "HbFIcVV78vbPr1uhe-tVAo8oQKv2jnljvPYRl-ktiFE",
+		"guildgame":  "Q6JBEqIPufrfmsZw-Wds2sdLATfJU2zA0ebpMR3W2F4",
+		"alliance":   "Q6JBEqIPufrfmsZw-Wds2sdLATfJU2zA0ebpMR3W2F4",
+		"warheavens": "Q6JBEqIPufrfmsZw-Wds2sdLATfJU2zA0ebpMR3W2F4",
+	},
+}
+
 type SubscribeSend struct {
 	DeviceId string
 	OpenIds  []string
@@ -86,7 +104,7 @@ func (this *SubscribeSender) SendHangupSubscribe(deviceId string) {
 	msg["thing3"] = make(map[string]string)
 	msg["thing3"]["value"] = "您的挂机奖励时长已满，请打开游戏领取"
 
-	this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, "wAXZWcbt8Hkxmt2iZXR7ieiM1A_Mqt7cFU5ky6dZNMo", msg)
+	this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, templateMap[os.Getenv("CHANNEL")]["hangup"], msg)
 }
 
 func (this *SubscribeSender) SendAutoFightSubscribe(deviceId string) {
@@ -101,7 +119,7 @@ func (this *SubscribeSender) SendAutoFightSubscribe(deviceId string) {
 	msg["thing1"] = make(map[string]string)
 	msg["thing1"]["value"] = "离线闯关提醒"
 
-	this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, "HbFIcVV78vbPr1uhe-tVAo8oQKv2jnljvPYRl-ktiFE", msg)
+	this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, templateMap[os.Getenv("CHANNEL")]["autofight"], msg)
 }
 
 func (this *SubscribeSender) SendGuildGameSubscribe(openIds []string) {
@@ -112,7 +130,7 @@ func (this *SubscribeSender) SendGuildGameSubscribe(openIds []string) {
 	msg["thing4"]["value"] = "门派攻防战"
 
 	for _, openId := range openIds {
-		this.wxHelper.SendWechatSubscribe(openId, "Q6JBEqIPufrfmsZw-Wds2sdLATfJU2zA0ebpMR3W2F4", msg)
+		this.wxHelper.SendWechatSubscribe(openId, templateMap[os.Getenv("CHANNEL")]["guildgame"], msg)
 	}
 }
 
@@ -124,7 +142,7 @@ func (this *SubscribeSender) SendWarHeavensSubscribe(openIds []string) {
 	msg["thing4"]["value"] = "三界争峰"
 
 	for _, openId := range openIds {
-		this.wxHelper.SendWechatSubscribe(openId, "Q6JBEqIPufrfmsZw-Wds2sdLATfJU2zA0ebpMR3W2F4", msg)
+		this.wxHelper.SendWechatSubscribe(openId, templateMap[os.Getenv("CHANNEL")]["alliance"], msg)
 	}
 }
 
@@ -136,6 +154,6 @@ func (this *SubscribeSender) SendAllianceSubscribe(openIds []string) {
 	msg["thing4"]["value"] = "决战诸仙"
 
 	for _, openId := range openIds {
-		this.wxHelper.SendWechatSubscribe(openId, "Q6JBEqIPufrfmsZw-Wds2sdLATfJU2zA0ebpMR3W2F4", msg)
+		this.wxHelper.SendWechatSubscribe(openId, templateMap[os.Getenv("CHANNEL")]["warheavens"], msg)
 	}
 }