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

Support stick post.

pull/296/head
ruibaby 2019-08-30 20:57:34 +08:00
parent 62975bfd6a
commit 91797c1801
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/run/halo/app/controller/admin/api/InstallController.java
View File

@ -1,5 +1,7 @@
package run.halo.app.controller.admin.api; package run.halo.app.controller.admin.api;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.crypto.SecureUtil;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
@ -196,11 +198,15 @@ public class InstallController {
installParam.update(user); installParam.update(user);
// Set password manually // Set password manually
userService.setPassword(user, installParam.getPassword()); userService.setPassword(user, installParam.getPassword());
// Set default avatar
userService.setDefaultAvatar(user);
// Update user // Update user
return userService.update(user); return userService.update(user);
}).orElseGet(() -> userService.createBy(installParam)); }).orElseGet(() -> {
StrBuilder gravatar = new StrBuilder("//cn.gravatar.com/avatar/");
gravatar.append(SecureUtil.md5(installParam.getEmail()));
gravatar.append("?s=256&d=mm");
installParam.setAvatar(gravatar.toString());
return userService.createBy(installParam);
});
} }
private void initSettings(InstallParam installParam) { private void initSettings(InstallParam installParam) {

11
src/main/java/run/halo/app/controller/admin/api/PostController.java
View File

@ -2,8 +2,11 @@ package run.halo.app.controller.admin.api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.web.PageableDefault; import org.springframework.data.web.PageableDefault;
import org.springframework.data.web.SortDefault;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import run.halo.app.model.dto.post.BasePostMinimalDTO; import run.halo.app.model.dto.post.BasePostMinimalDTO;
import run.halo.app.model.dto.post.BasePostSimpleDTO; import run.halo.app.model.dto.post.BasePostSimpleDTO;
@ -24,6 +27,7 @@ import static org.springframework.data.domain.Sort.Direction.DESC;
* Post controller. * Post controller.
* *
* @author johnniang * @author johnniang
* @author ryanwang
* @date 3/19/19 * @date 3/19/19
*/ */
@RestController @RestController
@ -38,8 +42,13 @@ public class PostController {
@GetMapping @GetMapping
@ApiOperation("Lists posts") @ApiOperation("Lists posts")
public Page<PostListVO> pageBy(@PageableDefault(sort = "createTime", direction = DESC) Pageable pageable, public Page<PostListVO> pageBy(Integer page, Integer size,
@SortDefault.SortDefaults({
@SortDefault(sort = "topPriority", direction = DESC),
@SortDefault(sort = "createTime", direction = DESC)
}) Sort sort,
PostQuery postQuery) { PostQuery postQuery) {
Pageable pageable = PageRequest.of(page, size, sort);
Page<Post> postPage = postService.pageBy(postQuery, pageable); Page<Post> postPage = postService.pageBy(postQuery, pageable);
return postService.convertToListVo(postPage); return postService.convertToListVo(postPage);
} }

2
src/main/java/run/halo/app/controller/admin/api/ThemeController.java
View File

@ -47,7 +47,7 @@ public class ThemeController {
return themeService.getThemes(); return themeService.getThemes();
} }
@GetMapping("files") @GetMapping("activation/files")
public List<ThemeFile> listFiles() { public List<ThemeFile> listFiles() {
return themeService.listThemeFolderBy(themeService.getActivatedThemeId()); return themeService.listThemeFolderBy(themeService.getActivatedThemeId());
} }