Merge branch 'master' into feature/v1.1.23

jyBXSubscribe/api/internal/logic/byPushHistoryLogic.go

@@ -51,6 +51,7 @@ func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types
 		}
 		if len(matchkeysArr) != 0 {
 			matchkeys = strings.Join(matchkeysArr, ",")
+			matchkeys = strings.ReplaceAll(matchkeys, " ", ",")
 		}
 	} else {
 		matchkeys = req.KeyWords

jyBXSubscribe/api/internal/logic/subscribeListLogic.go

@@ -53,6 +53,7 @@ func (l *SubscribeListLogic) SubscribeList(req *types.SubscribeReq) (resp *types
 		}
 		if len(matchkeysArr) != 0 {
 			matchkeys = strings.Join(matchkeysArr, ",")
+			matchkeys = strings.ReplaceAll(matchkeys, " ", ",")
 		}
 	} else {
 		matchkeys = req.KeyWords