Merge branch 'dev/v1.2.16_rjj' of moapp/MessageCenter into feature/v1.2.16

rpc/etc/message.yaml

@@ -91,3 +91,4 @@ FreePushNumber: 1
 PayPushNumber: 5
 EquityInfoMsgType: 13 #营销权益消息需要特殊处理
 NewUserMsgTitle: 做任务赚好礼
+IsFilterActive: true

rpc/internal/common/msglistService.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"app.yhyue.com/moapp/MessageCenter/entity"
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/config"
 	"app.yhyue.com/moapp/MessageCenter/rpc/type/message"
 	"app.yhyue.com/moapp/MessageCenter/util"
 	"app.yhyue.com/moapp/jybase/common"
@@ -443,6 +444,7 @@ func GetUserMsgSummary(userId string, isfilterActive bool) (userAllMsg, userRead
 		return
 	}
 	var sql string
+	isfilterActive = config.ConfigJson.IsFilterActive
 	if isfilterActive {
 		sql = fmt.Sprintf("SELECT a1.userAllMsg,a1.userReadMsg,bitmapToArray(bitmapAndnot(a1.userunRead,a2.msg_bitmap)) as userunRead from (SELECT bitmapToArray(allMsg) as userAllMsg,bitmapToArray(readMsg) as userReadMsg,bitmapAndnot(allMsg,readMsg) as userunRead from message_user_summary where userId ='%s') a1,(select msg_bitmap,group_id from message_summary ms  where group_id = 1 ) a2", userId)
 	} else {

rpc/internal/config/config.go

@@ -35,6 +35,7 @@ type Config struct {
 	PayPushNumber     int    `json:"PayPushNumber"`
 	EquityInfoMsgType int64  `json:"EquityInfoMsgType"` // 营销权益消息需要特殊处理的消息类型
 	NewUserMsgTitle   string `json:"NewUserMsgTitle"`
+	IsFilterActive    bool   `json:"IsFilterActive"`
 }
 
 type CHouseConfig struct {