github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: inconsistent order of post for theme-side (#2742) 

#### What type of PR is this?
/kind improvement
/area core
/milestone 2.0.0-rc.1

#### What this PR does / why we need it:
修复主题端文章列表排序不固定问题
#### Which issue(s) this PR fixes:

Fixes #2734

#### Special notes for your reviewer:
/cc @halo-dev/sig-halo 
#### Does this PR introduce a user-facing change?

```release-note
修复主题端文章列表排序不固定问题
```
pull/2752/head
guqing 2022-11-23 17:21:30 +08:00 committed by GitHub
parent 180548161a
commit b0c461b5f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/run/halo/app/theme/finders/impl/ContributorFinderImpl.java
View File

@ -36,6 +36,6 @@ public class ContributorFinderImpl implements ContributorFinder {
return Flux.empty(); return Flux.empty();
} }
return Flux.fromIterable(names) return Flux.fromIterable(names)
.flatMap(this::getContributor); .concatMap(this::getContributor);
} }
} }

4
src/main/java/run/halo/app/theme/finders/impl/PostFinderImpl.java
View File

@ -127,7 +127,7 @@ public class PostFinderImpl implements PostFinder {
@Override @Override
public Flux<ListedPostVo> listAll() { public Flux<ListedPostVo> listAll() {
return client.list(Post.class, FIXED_PREDICATE, defaultComparator()) return client.list(Post.class, FIXED_PREDICATE, defaultComparator())
.flatMap(this::getListedPostVo); .concatMap(this::getListedPostVo);
} }
static Pair<String, String> postPreviousNextPair(List<String> postNames, static Pair<String, String> postPreviousNextPair(List<String> postNames,
@ -292,7 +292,7 @@ public class PostFinderImpl implements PostFinder {
return client.list(Post.class, predicate, return client.list(Post.class, predicate,
comparator, pageNullSafe(page), sizeNullSafe(size)) comparator, pageNullSafe(page), sizeNullSafe(size))
.flatMap(list -> Flux.fromStream(list.get()) .flatMap(list -> Flux.fromStream(list.get())
.flatMap(post -> getListedPostVo(post) .concatMap(post -> getListedPostVo(post)
.map(postVo -> { .map(postVo -> {
populateStats(postVo); populateStats(postVo);
return postVo; return postVo;

2
src/main/java/run/halo/app/theme/finders/impl/SinglePageFinderImpl.java
View File

@ -96,7 +96,7 @@ public class SinglePageFinderImpl implements SinglePageFinder {
populateStats(pageVo); populateStats(pageVo);
return pageVo; return pageVo;
}) })
.flatMap(this::populateContributors) .concatMap(this::populateContributors)
.collectList() .collectList()
.map(pageVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(), .map(pageVos -> new ListResult<>(list.getPage(), list.getSize(), list.getTotal(),
pageVos) pageVos)

2
src/main/java/run/halo/app/theme/finders/impl/TagFinderImpl.java
View File

@ -40,7 +40,7 @@ public class TagFinderImpl implements TagFinder {
@Override @Override
public Flux<TagVo> getByNames(List<String> names) { public Flux<TagVo> getByNames(List<String> names) {
return Flux.fromIterable(names) return Flux.fromIterable(names)
.flatMap(this::getByName); .concatMap(this::getByName);
} }
@Override @Override