新增及编辑文章功能

.gitignore

@@ -1,5 +1,7 @@
 .idea/
 target/
+# 忽略上传图片的文件夹
+upload/
 
 # Compiled class file
 *.class

src/main/java/cc/bnblogs/controller/AdminController.java

@@ -1,13 +1,18 @@
 package cc.bnblogs.controller;
 
+import cc.bnblogs.pojo.Article;
 import cc.bnblogs.pojo.Category;
+import cc.bnblogs.service.ArticleService;
 import cc.bnblogs.service.CategoryService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author zfp@bnblogs.cc
@@ -17,9 +22,11 @@ import java.util.List;
 @RequestMapping("/admin")
 public class AdminController {
     private final CategoryService categoryService;
+    private final ArticleService articleService;
 
-    public AdminController(CategoryService categoryService) {
+    public AdminController(CategoryService categoryService, ArticleService articleService) {
         this.categoryService = categoryService;
+        this.articleService = articleService;
     }
 
     @GetMapping("/")
@@ -54,11 +61,15 @@ public class AdminController {
         return "admin/comment";
     }
 
+    // 打开编辑文章界面可以带一个id参数
     @GetMapping("/write.html")
-    public String write(Model model) {
+    public String write(@RequestParam(required = false)Integer id, Model model) {
         // 获取分类列表
         List<Category> categories = categoryService.list();
+        // 默认开启评论
+        Article article = Objects.isNull(id) ?  Article.builder().allowComment(1).build() : articleService.detail(id);
         model.addAttribute("categories",categories);
+        model.addAttribute("article",article);
         return "admin/write";
     }
 }

src/main/java/cc/bnblogs/controller/ArticleController.java

@@ -51,8 +51,9 @@ public class ArticleController {
      * @param article 修改的文章
      * @return 修改结果
      */
+    // @RequestBody: 可以接收json类型的数据
     @PostMapping("/")
-    public Result<String> save(Article article) {
+    public Result<String> save(@RequestBody Article article) {
         articleService.save(article);
         return Result.success();
     }

src/main/java/cc/bnblogs/pojo/Article.java

@@ -54,4 +54,18 @@ public class Article {
     // 分类和文章是一对多关系
     @ManyToOne
     private Category category;
+
+    // 文章
+    public static final Integer TYPE_ARTICLE = 1;
+    // 页面
+    public static final Integer TYPE_PAGE = 2;
+    // 文章已发布
+    public static final Integer STATUS_PUBLISH = 1;
+    // 草稿
+    public static final Integer STATUS_DRAFT = 2;
+    // 允许评论
+    public static final Integer COMMENT_ENABLE = 1;
+    // 不允许评论
+    public static final Integer COMMENT_DISABLE = 2;
+
 }

src/main/java/cc/bnblogs/service/ArticleService.java

@@ -1,10 +1,15 @@
 package cc.bnblogs.service;
 
 import cc.bnblogs.mapper.ArticleMapper;
+import cc.bnblogs.mapper.TagMapper;
 import cc.bnblogs.pojo.Article;
 import org.springframework.stereotype.Service;
 
+import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @author zfp@bnblogs.cc
@@ -12,11 +17,13 @@ import java.util.List;
  */
 @Service
 public class ArticleService {
+    private final TagMapper tagMapper;
 
     private final ArticleMapper articleMapper;
 
-    public ArticleService(ArticleMapper articleMapper) {
+    public ArticleService(ArticleMapper articleMapper, TagMapper tagMapper) {
         this.articleMapper = articleMapper;
+        this.tagMapper = tagMapper;
     }
 
     /**
@@ -48,7 +55,34 @@ public class ArticleService {
      * 保存文章
      * @param article 待保存的文章对象
      */
+    @Transactional
     public void save(Article article) {
+        // 修改更新时间
+        article.setUpdated(new Date());
+        // 设置空字段的默认值
+        // 设置文章类型(默认是文章)
+        if (Objects.isNull(article.getType())) {
+            article.setType(Article.TYPE_ARTICLE);
+        }
+        // 设置文章状态(默认是发布状态)
+        if (Objects.isNull(article.getStatus())) {
+            article.setStatus(Article.STATUS_PUBLISH);
+        }
+        // 设置是否可以评论(默认禁止评论)
+        if (Objects.isNull(article.getAllowComment())) {
+            article.setAllowComment(Article.COMMENT_DISABLE);
+        }
+        // 如果文章是新建的，设置创建时间;设置访问量为0
+        if (Objects.isNull(article.getCreated())) {
+            article.setCreated(new Date());
+            article.setViews(0);
+        }
+        // 将数据库中不存在的标签插入数据库中
+        article.setTags(article.getTags().stream().peek(x -> {
+            if (Objects.isNull(x.getId())) {
+                x.setId(tagMapper.save(x).getId());
+            }
+        }).collect(Collectors.toList()));
         articleMapper.save(article);
     }
 

src/main/java/cc/bnblogs/utils/UpdateUtil.java

@@ -0,0 +1,48 @@
+package cc.bnblogs.utils;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+
+import java.beans.PropertyDescriptor;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * 更新工具类(忽略为null的字段)
+ */
+public class UpdateUtil {
+ 
+  /**
+   * 所有为空值的属性都不copy
+   * @param source
+   * @param target
+   */
+  public static void copyNullProperties(Object source, Object target) {
+    BeanUtils.copyProperties(source, target, getNullField(source));
+  }
+ 
+  /**
+   * 获取属性中为空的字段
+   *
+   * @param target
+   * @return
+   */
+  private static String[] getNullField(Object target) {
+    BeanWrapper beanWrapper = new BeanWrapperImpl(target);
+    PropertyDescriptor[] propertyDescriptors = beanWrapper.getPropertyDescriptors();
+    Set<String> notNullFieldSet = new HashSet<>();
+    if (propertyDescriptors.length > 0) {
+      for (PropertyDescriptor p : propertyDescriptors) {
+        String name = p.getName();
+        Object value = beanWrapper.getPropertyValue(name);
+        if (Objects.isNull(value)) {
+          notNullFieldSet.add(name);
+        }
+      }
+    }
+    String[] notNullField = new String[notNullFieldSet.size()];
+    return notNullFieldSet.toArray(notNullField);
+  }
+}

src/main/resources/static/plugin/editormd/editormd.js

@@ -3365,7 +3365,7 @@
 
     // Emoji graphics files url path
     editormd.emoji     = {
-        path  : "https://www.webpagefx.com/tools/emoji-cheat-sheet/graphics/emojis/",
+        path  : "/static/plugin/editormd/images/emoji/",
         ext   : ".png"
     };