From a6d72991ffb16b98e96f8587af6211b0d37b94ee Mon Sep 17 00:00:00 2001 From: RYAN0UP_ Date: Mon, 26 Mar 2018 17:52:50 +0800 Subject: [PATCH] =?UTF-8?q?:alien:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E6=94=BE=E6=88=91=E7=8A=AF=E5=BC=BA=E8=BF=AB=E7=97=87?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ryanc/halo/config/MvcConfiguration.java | 4 +-- .../cc/ryanc/halo/model/domain/Gallery.java | 2 +- .../java/cc/ryanc/halo/model/dto/Archive.java | 2 +- .../cc/ryanc/halo/model/dto/HaloConst.java | 1 + .../cc/ryanc/halo/model/dto/LogsRecord.java | 2 +- .../java/cc/ryanc/halo/model/dto/Theme.java | 2 +- .../halo/repository/AttachmentRepository.java | 2 +- .../halo/repository/CommentRepository.java | 2 +- .../halo/repository/GalleryRepository.java | 2 +- .../ryanc/halo/repository/LinkRepository.java | 2 +- .../ryanc/halo/repository/LogsRepository.java | 2 +- .../ryanc/halo/repository/MenuRepository.java | 2 +- .../ryanc/halo/repository/PostRepository.java | 2 +- .../ryanc/halo/repository/TagRepository.java | 2 +- .../ryanc/halo/service/AttachmentService.java | 3 +- .../ryanc/halo/service/CategoryService.java | 1 + .../cc/ryanc/halo/service/CommentService.java | 2 +- .../cc/ryanc/halo/service/GalleryService.java | 2 +- .../cc/ryanc/halo/service/LinkService.java | 1 + .../cc/ryanc/halo/service/LogsService.java | 2 +- .../cc/ryanc/halo/service/MailService.java | 2 +- .../cc/ryanc/halo/service/MenuService.java | 2 +- .../cc/ryanc/halo/service/OptionsService.java | 1 - .../cc/ryanc/halo/service/PostService.java | 1 + .../cc/ryanc/halo/service/TagService.java | 2 +- .../cc/ryanc/halo/service/UserService.java | 5 ++-- .../service/impl/AttachmentServiceImpl.java | 2 +- .../halo/service/impl/CommentServiceImpl.java | 2 +- .../halo/service/impl/GalleryServiceImpl.java | 2 +- .../halo/service/impl/LogsServiceImpl.java | 2 +- .../halo/service/impl/MailServiceImpl.java | 2 +- .../halo/service/impl/MenuServiceImpl.java | 2 +- .../halo/service/impl/OptionsServiceImpl.java | 2 +- .../halo/service/impl/TagServiceImpl.java | 2 +- .../halo/service/impl/UserServiceImpl.java | 14 +++++----- .../halo/web/controller/IndexController.java | 28 +++++++++---------- .../web/controller/InstallController.java | 2 +- .../web/controller/admin/AdminController.java | 2 +- .../controller/admin/BackupController.java | 1 - .../controller/admin/CommentController.java | 8 ++++-- .../controller/admin/GalleryController.java | 2 +- .../web/controller/admin/MenuController.java | 2 +- .../web/controller/admin/UserController.java | 2 +- .../web/interceptor/InstallInterceptor.java | 2 +- .../templates/admin/admin_comment.ftl | 1 + 45 files changed, 70 insertions(+), 63 deletions(-) diff --git a/src/main/java/cc/ryanc/halo/config/MvcConfiguration.java b/src/main/java/cc/ryanc/halo/config/MvcConfiguration.java index 71b6f6cbe..b46f715fa 100644 --- a/src/main/java/cc/ryanc/halo/config/MvcConfiguration.java +++ b/src/main/java/cc/ryanc/halo/config/MvcConfiguration.java @@ -11,8 +11,8 @@ import org.springframework.web.servlet.config.annotation.*; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/2 + * @version : 1.0 * description: */ @Slf4j @@ -22,8 +22,6 @@ import org.springframework.web.servlet.config.annotation.*; @PropertySource(value = "classpath:application.yaml",ignoreResourceNotFound = true,encoding = "UTF-8") public class MvcConfiguration implements WebMvcConfigurer { - - @Autowired private LoginInterceptor loginInterceptor; diff --git a/src/main/java/cc/ryanc/halo/model/domain/Gallery.java b/src/main/java/cc/ryanc/halo/model/domain/Gallery.java index 95d046bf3..642eaf3ef 100644 --- a/src/main/java/cc/ryanc/halo/model/domain/Gallery.java +++ b/src/main/java/cc/ryanc/halo/model/domain/Gallery.java @@ -11,8 +11,8 @@ import java.util.Date; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/2/26 + * @version : 1.0 * description : */ diff --git a/src/main/java/cc/ryanc/halo/model/dto/Archive.java b/src/main/java/cc/ryanc/halo/model/dto/Archive.java index bf34ef649..c16e958f9 100644 --- a/src/main/java/cc/ryanc/halo/model/dto/Archive.java +++ b/src/main/java/cc/ryanc/halo/model/dto/Archive.java @@ -7,8 +7,8 @@ import java.util.List; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/20 + * @version : 1.0 * description : 文章归档数据 */ @Data diff --git a/src/main/java/cc/ryanc/halo/model/dto/HaloConst.java b/src/main/java/cc/ryanc/halo/model/dto/HaloConst.java index 85ed73610..262a182ff 100644 --- a/src/main/java/cc/ryanc/halo/model/dto/HaloConst.java +++ b/src/main/java/cc/ryanc/halo/model/dto/HaloConst.java @@ -15,6 +15,7 @@ import java.util.Map; * description: 环境常量 */ public class HaloConst { + /** * 所有设置选项（key,value） */ diff --git a/src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java b/src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java index 58a8c7257..dfe426c8b 100644 --- a/src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java +++ b/src/main/java/cc/ryanc/halo/model/dto/LogsRecord.java @@ -2,9 +2,9 @@ package cc.ryanc.halo.model.dto; /** * @author : RYAN0UP + * @date : 2018/1/19 * @version : 1.0 * description : - * @date : 2018/1/19 */ public interface LogsRecord { diff --git a/src/main/java/cc/ryanc/halo/model/dto/Theme.java b/src/main/java/cc/ryanc/halo/model/dto/Theme.java index f0a347873..6cad7cba3 100644 --- a/src/main/java/cc/ryanc/halo/model/dto/Theme.java +++ b/src/main/java/cc/ryanc/halo/model/dto/Theme.java @@ -6,8 +6,8 @@ import java.io.Serializable; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/3 + * @version : 1.0 * description : 主题数据 */ @Data diff --git a/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java b/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java index 789f4105e..e6684f46f 100644 --- a/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/AttachmentRepository.java @@ -7,9 +7,9 @@ import org.springframework.data.jpa.repository.JpaRepository; /** * @author : RYAN0UP + * @date : 2018/1/10 * @version : 1.0 * description : - * @date : 2018/1/10 */ public interface AttachmentRepository extends JpaRepository{ diff --git a/src/main/java/cc/ryanc/halo/repository/CommentRepository.java b/src/main/java/cc/ryanc/halo/repository/CommentRepository.java index 3db3982b3..d3142a5dc 100644 --- a/src/main/java/cc/ryanc/halo/repository/CommentRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/CommentRepository.java @@ -11,9 +11,9 @@ import java.util.List; /** * @author : RYAN0UP + * @date : 2018/1/22 * @version : 1.0 * description : - * @date : 2018/1/22 */ public interface CommentRepository extends JpaRepository { diff --git a/src/main/java/cc/ryanc/halo/repository/GalleryRepository.java b/src/main/java/cc/ryanc/halo/repository/GalleryRepository.java index 320439e8e..21e412515 100644 --- a/src/main/java/cc/ryanc/halo/repository/GalleryRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/GalleryRepository.java @@ -5,8 +5,8 @@ import org.springframework.data.jpa.repository.JpaRepository; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/2/26 + * @version : 1.0 * description : */ public interface GalleryRepository extends JpaRepository { diff --git a/src/main/java/cc/ryanc/halo/repository/LinkRepository.java b/src/main/java/cc/ryanc/halo/repository/LinkRepository.java index 282ef72fe..05fbbdbef 100755 --- a/src/main/java/cc/ryanc/halo/repository/LinkRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/LinkRepository.java @@ -4,9 +4,9 @@ import cc.ryanc.halo.model.domain.Link; import org.springframework.data.jpa.repository.JpaRepository; /** - * className: LinkRepository * @author : RYAN0UP * @date : 2017/11/14 + * @version : 1.0 * description: 友情链接持久层 */ public interface LinkRepository extends JpaRepository{ diff --git a/src/main/java/cc/ryanc/halo/repository/LogsRepository.java b/src/main/java/cc/ryanc/halo/repository/LogsRepository.java index 9489b61b5..2622a5ea3 100644 --- a/src/main/java/cc/ryanc/halo/repository/LogsRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/LogsRepository.java @@ -8,8 +8,8 @@ import java.util.List; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/19 + * @version : 1.0 * description : */ public interface LogsRepository extends JpaRepository { diff --git a/src/main/java/cc/ryanc/halo/repository/MenuRepository.java b/src/main/java/cc/ryanc/halo/repository/MenuRepository.java index 23ba5e087..48e43fcbb 100644 --- a/src/main/java/cc/ryanc/halo/repository/MenuRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/MenuRepository.java @@ -8,8 +8,8 @@ import java.util.List; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/24 + * @version : 1.0 * description : */ public interface MenuRepository extends JpaRepository { diff --git a/src/main/java/cc/ryanc/halo/repository/PostRepository.java b/src/main/java/cc/ryanc/halo/repository/PostRepository.java index e8e2a40a6..41af5b4f9 100755 --- a/src/main/java/cc/ryanc/halo/repository/PostRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/PostRepository.java @@ -13,8 +13,8 @@ import java.util.List; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2017/11/14 + * @version : 1.0 * description : 文章持久层 */ public interface PostRepository extends JpaRepository{ diff --git a/src/main/java/cc/ryanc/halo/repository/TagRepository.java b/src/main/java/cc/ryanc/halo/repository/TagRepository.java index 8ee9aeeff..3b2acabaf 100644 --- a/src/main/java/cc/ryanc/halo/repository/TagRepository.java +++ b/src/main/java/cc/ryanc/halo/repository/TagRepository.java @@ -5,9 +5,9 @@ import org.springframework.data.jpa.repository.JpaRepository; /** * @author : RYAN0UP + * @date : 2018/1/12 * @version : 1.0 * description : - * @date : 2018/1/12 */ public interface TagRepository extends JpaRepository{ diff --git a/src/main/java/cc/ryanc/halo/service/AttachmentService.java b/src/main/java/cc/ryanc/halo/service/AttachmentService.java index f4b48b51f..ab6809964 100644 --- a/src/main/java/cc/ryanc/halo/service/AttachmentService.java +++ b/src/main/java/cc/ryanc/halo/service/AttachmentService.java @@ -9,11 +9,12 @@ import java.util.Optional; /** * @author : RYAN0UP + * @date : 2018/1/10 * @version : 1.0 * description : - * @date : 2018/1/10 */ public interface AttachmentService { + /** * 添加附件信息 * diff --git a/src/main/java/cc/ryanc/halo/service/CategoryService.java b/src/main/java/cc/ryanc/halo/service/CategoryService.java index feea94262..9ce1e251b 100755 --- a/src/main/java/cc/ryanc/halo/service/CategoryService.java +++ b/src/main/java/cc/ryanc/halo/service/CategoryService.java @@ -12,6 +12,7 @@ import java.util.Optional; * description : */ public interface CategoryService { + /** * 新增分类目录 * diff --git a/src/main/java/cc/ryanc/halo/service/CommentService.java b/src/main/java/cc/ryanc/halo/service/CommentService.java index dea1d6c15..0f44dee14 100644 --- a/src/main/java/cc/ryanc/halo/service/CommentService.java +++ b/src/main/java/cc/ryanc/halo/service/CommentService.java @@ -10,8 +10,8 @@ import java.util.Optional; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/22 + * @version : 1.0 * description : */ public interface CommentService { diff --git a/src/main/java/cc/ryanc/halo/service/GalleryService.java b/src/main/java/cc/ryanc/halo/service/GalleryService.java index 27699a8df..a3fbe5b19 100644 --- a/src/main/java/cc/ryanc/halo/service/GalleryService.java +++ b/src/main/java/cc/ryanc/halo/service/GalleryService.java @@ -9,8 +9,8 @@ import java.util.Optional; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/2/26 + * @version : 1.0 * description : */ public interface GalleryService { diff --git a/src/main/java/cc/ryanc/halo/service/LinkService.java b/src/main/java/cc/ryanc/halo/service/LinkService.java index 26a292849..124c69e7c 100755 --- a/src/main/java/cc/ryanc/halo/service/LinkService.java +++ b/src/main/java/cc/ryanc/halo/service/LinkService.java @@ -12,6 +12,7 @@ import java.util.Optional; * description: */ public interface LinkService { + /** * 新增友情链接 * diff --git a/src/main/java/cc/ryanc/halo/service/LogsService.java b/src/main/java/cc/ryanc/halo/service/LogsService.java index a9712422c..4b0b1b996 100644 --- a/src/main/java/cc/ryanc/halo/service/LogsService.java +++ b/src/main/java/cc/ryanc/halo/service/LogsService.java @@ -9,9 +9,9 @@ import java.util.Optional; /** * @author : RYAN0UP + * @date : 2018/1/19 * @version : 1.0 * description : - * @date : 2018/1/19 */ public interface LogsService { diff --git a/src/main/java/cc/ryanc/halo/service/MailService.java b/src/main/java/cc/ryanc/halo/service/MailService.java index 71ce7a0d8..cf053158d 100644 --- a/src/main/java/cc/ryanc/halo/service/MailService.java +++ b/src/main/java/cc/ryanc/halo/service/MailService.java @@ -4,9 +4,9 @@ import java.util.Map; /** * @author : RYAN0UP + * @date : 2018/1/23 * @version : 1.0 * description : - * @date : 2018/1/23 */ public interface MailService { diff --git a/src/main/java/cc/ryanc/halo/service/MenuService.java b/src/main/java/cc/ryanc/halo/service/MenuService.java index a11298455..4e5e0f3e0 100644 --- a/src/main/java/cc/ryanc/halo/service/MenuService.java +++ b/src/main/java/cc/ryanc/halo/service/MenuService.java @@ -7,9 +7,9 @@ import java.util.Optional; /** * @author : RYAN0UP + * @date : 2018/1/24 * @version : 1.0 * description : - * @date : 2018/1/24 */ public interface MenuService { diff --git a/src/main/java/cc/ryanc/halo/service/OptionsService.java b/src/main/java/cc/ryanc/halo/service/OptionsService.java index d8b445d2b..3a226029c 100755 --- a/src/main/java/cc/ryanc/halo/service/OptionsService.java +++ b/src/main/java/cc/ryanc/halo/service/OptionsService.java @@ -12,7 +12,6 @@ import java.util.Map; */ public interface OptionsService { - /** * 保存单个设置选项 * diff --git a/src/main/java/cc/ryanc/halo/service/PostService.java b/src/main/java/cc/ryanc/halo/service/PostService.java index 70bf4f8ff..e07f1e6ec 100755 --- a/src/main/java/cc/ryanc/halo/service/PostService.java +++ b/src/main/java/cc/ryanc/halo/service/PostService.java @@ -17,6 +17,7 @@ import java.util.Optional; * description : */ public interface PostService { + /** * 新增文章 * diff --git a/src/main/java/cc/ryanc/halo/service/TagService.java b/src/main/java/cc/ryanc/halo/service/TagService.java index ef43bbec5..cbe857c1c 100644 --- a/src/main/java/cc/ryanc/halo/service/TagService.java +++ b/src/main/java/cc/ryanc/halo/service/TagService.java @@ -7,8 +7,8 @@ import java.util.Optional; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/12 + * @version : 1.0 * description : */ public interface TagService { diff --git a/src/main/java/cc/ryanc/halo/service/UserService.java b/src/main/java/cc/ryanc/halo/service/UserService.java index 912ac555b..07fcc2874 100755 --- a/src/main/java/cc/ryanc/halo/service/UserService.java +++ b/src/main/java/cc/ryanc/halo/service/UserService.java @@ -7,11 +7,12 @@ import java.util.List; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2017/11/14 + * @version : 1.0 * description: */ public interface UserService { + /** * 保存个人资料 * @@ -41,7 +42,7 @@ public interface UserService { * * @return list */ - List findAllUser(); + User findUser(); /** * 根据用户编号和密码查询 diff --git a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java index 0f41b0eee..b6febb04b 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/AttachmentServiceImpl.java @@ -13,9 +13,9 @@ import java.util.Optional; /** * @author : RYAN0UP + * @date : 2018/1/10 * @version : 1.0 * description : - * @date : 2018/1/10 */ @Service public class AttachmentServiceImpl implements AttachmentService{ diff --git a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java index 34b676032..ff85b3f94 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/CommentServiceImpl.java @@ -15,9 +15,9 @@ import java.util.Optional; /** * @author : RYAN0UP + * @date : 2018/1/22 * @version : 1.0 * description : - * @date : 2018/1/22 */ @Service public class CommentServiceImpl implements CommentService { diff --git a/src/main/java/cc/ryanc/halo/service/impl/GalleryServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/GalleryServiceImpl.java index e4315bb90..451e939a3 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/GalleryServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/GalleryServiceImpl.java @@ -13,8 +13,8 @@ import java.util.Optional; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/2/26 + * @version : 1.0 * description : */ @Service diff --git a/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java index 1b6c45dbb..5bd73c026 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/LogsServiceImpl.java @@ -13,9 +13,9 @@ import java.util.Optional; /** * @author : RYAN0UP + * @date : 2018/1/19 * @version : 1.0 * description : - * @date : 2018/1/19 */ @Service public class LogsServiceImpl implements LogsService { diff --git a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java index ac8470730..54a8caf9a 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/MailServiceImpl.java @@ -14,9 +14,9 @@ import java.util.Map; /** * @author : RYAN0UP + * @date : 2018/1/23 * @version : 1.0 * description : - * @date : 2018/1/23 */ @Service public class MailServiceImpl implements MailService{ diff --git a/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java index 9c32015f2..ee81bbf32 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/MenuServiceImpl.java @@ -11,9 +11,9 @@ import java.util.Optional; /** * @author : RYAN0UP + * @date : 2018/1/24 * @version : 1.0 * description : - * @date : 2018/1/24 */ @Service public class MenuServiceImpl implements MenuService{ diff --git a/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java index c45305474..f34e24367 100755 --- a/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/OptionsServiceImpl.java @@ -15,8 +15,8 @@ import java.util.Map; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2017/11/14 + * @version : 1.0 * description: */ @Service diff --git a/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java index dce69e7d5..6648dca2f 100644 --- a/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/TagServiceImpl.java @@ -11,8 +11,8 @@ import java.util.Optional; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/12 + * @version : 1.0 * description : */ @Service diff --git a/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java b/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java index 4c7ec83cb..767297963 100755 --- a/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java +++ b/src/main/java/cc/ryanc/halo/service/impl/UserServiceImpl.java @@ -11,8 +11,8 @@ import java.util.List; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2017/11/14 + * @version : 1.0 * description: */ @Service @@ -61,8 +61,8 @@ public class UserServiceImpl implements UserService { * @return list */ @Override - public List findAllUser() { - return userRepository.findAll(); + public User findUser() { + return userRepository.findAll().get(0); } /** @@ -84,7 +84,7 @@ public class UserServiceImpl implements UserService { */ @Override public void updateUserLoginEnable(String enable) { - User user = this.findAllUser().get(0); + User user = this.findUser(); user.setLoginEnable(enable); userRepository.save(user); } @@ -96,7 +96,7 @@ public class UserServiceImpl implements UserService { */ @Override public User updateUserLoginLast(Date lastDate) { - User user = this.findAllUser().get(0); + User user = this.findUser(); user.setLoginLast(lastDate); userRepository.save(user); return user; @@ -109,7 +109,7 @@ public class UserServiceImpl implements UserService { */ @Override public Integer updateUserLoginError() { - User user = this.findAllUser().get(0); + User user = this.findUser(); user.setLoginError(user.getLoginError()+1); userRepository.save(user); return user.getLoginError(); @@ -120,7 +120,7 @@ public class UserServiceImpl implements UserService { */ @Override public User updateUserNormal() { - User user = this.findAllUser().get(0); + User user = this.findUser(); user.setLoginEnable("true"); user.setLoginError(0); user.setLoginLast(new Date()); diff --git a/src/main/java/cc/ryanc/halo/web/controller/IndexController.java b/src/main/java/cc/ryanc/halo/web/controller/IndexController.java index 35a8ef85f..771e63ce5 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/IndexController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/IndexController.java @@ -100,8 +100,8 @@ public class IndexController extends BaseController{ model.addAttribute("is_home",true); //用户信息 - List users = userService.findAllUser(); - model.addAttribute("user",users.get(0)); + User user = userService.findUser(); + model.addAttribute("user",user); //所有分类目录 List categories = categoryService.findAllCategories(); @@ -177,8 +177,8 @@ public class IndexController extends BaseController{ model.addAttribute("postsCount",postService.findAllPosts().size()); //用户信息 - List users = userService.findAllUser(); - model.addAttribute("user",users.get(0)); + User user = userService.findUser(); + model.addAttribute("user",user); //所有分类目录 List categories = categoryService.findAllCategories(); @@ -267,8 +267,8 @@ public class IndexController extends BaseController{ model.addAttribute("links",links); //用户信息 - List users = userService.findAllUser(); - model.addAttribute("user",users.get(0)); + User user = userService.findUser(); + model.addAttribute("user",user); model.addAttribute("is_links",true); @@ -308,8 +308,8 @@ public class IndexController extends BaseController{ List categories = categoryService.findAllCategories(); model.addAttribute("categories",categories); - List users = userService.findAllUser(); - model.addAttribute("user",users.get(0)); + User user = userService.findUser(); + model.addAttribute("user",user); //文章总数 model.addAttribute("postsCount",postService.findAllPosts().size()); @@ -380,8 +380,8 @@ public class IndexController extends BaseController{ model.addAttribute("archives",archives); //用户信息 - List users = userService.findAllUser(); - model.addAttribute("user",users.get(0)); + User user = userService.findUser(); + model.addAttribute("user",user); //菜单列表 List menus = menuService.findAllMenus(); @@ -424,8 +424,8 @@ public class IndexController extends BaseController{ model.addAttribute("postsCount",postService.findAllPosts().size()); //用户信息 - List users = userService.findAllUser(); - model.addAttribute("user",users.get(0)); + User user = userService.findUser(); + model.addAttribute("user",user); //分类目录 List categories = categoryService.findAllCategories(); @@ -505,12 +505,12 @@ public class IndexController extends BaseController{ try { //发送邮件到博主 Map map = new HashMap<>(); - map.put("author",userService.findAllUser().get(0).getUserDisplayName()); + map.put("author",userService.findUser().getUserDisplayName()); map.put("pageName",postService.findByPostId(post.getPostId()).get().getPostTitle()); map.put("siteUrl",HaloConst.OPTIONS.get("site_url")); map.put("visitor",comment.getCommentAuthor()); map.put("commentContent",comment.getCommentContent()); - mailService.sendTemplateMail(userService.findAllUser().get(0).getUserEmail(),"有新的评论",map,"common/mail/mail_admin.ftl"); + mailService.sendTemplateMail(userService.findUser().getUserEmail(),"有新的评论",map,"common/mail/mail_admin.ftl"); }catch (Exception e){ log.error("邮件服务器未配置："+e.getMessage()); } diff --git a/src/main/java/cc/ryanc/halo/web/controller/InstallController.java b/src/main/java/cc/ryanc/halo/web/controller/InstallController.java index 7b934426f..89a45a99f 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/InstallController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/InstallController.java @@ -21,8 +21,8 @@ import java.util.List; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/28 + * @version : 1.0 * description : 安装控制器 */ @Slf4j diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java index d41ba5713..7aa10f6f4 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/AdminController.java @@ -120,7 +120,7 @@ public class AdminController extends BaseController{ HttpSession session){ String status = "false"; try { - User aUser = userService.findAllUser().get(0); + User aUser = userService.findUser(); User user = null; if("false".equals(aUser.getLoginEnable())){ status = "disable"; diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java index 716835b38..3418df711 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java @@ -29,7 +29,6 @@ public class BackupController { @Autowired private PostService postService; - /** * 渲染备份页面 * diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java index b7cdc098d..091fd1d27 100755 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java @@ -125,7 +125,7 @@ public class CommentController extends BaseController{ map.put("commentContent", comment.getCommentContent()); map.put("siteUrl", HaloConst.OPTIONS.get("site_url")); map.put("siteTitle", HaloConst.OPTIONS.get("site_title")); - map.put("author", userService.findAllUser().get(0).getUserDisplayName()); + map.put("author", userService.findUser().getUserDisplayName()); mailService.sendTemplateMail( comment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get("site_title") + "的评论已审核通过！", map, "common/mail/mail_passed.ftl"); @@ -184,6 +184,10 @@ public class CommentController extends BaseController{ //被回复的评论 Comment lastComment = commentService.findCommentById(commentId).get(); + //修改被回复的评论的状态 + lastComment.setCommentStatus(0); + commentService.saveByComment(lastComment); + //保存评论 Comment comment = new Comment(); comment.setPost(post); @@ -191,7 +195,7 @@ public class CommentController extends BaseController{ comment.setCommentAuthorEmail(user.getUserEmail()); comment.setCommentAuthorUrl(HaloConst.OPTIONS.get("site_url")); comment.setCommentAuthorIp(HaloUtil.getIpAddr(request)); - comment.setCommentAuthorAvatarMd5(HaloUtil.getMD5(userService.findAllUser().get(0).getUserEmail())); + comment.setCommentAuthorAvatarMd5(HaloUtil.getMD5(userService.findUser().getUserEmail())); comment.setCommentDate(new Date()); String lastContent = " //@"+lastComment.getCommentAuthor()+":"+lastComment.getCommentContent(); comment.setCommentContent(commentContent+lastContent); diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/GalleryController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/GalleryController.java index 60102b581..1f210d5ce 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/GalleryController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/GalleryController.java @@ -9,8 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/2/26 + * @version : 1.0 * description : */ @Slf4j diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java index 1b2a08089..54a44466d 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/MenuController.java @@ -16,9 +16,9 @@ import java.util.List; /** * @author : RYAN0UP + * @date : 2018/1/30 * @version : 1.0 * description : - * @date : 2018/1/30 */ @Slf4j @Controller diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java index 3802be6c0..fab8c82d3 100644 --- a/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java +++ b/src/main/java/cc/ryanc/halo/web/controller/admin/UserController.java @@ -33,7 +33,7 @@ public class UserController { */ @GetMapping public String profile(Model model){ - model.addAttribute("user",userService.findAllUser().get(0)); + model.addAttribute("user",userService.findUser()); //设置选项 model.addAttribute("options",HaloConst.OPTIONS); return "admin/admin_profile"; diff --git a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java index 22e9dfa8a..de941c75e 100644 --- a/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java +++ b/src/main/java/cc/ryanc/halo/web/interceptor/InstallInterceptor.java @@ -11,8 +11,8 @@ import java.io.File; /** * @author : RYAN0UP - * @version : 1.0 * @date : 2018/1/28 + * @version : 1.0 * description : 安装拦截器 */ @Component diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl index 387fab348..e366b65f5 100755 --- a/src/main/resources/templates/admin/admin_comment.ftl +++ b/src/main/resources/templates/admin/admin_comment.ftl @@ -61,6 +61,7 @@ <#break > <#case 1> 通过 + 通过并回复 <#break > <#case 2>