Merge remote-tracking branch 'origin/feature/v1.1.15' into feature/v1.1.15

jyBXSubscribe/rpc/model/push.go

@@ -165,12 +165,14 @@ func (s *subscribePush) PutTodayCache(userId, userType string, pc_a *SubPush) {
 
 // 获取redis key
 func (s *subscribePush) todayKey(userId, userType string) string {
-	if userType == EntnicheFlag {
+	if s.ModuleFlag == EntnicheFlag {
 		switch userType {
 		case SubVipFlag:
 			return fmt.Sprintf("%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "vip", userId)
 		case MemberFlag:
 			return fmt.Sprintf("%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "member", userId)
+		case SubFreeFlag:
+			return fmt.Sprintf("%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "free", userId)
 		}
 	}
 	return fmt.Sprintf("%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, userId)
@@ -182,6 +184,8 @@ func (s *subscribePush) allKey(userId, userType string) string {
 			return fmt.Sprintf("all_%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "vip", userId)
 		case MemberFlag:
 			return fmt.Sprintf("all_%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "member", userId)
+		case SubFreeFlag:
+			return fmt.Sprintf("all_%s_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, "free", userId)
 		}
 	}
 	return fmt.Sprintf("all_%s_%s", aboutDbMsg[s.ModuleFlag].RedisKeyFlag, userId)