Merge remote-tracking branch 'origin/feature/v1.2.7' into dev/v1.2.7_dx

rpc/internal/common/sendWxTmplMsg.go

@@ -22,7 +22,7 @@ type WxTmplPush struct {
 
 const CacheDb = "msgCount"
 
-func messageType() func() map[string]string {
+func MessageType() func() map[string]string {
 	rData := entity.Mysql.SelectBySql("SELECT name,switch FROM message_column")
 	switchName := map[string]string{}
 	if rData == nil && len(*rData) == 0 {
@@ -37,7 +37,7 @@ func messageType() func() map[string]string {
 	}
 }
 
-var AllMsgType = messageType()
+var AllMsgType func() map[string]string
 
 var getSendTotalRedisKey = func(uFlag ...string) string {
 	if len(uFlag) == 0 { //统计当日信息总发送量

rpc/message.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"app.yhyue.com/moapp/MessageCenter/entity"
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/common"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/config"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/server"
 	"app.yhyue.com/moapp/MessageCenter/rpc/internal/svc"
@@ -60,6 +61,7 @@ func init() {
 	if data != nil && len(*data) > 0 {
 		entity.MessageColumn = *data
 	}
+	common.AllMsgType = common.MessageType()
 	//初始化basemysql
 	entity.BaseMysql = &mysql.Mysql{
 		Address:      config.ConfigJson.BaseSource.Address,