Merge remote-tracking branch 'origin/master' into fix/group_country

domain/cache/group_c/enter_room.go

@@ -50,12 +50,14 @@ func GetLastRoomVisitors(model *domain.Model, imGroupId string) (userIds []uint6
 
 // 获取最近进入的房间
 // 3个月
-func GetUserRecentRooms(model *domain.Model, userId uint64) (imGroupIds []string, roomEnterTime map[string]int64) {
+func GetUserRecentRooms(model *domain.Model, userId uint64, offset, limit int64) (imGroupIds []string, roomEnterTime map[string]int64) {
 	roomEnterTime = make(map[string]int64)
 	userKey := group_k.GetUserEnterRoomUserKey(userId)
 	res, err := model.Redis.ZRangeByScoreWithScores(model, userKey, &redis.ZRangeBy{
-		Min: fmt.Sprintf("%d", time.Now().AddDate(0, -3, 0).Unix()),
-		Max: "+inf",
+		Min:    fmt.Sprintf("%d", time.Now().AddDate(0, -3, 0).Unix()),
+		Max:    "+inf",
+		Offset: offset,
+		Count:  limit,
 	}).Result()
 	if err != nil {
 		return

route/group_r/group_list.go

@@ -720,7 +720,7 @@ func GetRecentGroup(c *gin.Context) (*mycontext.MyContext, error) {
 	//if err != nil {
 	//	return myContext, err
 	//}
-	rec, roomEnterTime := group_c.GetUserRecentRooms(model, userId)
+	rec, roomEnterTime := group_c.GetUserRecentRooms(model, userId, 0, 30)
 
 	myGroups, err := group_m.FindGroupMapByOwner(model, userId)
 	if err != nil {