From 809a753e18aa14a23bd0604b75cf5f17c9b623f1 Mon Sep 17 00:00:00 2001 From: josxy <112438556@qq.com> Date: Sat, 24 Apr 2021 16:29:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=20=E4=BF=AE=E6=AD=A3=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E9=A1=B5=E4=B8=8B=E6=8B=89=202.=20=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=89=8B=E6=9C=BA=E9=98=85=E8=AF=BB?= =?UTF-8?q?=E9=87=8F=203.=20=E6=9B=B4=E6=96=B0SpringBoot=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=BA2.3.0=204.=20=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8EJPA=E8=AF=AD=E6=B3=95=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 268 +++++++++--------- .../allms/service/impl/BlogServiceImpl.java | 14 +- .../service/impl/CommentServiceImpl.java | 4 +- .../cn/allms/service/impl/TagServiceImpl.java | 13 +- .../allms/service/impl/TypeServiceImpl.java | 12 +- src/main/resources/application-pro.yml | 4 +- src/main/resources/templates/index.html | 2 +- src/main/resources/templates/search.html | 2 +- src/main/resources/templates/tags.html | 4 +- 9 files changed, 163 insertions(+), 160 deletions(-) diff --git a/pom.xml b/pom.xml index 6684d1f..1f2b27d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,152 +1,150 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - cn.allms - blog - 0.0.2-SNAPSHOT - jar + cn.allms + blog + 0.0.2-SNAPSHOT + jar - blog - Demo project for Spring Boot + blog + Demo project for Spring Boot - - org.springframework.boot - spring-boot-starter-parent - 1.5.7.RELEASE - - + + org.springframework.boot + spring-boot-starter-parent + 2.3.0.RELEASE + + - - - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - + + + public + aliyun nexus + http://maven.aliyun.com/nexus/content/groups/public/ + + true + + + - - - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - false - - - + + + public + aliyun nexus + http://maven.aliyun.com/nexus/content/groups/public/ + + true + + + false + + + - - UTF-8 - UTF-8 - 1.8 - - 3.0.2.RELEASE - 2.1.1 - + + UTF-8 + UTF-8 + 1.8 + - - - org.springframework.boot - spring-boot-starter-aop - - - org.springframework.boot - spring-boot-starter-data-jpa - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-devtools - runtime - - - mysql - mysql-connector-java - runtime - - - org.springframework.boot - spring-boot-starter-test - test - - - - - com.atlassian.commonmark - commonmark - 0.10.0 - - - - com.atlassian.commonmark - commonmark-ext-heading-anchor - 0.10.0 - - - - com.atlassian.commonmark - commonmark-ext-gfm-tables - 0.10.0 - + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-devtools + runtime + true + + + + mysql + mysql-connector-java + runtime + + org.projectlombok lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springframework.boot + spring-boot-starter-aop + + + + com.atlassian.commonmark + commonmark + 0.10.0 + + + + com.atlassian.commonmark + commonmark-ext-heading-anchor + 0.10.0 + + + + com.atlassian.commonmark + commonmark-ext-gfm-tables + 0.10.0 + + + org.hibernate + hibernate-validator + 5.3.5.Final + + + + org.springframework.boot + spring-boot-configuration-processor + + + + org.springframework.boot + spring-boot-starter-actuator - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + 2.3.0.RELEASE + + + + repackage + + + + + + diff --git a/src/main/java/cn/allms/service/impl/BlogServiceImpl.java b/src/main/java/cn/allms/service/impl/BlogServiceImpl.java index 01a19d9..f7c53b8 100644 --- a/src/main/java/cn/allms/service/impl/BlogServiceImpl.java +++ b/src/main/java/cn/allms/service/impl/BlogServiceImpl.java @@ -37,12 +37,12 @@ public class BlogServiceImpl implements BlogService @Override public Blog getBlog(Long id) { - return blogRepository.findOne(id); + return blogRepository.findById(id).orElse(null); } @Override public Blog getAadConvertBlog(Long id) { - Blog blog = blogRepository.findOne(id); + Blog blog = blogRepository.findById(id).orElse(null); if (blog == null){ throw new NotFoundException("该博客不存在！"); } @@ -105,8 +105,8 @@ public class BlogServiceImpl implements BlogService @Override public List listRecommendBlogTop(Integer size) { - Sort sort = new Sort(Sort.Direction.DESC,"updateTime"); - Pageable pageable = new PageRequest(0,size,sort); + Sort sort = Sort.by(Sort.Direction.DESC,"updateTime"); + Pageable pageable = PageRequest.of(0,size,sort); return blogRepository.findTop(pageable); } @@ -148,7 +148,7 @@ public class BlogServiceImpl implements BlogService @Transactional @Override public Blog updateBlog(Long id, Blog blog) { - Blog b = blogRepository.findOne(id); + Blog b = blogRepository.findById(id).orElse(null); //判断是否存在这条数据 if(b == null){ throw new NotFoundException("该博客不存在"); @@ -159,9 +159,9 @@ public class BlogServiceImpl implements BlogService return blogRepository.save(b); } - @Transactional + @Transactional(rollbackFor = Exception.class) @Override public void deleteBlog(Long id) { - blogRepository.delete(id); + blogRepository.deleteById(id); } } diff --git a/src/main/java/cn/allms/service/impl/CommentServiceImpl.java b/src/main/java/cn/allms/service/impl/CommentServiceImpl.java index e21b594..3c989ee 100644 --- a/src/main/java/cn/allms/service/impl/CommentServiceImpl.java +++ b/src/main/java/cn/allms/service/impl/CommentServiceImpl.java @@ -26,7 +26,7 @@ public class CommentServiceImpl implements CommentService { @Override public List listCommentByBlogId(Long blogId) { - Sort sort = new Sort("createTime"); + Sort sort = Sort.by("createTime"); List comments = commentRepository.findByBlogIdAndParentCommentNull(blogId,sort); return CommentUtil.eachComment(comments); } @@ -38,7 +38,7 @@ public class CommentServiceImpl implements CommentService { Long parentCommentId = comment.getParentComment().getId(); System.out.println(parentCommentId); if(parentCommentId != -1){ - comment.setParentComment(commentRepository.findOne(parentCommentId)); + comment.setParentComment(commentRepository.findById(parentCommentId).orElse(null)); } else { //发布评论: comment.setParentComment(null); diff --git a/src/main/java/cn/allms/service/impl/TagServiceImpl.java b/src/main/java/cn/allms/service/impl/TagServiceImpl.java index 0b83a2d..19c500a 100644 --- a/src/main/java/cn/allms/service/impl/TagServiceImpl.java +++ b/src/main/java/cn/allms/service/impl/TagServiceImpl.java @@ -35,7 +35,7 @@ public class TagServiceImpl implements TagService { @Override public Tag getTag(Long id) { - return tagRepository.findOne(id); + return tagRepository.findById(id).orElse(null); } @Override @@ -45,8 +45,8 @@ public class TagServiceImpl implements TagService { @Override public List ListTagTop(Integer size) { - Sort sort = new Sort(Sort.Direction.DESC,"blogs.size"); - Pageable pageable = new PageRequest(0,size,sort); + Sort sort = Sort.by(Sort.Direction.DESC,"blogs.size"); + Pageable pageable = PageRequest.of(0,size,sort); return tagRepository.findTop(pageable); } @@ -57,12 +57,13 @@ public class TagServiceImpl implements TagService { @Override public List ListTag(String ids) { - return tagRepository.findAll(convertToList(ids)); + // todo + return tagRepository.findAll(); } @Override public Tag updateTag(Long id, Tag tag) { - Tag t = tagRepository.findOne(id); + Tag t = tagRepository.findById(id).orElse(null); if(t==null){ throw new NotFoundException("不存在该标签"); } @@ -73,7 +74,7 @@ public class TagServiceImpl implements TagService { @Override public void deleteTag(Long id) { - tagRepository.delete(id); + tagRepository.deleteById(id); } @Override diff --git a/src/main/java/cn/allms/service/impl/TypeServiceImpl.java b/src/main/java/cn/allms/service/impl/TypeServiceImpl.java index 69ab661..904abbd 100644 --- a/src/main/java/cn/allms/service/impl/TypeServiceImpl.java +++ b/src/main/java/cn/allms/service/impl/TypeServiceImpl.java @@ -38,7 +38,7 @@ public class TypeServiceImpl implements TypeService { @Transactional @Override public Type getType(Long id) { - return typeRepository.findOne(id); + return typeRepository.findById(id).orElse(null); } @Transactional @@ -54,15 +54,15 @@ public class TypeServiceImpl implements TypeService { @Override public List listTypeTop(Integer size) { - Sort sort = new Sort(Sort.Direction.DESC, "blogs.size"); - Pageable pageable = new PageRequest(0, size, sort); + Sort sort = Sort.by(Sort.Direction.DESC, "blogs.size"); + Pageable pageable = PageRequest.of(0, size, sort); return typeRepository.findTop(pageable); } @Transactional @Override public Type updateType(Long id, Type type) { - Type t = typeRepository.findOne(id); + Type t = typeRepository.findById(id).orElse(null); if(t == null){ throw new NotFoundException("不存在该类型"); } @@ -70,10 +70,10 @@ public class TypeServiceImpl implements TypeService { return typeRepository.save(t); } - @Transactional + @Transactional(rollbackFor = Exception.class) @Override public void deleteType(Long id) { - typeRepository.delete(id); + typeRepository.deleteById(id); } @Override diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index d0db397..c58a570 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -1,7 +1,7 @@ #thymeleaf模板 spring: datasource: - driver-class-name: com.mysql.jdbc.Driver + driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://localhost:3306/blog?useUnicode=true&characterEncoding=utf-8 username: root password: 123456 @@ -16,5 +16,7 @@ logging: root: warn com.yrp: info file: log/-blogpro.log + +# 服务端口 server: port: 9420 diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 4c841e1..845206d 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -50,7 +50,7 @@
2019-10-01
-
+
7437
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html index 18540ee..99c8fa1 100644 --- a/src/main/resources/templates/search.html +++ b/src/main/resources/templates/search.html @@ -31,7 +31,7 @@ -
+