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

🎨 代码优化

pull/69/head
ruibaby 2018-12-06 21:30:56 +08:00
parent 1501bdad25
commit c0d1484b93
43 changed files with 192 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cc/ryanc/halo/model/tag/CommonTagDirective.java
View File

@ -46,19 +46,19 @@ public class CommonTagDirective implements TemplateDirectiveModel {
String method = map.get(METHOD_KEY).toString();
switch (method) {
case "menus":
environment.setVariable("menus", builder.build().wrap(menuService.findAllMenus()));
environment.setVariable("menus", builder.build().wrap(menuService.findAll()));
break;
case "categories":
environment.setVariable("categories", builder.build().wrap(categoryService.findAllCategories()));
environment.setVariable("categories", builder.build().wrap(categoryService.findAll()));
break;
case "tags":
environment.setVariable("tags", builder.build().wrap(tagService.findAllTags()));
environment.setVariable("tags", builder.build().wrap(tagService.findAll()));
break;
case "links":
environment.setVariable("links", builder.build().wrap(linkService.findAllLinks()));
environment.setVariable("links", builder.build().wrap(linkService.findAll()));
break;
case "newComments":
environment.setVariable("newComments", builder.build().wrap(commentService.findAllComments(1)));
environment.setVariable("newComments", builder.build().wrap(commentService.findAll(1)));
break;
default:
break;

15
src/main/java/cc/ryanc/halo/service/AttachmentService.java
View File

@ -26,14 +26,14 @@ public interface AttachmentService {
* @param attachment attachment
* @return Attachment
*/
Attachment saveByAttachment(Attachment attachment);
Attachment save(Attachment attachment);
/**
* 查询所有附件信息
*
* @return List
*/
List<Attachment> findAllAttachments();
List<Attachment> findAll();
/**
* 查询所有附件，分页
@ -41,7 +41,7 @@ public interface AttachmentService {
* @param pageable pageable
* @return Page
*/
Page<Attachment> findAllAttachments(Pageable pageable);
Page<Attachment> findAll(Pageable pageable);
/**
* 根据编号查询
@ -57,7 +57,7 @@ public interface AttachmentService {
* @param attachId attachId
* @return Attachment
*/
Attachment removeByAttachId(Long attachId);
Attachment remove(Long attachId);
/**
* 上传转发
@ -110,4 +110,11 @@ public interface AttachmentService {
* @return boolean
*/
boolean deleteUpYunAttachment(String fileName);
/**
* 获取附件总数
*
* @return Long
*/
Long getCount();
}

6
src/main/java/cc/ryanc/halo/service/CategoryService.java
View File

@ -21,7 +21,7 @@ public interface CategoryService {
* @param category 分类目录
* @return 如果插入成功，返回分类目录对象
*/
Category saveByCategory(Category category);
Category save(Category category);
/**
* 根据编号删除分类目录
@ -29,14 +29,14 @@ public interface CategoryService {
* @param cateId 分类目录编号
* @return category
*/
Category removeByCateId(Long cateId);
Category remove(Long cateId);
/**
* 获取所有分类目录
*
* @return 返回List集合
*/
List<Category> findAllCategories();
List<Category> findAll();
/**
* 根据编号查询单个分类

17
src/main/java/cc/ryanc/halo/service/CommentService.java
View File

@ -23,7 +23,7 @@ public interface CommentService {
*
* @param comment comment
*/
void saveByComment(Comment comment);
void save(Comment comment);
/**
* 删除评论
@ -31,7 +31,7 @@ public interface CommentService {
* @param commentId commentId
* @return Optional
*/
Optional<Comment> removeByCommentId(Long commentId);
Optional<Comment> remove(Long commentId);
/**
* 查询所有的评论，用于后台管理
@ -40,7 +40,7 @@ public interface CommentService {
* @param pageable pageable
* @return Page
*/
Page<Comment> findAllComments(Integer status, Pageable pageable);
Page<Comment> findAll(Integer status, Pageable pageable);
/**
* 根据评论状态查询评论
@ -48,14 +48,14 @@ public interface CommentService {
* @param status 评论状态
* @return List
*/
List<Comment> findAllComments(Integer status);
List<Comment> findAll(Integer status);
/**
* 查询所有评论，不分页
*
* @return List
*/
List<Comment> findAllComments();
List<Comment> findAll();
/**
* 更改评论的状态
@ -125,4 +125,11 @@ public interface CommentService {
* @return 评论数量
*/
Integer getCountByStatus(Integer status);
/**
* 查询评论总数
*
* @return Long
*/
Long getCount();
}

16
src/main/java/cc/ryanc/halo/service/GalleryService.java
View File

@ -23,7 +23,7 @@ public interface GalleryService {
* @param gallery gallery
* @return Gallery
*/
Gallery saveByGallery(Gallery gallery);
Gallery save(Gallery gallery);
/**
* 根据编号删除图片
@ -31,15 +31,7 @@ public interface GalleryService {
* @param galleryId galleryId
* @return Gallery
*/
Gallery removeByGalleryId(Long galleryId);
/**
* 修改图片信息
*
* @param gallery gallery
* @return Gallery
*/
Gallery updateByGallery(Gallery gallery);
Gallery remove(Long galleryId);
/**
* 查询所有图片 分页
@ -47,14 +39,14 @@ public interface GalleryService {
* @param pageable pageable
* @return Page
*/
Page<Gallery> findAllGalleries(Pageable pageable);
Page<Gallery> findAll(Pageable pageable);
/**
* 查询所有图片 不分页
*
* @return List
*/
List<Gallery> findAllGalleries();
List<Gallery> findAll();
/**
* 根据编号查询图片信息

6
src/main/java/cc/ryanc/halo/service/LinkService.java
View File

@ -21,7 +21,7 @@ public interface LinkService {
* @param link link
* @return Link
*/
Link saveByLink(Link link);
Link save(Link link);
/**
* 根据编号删除
@ -29,14 +29,14 @@ public interface LinkService {
* @param linkId linkId
* @return Link
*/
Link removeByLinkId(Long linkId);
Link remove(Long linkId);
/**
* 查询所有
*
* @return List
*/
List<Link> findAllLinks();
List<Link> findAll();
/**
* 根据编号查询单个链接

13
src/main/java/cc/ryanc/halo/service/LogsService.java
View File

@ -6,7 +6,6 @@ import org.springframework.data.domain.Pageable;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Optional;
/**
* <pre>
@ -30,7 +29,7 @@ public interface LogsService {
/**
* 移除所有日志
*/
void removeAllLogs();
void removeAll();
/**
* 查询所有日志并分页
@ -38,7 +37,7 @@ public interface LogsService {
* @param pageable pageable
* @return Page
*/
Page<Logs> findAllLogs(Pageable pageable);
Page<Logs> findAll(Pageable pageable);
/**
* 查询最新的五条日志
@ -46,12 +45,4 @@ public interface LogsService {
* @return List
*/
List<Logs> findLogsLatest();
/**
* 根据编号查询
*
* @param logsId logsId
* @return Optional
*/
Optional<Logs> findLogsByLogsId(Long logsId);
}

6
src/main/java/cc/ryanc/halo/service/MenuService.java
View File

@ -21,14 +21,14 @@ public interface MenuService {
* @param menu menu
* @return Menu
*/
Menu saveByMenu(Menu menu);
Menu save(Menu menu);
/**
* 查询所有菜单
*
* @return List
*/
List<Menu> findAllMenus();
List<Menu> findAll();
/**
* 删除菜单
@ -36,7 +36,7 @@ public interface MenuService {
* @param menuId menuId
* @return Menu
*/
Menu removeByMenuId(Long menuId);
Menu remove(Long menuId);
/**
* 根据编号查询菜单

22
src/main/java/cc/ryanc/halo/service/PostService.java
View File

@ -28,7 +28,7 @@ public interface PostService {
* @param post Post
* @return Post
*/
Post saveByPost(Post post);
Post save(Post post);
/**
* 根据编号删除文章
@ -36,7 +36,7 @@ public interface PostService {
* @param postId postId
* @return Post
*/
Post removeByPostId(Long postId);
Post remove(Long postId);
/**
* 修改文章状态
@ -47,13 +47,6 @@ public interface PostService {
*/
Post updatePostStatus(Long postId, Integer status);
/**
* 修改文章阅读量
*
* @param post post
*/
void updatePostView(Post post);
/**
* 批量修改摘要
*
@ -61,22 +54,13 @@ public interface PostService {
*/
void updateAllSummary(Integer postSummary);
/**
* 获取文章列表 分页
*
* @param postType post or page
* @param pageable 分页信息
* @return Page
*/
Page<Post> findAllPosts(String postType, Pageable pageable);
/**
* 获取文章列表 不分页
*
* @param postType post or page
* @return List
*/
List<Post> findAllPosts(String postType);
List<Post> findAll(String postType);
/**
* 模糊查询文章

6
src/main/java/cc/ryanc/halo/service/TagService.java
View File

@ -21,7 +21,7 @@ public interface TagService {
* @param tag tag
* @return Tag
*/
Tag saveByTag(Tag tag);
Tag save(Tag tag);
/**
* 根据编号移除标签
@ -29,14 +29,14 @@ public interface TagService {
* @param tagId tagId
* @return Tag
*/
Tag removeByTagId(Long tagId);
Tag remove(Long tagId);
/**
* 获取所有标签
*
* @return List
*/
List<Tag> findAllTags();
List<Tag> findAll();
/**
* 根据编号查询标签

2
src/main/java/cc/ryanc/halo/service/UserService.java
View File

@ -19,7 +19,7 @@ public interface UserService {
*
* @param user user
*/
void saveByUser(User user);
void save(User user);
/**
* 根据用户名和密码查询，用于登录

18
src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java
View File

@ -66,7 +66,7 @@ public class AttachmentServiceImpl implements AttachmentService {
*/
@Override
@CacheEvict(value = ATTACHMENTS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Attachment saveByAttachment(Attachment attachment) {
public Attachment save(Attachment attachment) {
return attachmentRepository.save(attachment);
}
@ -77,7 +77,7 @@ public class AttachmentServiceImpl implements AttachmentService {
*/
@Override
@Cacheable(value = ATTACHMENTS_CACHE_NAME, key = "'attachment'")
public List<Attachment> findAllAttachments() {
public List<Attachment> findAll() {
return attachmentRepository.findAll();
}
@ -88,7 +88,7 @@ public class AttachmentServiceImpl implements AttachmentService {
* @return Page
*/
@Override
public Page<Attachment> findAllAttachments(Pageable pageable) {
public Page<Attachment> findAll(Pageable pageable) {
return attachmentRepository.findAll(pageable);
}
@ -111,7 +111,7 @@ public class AttachmentServiceImpl implements AttachmentService {
*/
@Override
@CacheEvict(value = ATTACHMENTS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Attachment removeByAttachId(Long attachId) {
public Attachment remove(Long attachId) {
Optional<Attachment> attachment = this.findByAttachId(attachId);
attachmentRepository.delete(attachment.get());
return attachment.get();
@ -404,4 +404,14 @@ public class AttachmentServiceImpl implements AttachmentService {
}
return flag;
}
/**
* 获取附件总数
*
* @return Long
*/
@Override
public Long getCount() {
return attachmentRepository.count();
}
}

6
src/main/java/cc/ryanc/halo/service/impl/CategoryServiceImpl.java
View File

@ -35,7 +35,7 @@ public class CategoryServiceImpl implements CategoryService {
*/
@Override
@CacheEvict(value = POSTS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Category saveByCategory(Category category) {
public Category save(Category category) {
return categoryRepository.save(category);
}
@ -47,7 +47,7 @@ public class CategoryServiceImpl implements CategoryService {
*/
@Override
@CacheEvict(value = POSTS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Category removeByCateId(Long cateId) {
public Category remove(Long cateId) {
Optional<Category> category = this.findByCateId(cateId);
categoryRepository.delete(category.get());
return category.get();
@ -59,7 +59,7 @@ public class CategoryServiceImpl implements CategoryService {
* @return List
*/
@Override
public List<Category> findAllCategories() {
public List<Category> findAll() {
return categoryRepository.findAll();
}

20
src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java
View File

@ -40,7 +40,7 @@ public class CommentServiceImpl implements CommentService {
*/
@Override
@CacheEvict(value = {COMMENTS_CACHE_NAME, POSTS_CACHE_NAME}, allEntries = true, beforeInvocation = true)
public void saveByComment(Comment comment) {
public void save(Comment comment) {
commentRepository.save(comment);
}
@ -52,7 +52,7 @@ public class CommentServiceImpl implements CommentService {
*/
@Override
@CacheEvict(value = {COMMENTS_CACHE_NAME, POSTS_CACHE_NAME}, allEntries = true, beforeInvocation = true)
public Optional<Comment> removeByCommentId(Long commentId) {
public Optional<Comment> remove(Long commentId) {
Optional<Comment> comment = this.findCommentById(commentId);
commentRepository.delete(comment.get());
return comment;
@ -65,7 +65,7 @@ public class CommentServiceImpl implements CommentService {
* @return Page
*/
@Override
public Page<Comment> findAllComments(Integer status, Pageable pageable) {
public Page<Comment> findAll(Integer status, Pageable pageable) {
return commentRepository.findCommentsByCommentStatus(status, pageable);
}
@ -77,7 +77,7 @@ public class CommentServiceImpl implements CommentService {
*/
@Override
@CachePut(value = COMMENTS_CACHE_NAME, key = "'comments_status_'+#status")
public List<Comment> findAllComments(Integer status) {
public List<Comment> findAll(Integer status) {
return commentRepository.findCommentsByCommentStatus(status);
}
@ -88,7 +88,7 @@ public class CommentServiceImpl implements CommentService {
*/
@Override
@Cacheable(value = COMMENTS_CACHE_NAME, key = "'comment'")
public List<Comment> findAllComments() {
public List<Comment> findAll() {
return commentRepository.findAll();
}
@ -188,4 +188,14 @@ public class CommentServiceImpl implements CommentService {
public Integer getCountByStatus(Integer status) {
return commentRepository.countAllByCommentStatus(status);
}
/**
* 查询评论总数
*
* @return Long
*/
@Override
public Long getCount() {
return commentRepository.count();
}
}

20
src/main/java/cc/ryanc/halo/service/impl/GalleryServiceImpl.java
View File

@ -37,7 +37,7 @@ public class GalleryServiceImpl implements GalleryService {
*/
@Override
@CacheEvict(value = GALLERIES_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Gallery saveByGallery(Gallery gallery) {
public Gallery save(Gallery gallery) {
return galleryRepository.save(gallery);
}
@ -49,24 +49,12 @@ public class GalleryServiceImpl implements GalleryService {
*/
@Override
@CacheEvict(value = GALLERIES_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Gallery removeByGalleryId(Long galleryId) {
public Gallery remove(Long galleryId) {
Optional<Gallery> gallery = this.findByGalleryId(galleryId);
galleryRepository.delete(gallery.get());
return gallery.get();
}
/**
* 修改图片信息
*
* @param gallery gallery
* @return Gallery
*/
@Override
@CacheEvict(value = GALLERIES_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Gallery updateByGallery(Gallery gallery) {
return galleryRepository.save(gallery);
}
/**
* 查询所有图片 分页
*
@ -74,7 +62,7 @@ public class GalleryServiceImpl implements GalleryService {
* @return Page
*/
@Override
public Page<Gallery> findAllGalleries(Pageable pageable) {
public Page<Gallery> findAll(Pageable pageable) {
return galleryRepository.findAll(pageable);
}
@ -85,7 +73,7 @@ public class GalleryServiceImpl implements GalleryService {
*/
@Override
@Cacheable(value = GALLERIES_CACHE_NAME, key = "'gallery'")
public List<Gallery> findAllGalleries() {
public List<Gallery> findAll() {
return galleryRepository.findAll();
}

6
src/main/java/cc/ryanc/halo/service/impl/LinkServiceImpl.java
View File

@ -37,7 +37,7 @@ public class LinkServiceImpl implements LinkService {
*/
@Override
@CacheEvict(value = LINKS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Link saveByLink(Link link) {
public Link save(Link link) {
return linkRepository.save(link);
}
@ -49,7 +49,7 @@ public class LinkServiceImpl implements LinkService {
*/
@Override
@CacheEvict(value = LINKS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Link removeByLinkId(Long linkId) {
public Link remove(Long linkId) {
Optional<Link> link = this.findByLinkId(linkId);
linkRepository.delete(link.get());
return link.get();
@ -62,7 +62,7 @@ public class LinkServiceImpl implements LinkService {
*/
@Override
@Cacheable(value = LINKS_CACHE_NAME, key = LINKS_CACHE_KEY)
public List<Link> findAllLinks() {
public List<Link> findAll() {
return linkRepository.findAll();
}

16
src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java
View File

@ -12,7 +12,6 @@ import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
import java.util.List;
import java.util.Optional;
/**
* <pre>
@ -49,7 +48,7 @@ public class LogsServiceImpl implements LogsService {
* 移除所有日志
*/
@Override
public void removeAllLogs() {
public void removeAll() {
logsRepository.deleteAll();
}
@ -60,7 +59,7 @@ public class LogsServiceImpl implements LogsService {
* @return Page
*/
@Override
public Page<Logs> findAllLogs(Pageable pageable) {
public Page<Logs> findAll(Pageable pageable) {
return logsRepository.findAll(pageable);
}
@ -73,15 +72,4 @@ public class LogsServiceImpl implements LogsService {
public List<Logs> findLogsLatest() {
return logsRepository.findTopFive();
}
/**
* 根据编号查询
*
* @param logsId logsId
* @return Optional
*/
@Override
public Optional<Logs> findLogsByLogsId(Long logsId) {
return logsRepository.findById(logsId);
}
}

6
src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java
View File

@ -36,7 +36,7 @@ public class MenuServiceImpl implements MenuService {
*/
@Override
@Cacheable(value = MENUS_CACHE_NAME, key = MENUS_CACHE_KEY)
public List<Menu> findAllMenus() {
public List<Menu> findAll() {
return menuRepository.findAll();
}
@ -48,7 +48,7 @@ public class MenuServiceImpl implements MenuService {
*/
@Override
@CacheEvict(value = MENUS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Menu saveByMenu(Menu menu) {
public Menu save(Menu menu) {
return menuRepository.save(menu);
}
@ -60,7 +60,7 @@ public class MenuServiceImpl implements MenuService {
*/
@Override
@CacheEvict(value = MENUS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Menu removeByMenuId(Long menuId) {
public Menu remove(Long menuId) {
Optional<Menu> menu = this.findByMenuId(menuId);
menuRepository.delete(menu.get());
return menu.get();

31
src/main/java/cc/ryanc/halo/service/impl/PostServiceImpl.java
View File

@ -59,7 +59,7 @@ public class PostServiceImpl implements PostService {
*/
@Override
@CacheEvict(value = {POSTS_CACHE_NAME, COMMENTS_CACHE_NAME}, allEntries = true, beforeInvocation = true)
public Post saveByPost(Post post) {
public Post save(Post post) {
return postRepository.save(post);
}
@ -71,7 +71,7 @@ public class PostServiceImpl implements PostService {
*/
@Override
@CacheEvict(value = {POSTS_CACHE_NAME, COMMENTS_CACHE_NAME}, allEntries = true, beforeInvocation = true)
public Post removeByPostId(Long postId) {
public Post remove(Long postId) {
Optional<Post> post = this.findByPostId(postId);
postRepository.delete(post.get());
return post.get();
@ -92,17 +92,6 @@ public class PostServiceImpl implements PostService {
return postRepository.save(post.get());
}
/**
* 修改文章阅读量
*
* @param post post
*/
@Override
public void updatePostView(Post post) {
post.setPostViews(post.getPostViews() + 1);
postRepository.save(post);
}
/**
* 批量更新文章摘要
*
@ -111,7 +100,7 @@ public class PostServiceImpl implements PostService {
@Override
@CacheEvict(value = POSTS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public void updateAllSummary(Integer postSummary) {
List<Post> posts = this.findAllPosts(PostTypeEnum.POST_TYPE_POST.getDesc());
List<Post> posts = this.findAll(PostTypeEnum.POST_TYPE_POST.getDesc());
for (Post post : posts) {
String text = StrUtil.cleanBlank(HtmlUtil.cleanHtmlTag(post.getPostContent()));
if (text.length() > postSummary) {
@ -123,18 +112,6 @@ public class PostServiceImpl implements PostService {
}
}
/**
* 获取文章列表 分页
*
* @param postType post or page
* @param pageable 分页信息
* @return Page
*/
@Override
public Page<Post> findAllPosts(String postType, Pageable pageable) {
return postRepository.findPostsByPostType(postType, pageable);
}
/**
* 获取文章列表 不分页
*
@ -143,7 +120,7 @@ public class PostServiceImpl implements PostService {
*/
@Override
@Cacheable(value = POSTS_CACHE_NAME, key = "'posts_type_'+#postType")
public List<Post> findAllPosts(String postType) {
public List<Post> findAll(String postType) {
return postRepository.findPostsByPostType(postType);
}

8
src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java
View File

@ -35,7 +35,7 @@ public class TagServiceImpl implements TagService {
*/
@Override
@CacheEvict(value = POSTS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Tag saveByTag(Tag tag) {
public Tag save(Tag tag) {
return tagRepository.save(tag);
}
@ -47,7 +47,7 @@ public class TagServiceImpl implements TagService {
*/
@Override
@CacheEvict(value = POSTS_CACHE_NAME, allEntries = true, beforeInvocation = true)
public Tag removeByTagId(Long tagId) {
public Tag remove(Long tagId) {
Optional<Tag> tag = findByTagId(tagId);
tagRepository.delete(tag.get());
return tag.get();
@ -59,7 +59,7 @@ public class TagServiceImpl implements TagService {
* @return List
*/
@Override
public List<Tag> findAllTags() {
public List<Tag> findAll() {
return tagRepository.findAll();
}
@ -115,7 +115,7 @@ public class TagServiceImpl implements TagService {
nt = new Tag();
nt.setTagName(tag);
nt.setTagUrl(tag);
tagsList.add(saveByTag(nt));
tagsList.add(save(nt));
}
}
return tagsList;

2
src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java
View File

@ -30,7 +30,7 @@ public class UserServiceImpl implements UserService {
* @param user user
*/
@Override
public void saveByUser(User user) {
public void save(User user) {
userRepository.save(user);
}

2
src/main/java/cc/ryanc/halo/task/PostSyncTask.java
View File

@ -24,7 +24,7 @@ public class PostSyncTask {
post = postService.findByPostId(key).orElse(null);
if (null != post) {
post.setPostViews(post.getPostViews() + HaloConst.POSTS_VIEWS.get(key));
postService.saveByPost(post);
postService.save(post);
count++;
}
}

18
src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java
View File

@ -7,10 +7,7 @@ import cc.ryanc.halo.model.domain.User;
import cc.ryanc.halo.model.dto.HaloConst;
import cc.ryanc.halo.model.dto.JsonResult;
import cc.ryanc.halo.model.dto.LogsRecord;
import cc.ryanc.halo.model.enums.CommonParamsEnum;
import cc.ryanc.halo.model.enums.ResponseStatusEnum;
import cc.ryanc.halo.model.enums.ResultCodeEnum;
import cc.ryanc.halo.model.enums.TrueFalseEnum;
import cc.ryanc.halo.model.enums.*;
import cc.ryanc.halo.service.*;
import cc.ryanc.halo.utils.LocaleMessageUtil;
import cc.ryanc.halo.web.controller.core.BaseController;
@ -82,7 +79,7 @@ public class AdminController extends BaseController {
public String index(Model model) {
//查询评论的条数
Integer commentCount = commentService.findAllComments().size();
Long commentCount = commentService.getCount();
model.addAttribute("commentCount", commentCount);
//查询最新的文章
@ -98,11 +95,16 @@ public class AdminController extends BaseController {
model.addAttribute("comments", comments);
//附件数量
model.addAttribute("mediaCount", attachmentService.findAllAttachments().size());
model.addAttribute("mediaCount", attachmentService.getCount());
//文章阅读总数
Long postViewsSum = postService.getPostViews();
model.addAttribute("postViewsSum", postViewsSum);
//成立天数
Date blogStart = DateUtil.parse(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_START.getProp()));
long hadDays = DateUtil.between(blogStart, DateUtil.date(), DateUnit.DAY);
model.addAttribute("hadDays",hadDays);
return "admin/admin_index";
}
@ -204,7 +206,7 @@ public class AdminController extends BaseController {
@RequestParam(value = "size", defaultValue = "10") Integer size) {
Sort sort = new Sort(Sort.Direction.DESC, "logId");
Pageable pageable = PageRequest.of(page, size, sort);
Page<Logs> logs = logsService.findAllLogs(pageable);
Page<Logs> logs = logsService.findAll(pageable);
model.addAttribute("logs", logs);
return "admin/widget/_logs-all";
}
@ -217,7 +219,7 @@ public class AdminController extends BaseController {
@GetMapping(value = "/logs/clear")
public String logsClear() {
try {
logsService.removeAllLogs();
logsService.removeAll();
} catch (Exception e) {
log.error("Clear log failed:{}" + e.getMessage());
}

8
src/main/java/cc/ryanc/halo/web/controller/admin/AttachmentController.java
View File

@ -63,7 +63,7 @@ public class AttachmentController {
@RequestParam(value = "size", defaultValue = "18") Integer size) {
Sort sort = new Sort(Sort.Direction.DESC, "attachId");
Pageable pageable = PageRequest.of(page, size, sort);
Page<Attachment> attachments = attachmentService.findAllAttachments(pageable);
Page<Attachment> attachments = attachmentService.findAll(pageable);
model.addAttribute("attachments", attachments);
return "admin/admin_attachment";
}
@ -82,7 +82,7 @@ public class AttachmentController {
@RequestParam(value = "type", defaultValue = "normal") String type) {
Sort sort = new Sort(Sort.Direction.DESC, "attachId");
Pageable pageable = PageRequest.of(page, 18, sort);
Page<Attachment> attachments = attachmentService.findAllAttachments(pageable);
Page<Attachment> attachments = attachmentService.findAll(pageable);
model.addAttribute("attachments", attachments);
model.addAttribute("id", id);
if (StrUtil.equals(type, PostTypeEnum.POST_TYPE_POST.getDesc())) {
@ -134,7 +134,7 @@ public class AttachmentController {
attachment.setAttachSize(resultMap.get("size"));
attachment.setAttachWh(resultMap.get("wh"));
attachment.setAttachLocation(resultMap.get("location"));
attachmentService.saveByAttachment(attachment);
attachmentService.save(attachment);
log.info("Upload file {} to {} successfully", resultMap.get("fileName"), resultMap.get("filePath"));
result.put("success", ResultCodeEnum.SUCCESS.getCode());
result.put("message", localeMessageUtil.getMessage("code.admin.attachment.upload-success"));
@ -183,7 +183,7 @@ public class AttachmentController {
boolean flag = true;
try {
//删除数据库中的内容
attachmentService.removeByAttachId(attachId);
attachmentService.remove(attachId);
if (attachLocation != null) {
if (attachLocation.equals(SERVER.getDesc())) {
String delSmallFileName = delFileName.substring(0, delFileName.lastIndexOf('.')) + "_small" + attachment.get().getAttachSuffix();

4
src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
View File

@ -147,8 +147,8 @@ public class BackupController {
* @return JsonResult
*/
public JsonResult backupPosts() {
List<Post> posts = postService.findAllPosts(PostTypeEnum.POST_TYPE_POST.getDesc());
posts.addAll(postService.findAllPosts(PostTypeEnum.POST_TYPE_PAGE.getDesc()));
List<Post> posts = postService.findAll(PostTypeEnum.POST_TYPE_POST.getDesc());
posts.addAll(postService.findAll(PostTypeEnum.POST_TYPE_PAGE.getDesc()));
try {
if (HaloUtils.getBackUps(BackupTypeEnum.POSTS.getDesc()).size() > CommonParamsEnum.TEN.getValue()) {
FileUtil.del(System.getProperties().getProperty("user.home") + "/halo/backup/posts/");

5
src/main/java/cc/ryanc/halo/web/controller/admin/CategoryController.java
View File

@ -50,9 +50,8 @@ public class CategoryController {
*/
@PostMapping(value = "/save")
public String saveCategory(@ModelAttribute Category category) {
try {
categoryService.saveByCategory(category);
categoryService.save(category);
} catch (Exception e) {
log.error("Modify category failed: {}", e.getMessage());
}
@ -84,7 +83,7 @@ public class CategoryController {
@GetMapping(value = "/remove")
public String removeCategory(@RequestParam("cateId") Long cateId) {
try {
categoryService.removeByCateId(cateId);
categoryService.remove(cateId);
} catch (Exception e) {
log.error("Delete category failed: {}", e.getMessage());
}

42
src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
View File

@ -13,6 +13,7 @@ import cc.ryanc.halo.utils.OwoUtil;
import cc.ryanc.halo.web.controller.core.BaseController;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Validator;
import cn.hutool.core.text.StrBuilder;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
import cn.hutool.extra.servlet.ServletUtil;
@ -70,7 +71,7 @@ public class CommentController extends BaseController {
@RequestParam(value = "size", defaultValue = "10") Integer size) {
Sort sort = new Sort(Sort.Direction.DESC, "commentDate");
Pageable pageable = PageRequest.of(page, size, sort);
Page<Comment> comments = commentService.findAllComments(status, pageable);
Page<Comment> comments = commentService.findAll(status,pageable);
model.addAttribute("comments", comments);
model.addAttribute("publicCount", commentService.getCountByStatus(CommentStatusEnum.PUBLISHED.getCode()));
model.addAttribute("checkCount", commentService.getCountByStatus(CommentStatusEnum.CHECKING.getCode()));
@ -132,7 +133,7 @@ public class CommentController extends BaseController {
@RequestParam("status") Integer status,
@RequestParam(value = "page", defaultValue = "0") Integer page) {
try {
commentService.removeByCommentId(commentId);
commentService.remove(commentId);
} catch (Exception e) {
log.error("Delete comment failed: {}", e.getMessage());
}
@ -166,7 +167,7 @@ public class CommentController extends BaseController {
//修改被回复的评论的状态
lastComment.setCommentStatus(CommentStatusEnum.PUBLISHED.getCode());
commentService.saveByComment(lastComment);
commentService.save(lastComment);
//保存评论
Comment comment = new Comment();
@ -177,13 +178,20 @@ public class CommentController extends BaseController {
comment.setCommentAuthorIp(ServletUtil.getClientIP(request));
comment.setCommentAuthorAvatarMd5(SecureUtil.md5(user.getUserEmail()));
comment.setCommentDate(DateUtil.date());
String lastContent = "<a href='#comment-id-" + lastComment.getCommentId() + "'>@" + lastComment.getCommentAuthor() + "</a> ";
comment.setCommentContent(lastContent + OwoUtil.markToImg(HtmlUtil.escape(commentContent).replace("&lt;br/&gt;", "<br/>")));
StrBuilder buildContent = new StrBuilder("<a href='#comment-id-");
buildContent.append(lastComment.getCommentId());
buildContent.append("'>@");
buildContent.append(lastComment.getCommentAuthor());
buildContent.append("</a> ");
buildContent.append(OwoUtil.markToImg(HtmlUtil.escape(commentContent).replace("&lt;br/&gt;", "<br/>")));
comment.setCommentContent(buildContent.toString());
comment.setCommentAgent(userAgent);
comment.setCommentParent(commentId);
comment.setCommentStatus(CommentStatusEnum.PUBLISHED.getCode());
comment.setIsAdmin(1);
commentService.saveByComment(comment);
commentService.save(comment);
//邮件通知
new EmailToAuthor(comment, lastComment, post, user, commentContent).start();
@ -221,11 +229,18 @@ public class CommentController extends BaseController {
map.put("blogTitle", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()));
map.put("commentAuthor", lastComment.getCommentAuthor());
map.put("pageName", lastComment.getPost().getPostTitle());
StrBuilder pageUrl = new StrBuilder(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));
if (StrUtil.equals(post.getPostType(), PostTypeEnum.POST_TYPE_POST.getDesc())) {
map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId());
pageUrl.append("/archives/");
} else {
map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId());
pageUrl.append("/p/");
}
pageUrl.append(post.getPostUrl());
pageUrl.append("#comment-id-");
pageUrl.append(comment.getCommentId());
map.put("pageUrl",pageUrl.toString());
map.put("commentContent", lastComment.getCommentContent());
map.put("replyAuthor", user.getUserDisplayName());
map.put("replyContent", commentContent);
@ -260,11 +275,18 @@ public class CommentController extends BaseController {
try {
if (status == 1 && Validator.isEmail(comment.getCommentAuthorEmail())) {
Map<String, Object> map = new HashMap<>(6);
StrBuilder pageUrl = new StrBuilder(HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));
if (StrUtil.equals(post.getPostType(), PostTypeEnum.POST_TYPE_POST.getDesc())) {
map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/archives/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId());
pageUrl.append("/archives/");
} else {
map.put("pageUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "/p/" + post.getPostUrl() + "#comment-id-" + comment.getCommentId());
pageUrl.append("/p/");
}
pageUrl.append(post.getPostUrl());
pageUrl.append("#comment-id-");
pageUrl.append(comment.getCommentId());
map.put("pageUrl",pageUrl.toString());
map.put("pageName", post.getPostTitle());
map.put("commentContent", comment.getCommentContent());
map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));

4
src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java
View File

@ -44,7 +44,7 @@ public class MenuController {
@PostMapping(value = "/save")
public String saveMenu(@ModelAttribute Menu menu) {
try {
menuService.saveByMenu(menu);
menuService.save(menu);
} catch (Exception e) {
log.error("Saving menu failed: {}" + e.getMessage());
}
@ -74,7 +74,7 @@ public class MenuController {
@GetMapping(value = "/remove")
public String removeMenu(@RequestParam("menuId") Long menuId) {
try {
menuService.removeByMenuId(menuId);
menuService.remove(menuId);
} catch (Exception e) {
log.error("Deleting menu failed: {}", e.getMessage());
}

14
src/main/java/cc/ryanc/halo/web/controller/admin/PageController.java
View File

@ -73,7 +73,7 @@ public class PageController {
*/
@GetMapping
public String pages(Model model) {
List<Post> posts = postService.findAllPosts(PostTypeEnum.POST_TYPE_PAGE.getDesc());
List<Post> posts = postService.findAll(PostTypeEnum.POST_TYPE_PAGE.getDesc());
model.addAttribute("pages", posts);
return "admin/admin_page";
}
@ -111,7 +111,7 @@ public class PageController {
@PostMapping(value = "/links/save")
public String saveLink(@ModelAttribute Link link) {
try {
linkService.saveByLink(link);
linkService.save(link);
} catch (Exception e) {
log.error("Save/modify friendship link failed: {}", e.getMessage());
}
@ -127,7 +127,7 @@ public class PageController {
@GetMapping(value = "/links/remove")
public String removeLink(@RequestParam("linkId") Long linkId) {
try {
linkService.removeByLinkId(linkId);
linkService.remove(linkId);
} catch (Exception e) {
log.error("Deleting a friendship link failed: {}", e.getMessage());
}
@ -148,7 +148,7 @@ public class PageController {
@RequestParam(value = "size", defaultValue = "18") Integer size) {
Sort sort = new Sort(Sort.Direction.DESC, "galleryId");
Pageable pageable = PageRequest.of(page, size, sort);
Page<Gallery> galleries = galleryService.findAllGalleries(pageable);
Page<Gallery> galleries = galleryService.findAll(pageable);
model.addAttribute("galleries", galleries);
return "admin/admin_page_gallery";
}
@ -165,7 +165,7 @@ public class PageController {
if (StrUtil.isEmpty(gallery.getGalleryThumbnailUrl())) {
gallery.setGalleryThumbnailUrl(gallery.getGalleryUrl());
}
galleryService.saveByGallery(gallery);
galleryService.save(gallery);
} catch (Exception e) {
e.printStackTrace();
}
@ -196,7 +196,7 @@ public class PageController {
@ResponseBody
public JsonResult removeGallery(@RequestParam("galleryId") Long galleryId) {
try {
galleryService.removeByGalleryId(galleryId);
galleryService.remove(galleryId);
} catch (Exception e) {
log.error("Failed to delete image: {}", e.getMessage());
return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.common.delete-failed"));
@ -248,7 +248,7 @@ public class PageController {
if (StrUtil.equals(post.getPostThumbnail(), BlogPropertiesEnum.DEFAULT_THUMBNAIL.getProp())) {
post.setPostThumbnail("/static/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 10) + ".jpg");
}
postService.saveByPost(post);
postService.save(post);
logsService.save(LogsRecord.PUSH_PAGE, post.getPostTitle(), request);
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), msg);
} catch (Exception e) {

8
src/main/java/cc/ryanc/halo/web/controller/admin/PostController.java
View File

@ -206,7 +206,7 @@ public class PostController extends BaseController {
if (StrUtil.equals(post.getPostThumbnail(), BlogPropertiesEnum.DEFAULT_THUMBNAIL.getProp())) {
post.setPostThumbnail("/static/images/thumbnail/thumbnail-" + RandomUtil.randomInt(1, 10) + ".jpg");
}
postService.saveByPost(post);
postService.save(post);
logsService.save(LogsRecord.PUSH_POST, post.getPostTitle(), request);
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.save-success"));
} catch (Exception e) {
@ -240,7 +240,7 @@ public class PostController extends BaseController {
post.setPostDate(new Date());
}
post = postService.buildCategoriesAndTags(post, cateList, tagList);
post = postService.saveByPost(post);
post = postService.save(post);
if (null != post) {
return new JsonResult(ResultCodeEnum.SUCCESS.getCode(), localeMessageUtil.getMessage("code.admin.common.update-success"));
} else {
@ -293,7 +293,7 @@ public class PostController extends BaseController {
public String removePost(@RequestParam("postId") Long postId, @RequestParam("postType") String postType) {
try {
Optional<Post> post = postService.findByPostId(postId);
postService.removeByPostId(postId);
postService.remove(postId);
logsService.save(LogsRecord.REMOVE_POST, post.get().getPostTitle(), request);
} catch (Exception e) {
log.error("Delete article failed: {}", e.getMessage());
@ -353,7 +353,7 @@ public class PostController extends BaseController {
return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.post.no-baidu-token"));
}
String blogUrl = HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp());
List<Post> posts = postService.findAllPosts(PostTypeEnum.POST_TYPE_POST.getDesc());
List<Post> posts = postService.findAll(PostTypeEnum.POST_TYPE_POST.getDesc());
StringBuilder urls = new StringBuilder();
for (Post post : posts) {
urls.append(blogUrl);

4
src/main/java/cc/ryanc/halo/web/controller/admin/TagController.java
View File

@ -49,7 +49,7 @@ public class TagController {
@PostMapping(value = "/save")
public String saveTag(@ModelAttribute Tag tag) {
try {
tagService.saveByTag(tag);
tagService.save(tag);
} catch (Exception e) {
log.error("Add/modify tag failed: {}", e.getMessage());
}
@ -81,7 +81,7 @@ public class TagController {
@GetMapping(value = "/remove")
public String removeTag(@RequestParam("tagId") Long tagId) {
try {
tagService.removeByTagId(tagId);
tagService.remove(tagId);
} catch (Exception e) {
log.error("Failed to delete tag: {}", e.getMessage());
}

4
src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java
View File

@ -66,7 +66,7 @@ public class UserController {
return new JsonResult(ResultCodeEnum.FAIL.getCode(), error.getDefaultMessage());
}
}
userService.saveByUser(user);
userService.save(user);
configuration.setSharedVariable("user", userService.findUser());
session.removeAttribute(HaloConst.USER_SESSION_KEY);
} catch (Exception e) {
@ -95,7 +95,7 @@ public class UserController {
User user = userService.findByUserIdAndUserPass(userId, SecureUtil.md5(beforePass));
if (null != user) {
user.setUserPass(SecureUtil.md5(newPass));
userService.saveByUser(user);
userService.save(user);
session.removeAttribute(HaloConst.USER_SESSION_KEY);
} else {
return new JsonResult(ResultCodeEnum.FAIL.getCode(), localeMessageUtil.getMessage("code.admin.user.old-password-error"));

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiCategoryController.java
View File

@ -32,7 +32,7 @@ public class ApiCategoryController {
*/
@GetMapping
public JsonResult categories() {
List<Category> categories = categoryService.findAllCategories();
List<Category> categories = categoryService.findAll();
if (null != categories && categories.size() > 0) {
return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), categories);
} else {

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiGalleryController.java
View File

@ -33,7 +33,7 @@ public class ApiGalleryController {
*/
@GetMapping
public JsonResult galleries() {
List<Gallery> galleries = galleryService.findAllGalleries();
List<Gallery> galleries = galleryService.findAll();
if (null != galleries && galleries.size() > 0) {
return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), galleries);
} else {

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiLinkController.java
View File

@ -35,7 +35,7 @@ public class ApiLinkController {
*/
@GetMapping
public JsonResult links() {
List<Link> links = linkService.findAllLinks();
List<Link> links = linkService.findAll();
if (null != links && links.size() > 0) {
return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), links);
} else {

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiMenuController.java
View File

@ -35,7 +35,7 @@ public class ApiMenuController {
*/
@GetMapping
public JsonResult menus() {
List<Menu> menus = menuService.findAllMenus();
List<Menu> menus = menuService.findAll();
if (null != menus && menus.size() > 0) {
return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), menus);
} else {

2
src/main/java/cc/ryanc/halo/web/controller/api/ApiTagController.java
View File

@ -32,7 +32,7 @@ public class ApiTagController {
*/
@GetMapping
public JsonResult tags() {
List<Tag> tags = tagService.findAllTags();
List<Tag> tags = tagService.findAll();
if (null != tags && tags.size() > 0) {
return new JsonResult(ResponseStatusEnum.SUCCESS.getCode(), ResponseStatusEnum.SUCCESS.getMsg(), tags);
} else {

12
src/main/java/cc/ryanc/halo/web/controller/core/InstallController.java
View File

@ -115,14 +115,14 @@ public class InstallController {
user.setUserDisplayName(userDisplayName);
user.setUserEmail(userEmail);
user.setUserPass(SecureUtil.md5(userPwd));
userService.saveByUser(user);
userService.save(user);
//默认分类
Category category = new Category();
category.setCateName("未分类");
category.setCateUrl("default");
category.setCateDesc("未分类");
categoryService.saveByCategory(category);
categoryService.save(category);
//第一篇文章
Post post = new Post();
@ -139,7 +139,7 @@ public class InstallController {
post.setUser(user);
post.setCategories(categories);
post.setAllowComment(AllowCommentEnum.ALLOW.getCode());
postService.saveByPost(post);
postService.save(post);
//第一个评论
Comment comment = new Comment();
@ -154,7 +154,7 @@ public class InstallController {
comment.setCommentStatus(0);
comment.setCommentAgent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.162 Safari/537.36");
comment.setIsAdmin(0);
commentService.saveByComment(comment);
commentService.save(comment);
optionsService.saveOption(BlogPropertiesEnum.IS_INSTALL.getProp(), TrueFalseEnum.TRUE.getDesc());
@ -186,14 +186,14 @@ public class InstallController {
menuIndex.setMenuUrl("/");
menuIndex.setMenuSort(1);
menuIndex.setMenuIcon("");
menuService.saveByMenu(menuIndex);
menuService.save(menuIndex);
Menu menuArchive = new Menu();
menuArchive.setMenuName("归档");
menuArchive.setMenuUrl("/archives");
menuArchive.setMenuSort(2);
menuArchive.setMenuIcon("");
menuService.saveByMenu(menuArchive);
menuService.save(menuArchive);
HaloConst.OPTIONS.clear();
HaloConst.OPTIONS = optionsService.findAllOptions();

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontCategoryController.java
View File

@ -48,7 +48,7 @@ public class FrontCategoryController extends BaseController {
*/
@GetMapping
public String categories(Model model) {
List<Category> categories = categoryService.findAllCategories();
List<Category> categories = categoryService.findAll();
model.addAttribute("categories", categories);
return this.render("categories");
}

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
View File

@ -141,7 +141,7 @@ public class FrontCommentController {
if (StrUtil.isNotEmpty(comment.getCommentAuthorUrl())) {
comment.setCommentAuthorUrl(URLUtil.formatUrl(comment.getCommentAuthorUrl()));
}
commentService.saveByComment(comment);
commentService.save(comment);
if (comment.getCommentParent() > 0) {
new EmailToParent(comment, lastComment, post).start();
new EmailToAdmin(comment, post).start();

32
src/main/java/cc/ryanc/halo/web/controller/front/FrontIndexController.java
View File

@ -15,9 +15,10 @@ import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
/**
* <pre>
@ -61,7 +62,7 @@ public class FrontIndexController extends BaseController {
@PathVariable(value = "page") Integer page) {
Sort sort = new Sort(Sort.Direction.DESC, "postDate");
//默认显示10条
Integer size = 10;
int size = 10;
//尝试加载设置选项，用于设置显示条数
if (StrUtil.isNotBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) {
size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()));
@ -79,29 +80,6 @@ public class FrontIndexController extends BaseController {
return this.render("index");
}
/**
* ajax分页
*
* @param page page 当前页码
* @return List
*/
@GetMapping(value = "next")
@ResponseBody
public List<Post> ajaxIndex(@RequestParam(value = "page") Integer page) {
Sort sort = new Sort(Sort.Direction.DESC, "postDate");
//默认显示10条
Integer size = 10;
//尝试加载设置选项，用于设置显示条数
if (StrUtil.isNotBlank(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()))) {
size = Integer.parseInt(HaloConst.OPTIONS.get(BlogPropertiesEnum.INDEX_POSTS.getProp()));
}
//文章数据，只获取文章，没有分页
Pageable pageable = PageRequest.of(page - 1, size, sort);
List<Post> posts = postService.findPostByStatus(pageable).getContent();
return posts;
}
/**
* 搜索文章
*

2
src/main/java/cc/ryanc/halo/web/controller/front/FrontPageController.java
View File

@ -52,7 +52,7 @@ public class FrontPageController extends BaseController {
*/
@GetMapping(value = "/gallery")
public String gallery(Model model) {
List<Gallery> galleries = galleryService.findAllGalleries();
List<Gallery> galleries = galleryService.findAll();
model.addAttribute("galleries", galleries);
return this.render("gallery");
}

12
src/main/resources/templates/admin/admin_index.ftl
View File

@ -183,7 +183,7 @@
<#if (options.widget_daycount!'true')=='true'>
<div class="col-lg-3 col-xs-6" id="widgetDayCountBody">
<div class="small-box bg-red">
<div class="inner"><h3 id="blogStart"></h3><p><@spring.message code='admin.index.widgets.day-count' /></p></div>
<div class="inner"><h3 id="blogStart">${hadDays!}</h3><p><@spring.message code='admin.index.widgets.day-count' /></p></div>
<div class="icon"><i class="ion ion-pie-graph"></i></div>
<a href="#" class="small-box-footer" data-toggle="modal" data-target="#blogInfo">${options.blog_start!'0000-00-00'} <i class="fa fa-star"></i></a>
</div>
@ -366,7 +366,7 @@
<h4 class="modal-title" id="blog-data"><@spring.message code='admin.index.blog-data.title' /></h4>
</div>
<div class="modal-body">
<p>「${options.blog_title!}」<@spring.message code='admin.index.blog-data.days-count-before' /><span id="blogStartDay"></span><@spring.message code='admin.index.blog-data.days-count-after' /></p>
<p>「${options.blog_title!}」<@spring.message code='admin.index.blog-data.days-count-before' /><span id="blogStartDay">${hadDays!}</span><@spring.message code='admin.index.blog-data.days-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.during' /></p>
<p><@spring.message code='admin.index.blog-data.posts-count-before' />&nbsp;<@articleTag method="postsCount">${postsCount!0}</@articleTag>&nbsp;<@spring.message code='admin.index.blog-data.posts-count-after' /></p>
<p><@spring.message code='admin.index.blog-data.tags-count-before' />&nbsp;<@commonTag method="tags">${tags?size}</@commonTag>&nbsp;<@spring.message code='admin.index.blog-data.tags-count-after' /></p>
@ -382,14 +382,6 @@
</div>
</div>
<script type="application/javascript">
$(document).ready(function () {
var dateBegin = new Date("${options.blog_start!'0000-00-00'}");
var dateEnd = new Date();
var parseDate = dateEnd.getTime() - dateBegin.getTime();
var days = Math.floor(parseDate/(24*3600*1000));
$('#blogStart').html(days+1);
$('#blogStartDay').html(days+1);
});
$('#btnWidgetsOption').click(function () {
$('#widgetOptionsPanel').slideToggle(400);
});