提交代码修改

app/service/subscribe.go

@@ -112,23 +112,24 @@ func (this *SubscribeCheckService) Check() error {
 }
 
 type SubscribeSendService struct {
-	DeviceId string `json:"device_id"`
-	Module   string `json:"module"`
-	Data     string `json:"data"`
+	Module string `json:"module"`
+	Data   string `json:"data"`
 }
 
 func (this *SubscribeSendService) Send() error {
 	var list = make([]*subscribe.Subscribe, 0)
 	// 更具deviceId 和 module 获取 需要推送的用户openid 列表
 	// data 应该是个json对象
-	var deviceIds []string
-	json.Unmarshal([]byte(this.Data), &deviceIds)
-
 	filter := bson.M{
-		"device_id":                           bson.M{"$in": deviceIds},
 		"modules." + this.Module + ".enabled": true,
 	}
 
+	if this.Module != "alliance" {
+		var deviceIds []string
+		json.Unmarshal([]byte(this.Data), &deviceIds)
+		filter["device_id"] = bson.M{"$in": deviceIds}
+	}
+
 	err := mgm.Coll(&subscribe.Subscribe{}).
 		SimpleFind(&list, filter)
 
@@ -150,6 +151,7 @@ type SubscribeTaskService struct {
 	DeviceId  string `json:"device_id"`
 	Module    string `json:"module"`
 	Timestamp int64  `json:"timestamp"`
+	Status    bool   `json:"status"`
 }
 
 func (this *SubscribeTaskService) Task() error {
@@ -165,7 +167,11 @@ func (this *SubscribeTaskService) Task() error {
 	}
 
 	this.Timestamp = util.GetNowSecond() + 5*1000
-	task.SubscribeTask.Append(key, this.DeviceId, this.Timestamp, this.Module)
+	if this.Status {
+		task.SubscribeTask.Append(key, this.DeviceId, this.Timestamp, this.Module)
+	} else {
+		task.SubscribeTask.Remove(key)
+	}
 
 	return nil
 }

main-subscribe/build.bat

@@ -10,4 +10,4 @@ echo now the GOOS:
 echo now the GOARCH:
  go env GOARCH
 
-go build -o ../bin/admin-server main.go
+go build -o ../bin/admin-subscribe main.go

pkg/helper/wechat/wechatHelper.go

@@ -68,7 +68,7 @@ type Subscribe struct {
 func (this *WechatHelper) SendWechatSubscribe(openid string, template string, msg interface{}) int {
 	token, _ := this.Wechat.GetAccessToken()
 	url := subscribeUrl + token
-	reqData := Subscribe{ToUser: openid, TemplateId: template, MiniProgramState: "developer", Lang: "zh_CN"}
+	reqData := Subscribe{ToUser: openid, TemplateId: template, Lang: "zh_CN"}
 	reqData.Data = msg
 
 	data, _ := json.Marshal(reqData)

pkg/sender/subscribe.go

@@ -4,7 +4,6 @@ import (
 	"dsbqj-admin/model/mongo/subscribe"
 	"dsbqj-admin/pkg/helper/wechat"
 	"dsbqj-admin/pkg/logger"
-	"fmt"
 	"github.com/kamva/mgm/v3"
 	"go.mongodb.org/mongo-driver/bson"
 	"log"
@@ -64,8 +63,12 @@ func (this *SubscribeSender) safeSend(send *SubscribeSend) {
 		this.SendHangupSubscribe(send.DeviceId)
 	case "guildgame":
 		this.SendGuildGameSubscribe(send.OpenIds)
+	case "alliance":
+		this.SendAllianceSubscribe(send.OpenIds)
+	case "warheavens":
+		this.SendWarHeavensSubscribe(send.OpenIds)
 	default:
-		log.Printf("[push] unknown type=%s, openId=%s",
+		logger.Info("[push] unknown type=%s, openId=%s",
 			send.Module, send.DeviceId)
 	}
 }
@@ -78,12 +81,12 @@ func (this *SubscribeSender) SendHangupSubscribe(deviceId string) {
 	}
 
 	msg := make(map[string]map[string]string)
-	msg["thing12"] = make(map[string]string)
-	msg["thing12"]["value"] = "天气不错"
-	msg["thing13"] = make(map[string]string)
-	msg["thing13"]["value"] = "明天下雨"
+	msg["thing1"] = make(map[string]string)
+	msg["thing1"]["value"] = "挂机奖励时长已满"
+	msg["thing3"] = make(map[string]string)
+	msg["thing3"]["value"] = "您的挂机奖励时长已满，请打开游戏领取"
 
-	fmt.Println(this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, "UeiRSO8hHAFvTodH3SlWb_KoqT3Z2F2MoSvsDkZv7AE", msg))
+	this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, "0ByvFSV3B3U5-1XyvruRe7AMHAxiwQBFUL50lmoatCY", msg)
 }
 
 func (this *SubscribeSender) SendAutoFightSubscribe(deviceId string) {
@@ -93,14 +96,46 @@ func (this *SubscribeSender) SendAutoFightSubscribe(deviceId string) {
 		return
 	}
 	msg := make(map[string]map[string]string)
-	msg["thing12"] = make(map[string]string)
-	msg["thing12"]["value"] = "天气不错"
-	msg["thing13"] = make(map[string]string)
-	msg["thing13"]["value"] = "明天下雨"
+	msg["thing2"] = make(map[string]string)
+	msg["thing2"]["value"] = "离线闯关即将结束，请及时收取您的离线闯关奖励。"
+	msg["thing1"] = make(map[string]string)
+	msg["thing1"]["value"] = "离线闯关提醒"
 
-	fmt.Println(this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, "UeiRSO8hHAFvTodH3SlWb_KoqT3Z2F2MoSvsDkZv7AE", msg))
+	this.wxHelper.SendWechatSubscribe(subscribeOne.OpenId, "5rwMjLs6nVQ0SMtS0EAPEpmXZduOdEgSWbIjSNG5T7M", msg)
 }
 
 func (this *SubscribeSender) SendGuildGameSubscribe(openIds []string) {
+	msg := make(map[string]map[string]string)
+	msg["thing2"] = make(map[string]string)
+	msg["thing2"]["value"] = "门派攻防战即将开始，为门派荣誉而战吧。"
+	msg["thing4"] = make(map[string]string)
+	msg["thing4"]["value"] = "门派攻防战"
+
+	for _, openId := range openIds {
+		this.wxHelper.SendWechatSubscribe(openId, "e6D_r9_5tKNZK0cvM8fjzMXy9z1-aoNYQ9TSvAEuklU", msg)
+	}
+}
+
+func (this *SubscribeSender) SendWarHeavensSubscribe(openIds []string) {
+	msg := make(map[string]map[string]string)
+	msg["thing2"] = make(map[string]string)
+	msg["thing2"]["value"] = "三界战场即将开始，争夺人间道统。"
+	msg["thing4"] = make(map[string]string)
+	msg["thing4"]["value"] = "三界争峰"
 
+	for _, openId := range openIds {
+		this.wxHelper.SendWechatSubscribe(openId, "e6D_r9_5tKNZK0cvM8fjzMXy9z1-aoNYQ9TSvAEuklU", msg)
+	}
+}
+
+func (this *SubscribeSender) SendAllianceSubscribe(openIds []string) {
+	msg := make(map[string]map[string]string)
+	msg["thing2"] = make(map[string]string)
+	msg["thing2"]["value"] = "独战诸仙即将开始！"
+	msg["thing4"] = make(map[string]string)
+	msg["thing4"]["value"] = "决战诸仙"
+
+	for _, openId := range openIds {
+		this.wxHelper.SendWechatSubscribe(openId, "e6D_r9_5tKNZK0cvM8fjzMXy9z1-aoNYQ9TSvAEuklU", msg)
+	}
 }