fix: some api modules

Author: justJokee

front/server/api/articles.js

@@ -12,7 +12,8 @@ const unpublishedPermission = require('../middleware/unpublishedPermission')
 
 // 获取文章列表 / 按分类 / 按标签 筛选文章
 router.get('/api/front/article/gets', unpublishedPermission, async (req, res) => {
-  const params = { publish: req.query.publish }
+  const params = {}
+  if (req.query.publish) params.publish = req.query.publish
   if (req.query.categoryId) params.categoryId = req.query.categoryId
   if (req.query.tag) params.tag = { $in: [req.query.tag] }
   const limit = parseInt(req.query.limit) || 10
@@ -34,11 +35,13 @@ router.get('/api/front/article/gets', unpublishedPermission, async (req, res) =>
 })
 
 // 获取文章详细信息
-router.get('/api/front/article/detail', unpublishedPermission, async (req, res) => {
-  const { publish, articleId, excludeContent } = req.query
-  const project = excludeContent ? { content: 0, content_plain: 0 } : { content_plain: 0 }
+router.get('/api/front/article/detail', async (req, res) => {
+  const { articleId, excludeContent } = req.query
+  const project = excludeContent
+    ? { content: 0, content_plain: 0, content_draft: 0 }
+    : { content_plain: 0, content_draft: 0 }
   try {
-    const detail = await db.article.find({ publish, articleId }, project)
+    const detail = await db.article.find({ publish: 1, articleId }, project)
 
     res.json({
       status: 200,
@@ -173,7 +176,7 @@ router.get('/api/front/article/search', unpublishedPermission, async (req, res)
             { content_plain: { $regex: req.query.keyword, $options: 'i' } }
           ]
         },
-        { content: 0 }
+        { content: 0, content_plain: 0, content_draft: 0 }
       )
       .sort({ _id: -1 })
       .skip(skip)
@@ -201,25 +204,6 @@ router.get('/api/front/article/search', unpublishedPermission, async (req, res)
   } catch (e) {
     res.status(500).end()
   }
-
-  ////
-  // if (req.query.according === 'key') {
-  //   //前台时间轴根据时间范围搜索
-  // } else {
-  //   const start = new Date(parseInt(req.query.start))
-  //   const end = new Date(parseInt(req.query.end))
-  //   db.article
-  //     .find({ publish: req.query.publish, date: { $gte: start, $lte: end } }, { content: 0 }, (err, doc) => {
-  //       if (err) {
-  //         res.status(500).end()
-  //       } else {
-  //         res.json(doc)
-  //       }
-  //     })
-  //     .sort({ _id: -1 })
-  //     .skip(skip)
-  //     .limit(limit)
-  // }
 })
 // 文章归档
 router.get('/api/front/article/archives', async (req, res) => {
@@ -308,17 +292,36 @@ router.get('/api/front/article/hot', (req, res) => {
 
 /***********后台管理文章： 改动 删除 修改 TODO:待重构**************/
 
+// 获取文章详细信息
+router.get('/api/admin/article/getDraft', unpublishedPermission, async (req, res) => {
+  const { articleId, excludeContent } = req.query
+  const project = excludeContent ? { content: 0, content_plain: 0, content_draft: 0 } : { content_plain: 0 }
+  try {
+    const detail = await db.article.find({ articleId }, project)
+    const doc = detail[0].toObject()
+    doc.content = doc.content_draft
+    delete doc.content_draft
+    res.json({
+      status: 200,
+      data: doc || {}
+    })
+  } catch (e) {
+    res.status(500).end()
+  }
+})
 // 存储文档
 router.post('/api/admin/article/save', confirmToken, async (req, res) => {
   try {
     const doc = await new db.article({
       ...req.body,
       content: '',
       content_plain: '',
+      content_draft: '',
       publish: 0,
       commentNum: 0,
       likeNum: 0,
       pv: 0,
+      editing: 0,
       createTime: new Date(),
       updateTime: new Date()
     }).save()
@@ -335,20 +338,37 @@ router.post('/api/admin/article/save', confirmToken, async (req, res) => {
 
 // 编辑文档
 router.patch('/api/admin/article/edit', confirmToken, async (req, res) => {
-  let content_plain = ''
+  const updates = {}
   try {
-    // 删除富文本中的标签等，保留静态文本字段
-    if (req.body.content) content_plain = req.body.content.replace(/<.*?>|\n|&nbsp;/g, '')
+    if (Reflect.get(req.body, 'content')) {
+      // 删除富文本中的标签等，保留静态文本字段
+      updates.content_plain = req.body.content.replace(/<.*?>|\n|&nbsp;/g, '')
+      // 默认存储为草稿
+      updates.content_draft = req.body.content
+      // 重要！一定要删除！
+      delete req.body.content
+
+      // 文档 发布/更新 content 与 content_draft保持一致同步
+      if (req.body.editing === '0') {
+        updates.content = updates.content_draft
+      }
+    }
+
     await db.article.update(
       { articleId: req.body.articleId },
       {
         ...req.body,
-        content_plain,
+        ...updates,
         updateTime: new Date()
       }
     )
+    const doc = await db.article.find(
+      { articleId: req.body.articleId },
+      { content: 0, content_plain: 0, content_draft: 0 }
+    )
     res.json({
       status: 200,
+      data: doc[0],
       info: '文档编辑成功'
     })
   } catch (e) {
@@ -357,20 +377,47 @@ router.patch('/api/admin/article/edit', confirmToken, async (req, res) => {
 })
 
 // 删除文档
-router.delete('/api/admin/article/del', confirmToken, (req, res) => {
-  //$in是为了批量删除，出入的articleId是数组
-  db.article.remove({ articleId: { $in: req.query.articleId } }, (err) => {
-    if (err) {
-      res.status(500).end()
-    } else {
-      res.json({ deleteCode: 200 })
-      db.comment.remove({ articleId: { $in: req.query.articleId } }, (err) => {
-        if (err) {
-          console.log(err)
-        }
-      })
-    }
-  })
+router.delete('/api/admin/article/del', confirmToken, async (req, res) => {
+  try {
+    const params = typeof req.query.id === 'string' ? { _id: req.query.id } : { _id: { $in: req.query.id } }
+    // $in 批量删除
+    await db.article.remove(params)
+    res.json({
+      status: 200,
+      info: '删除成功'
+    })
+  } catch (e) {
+    res.status(500).end()
+  }
 })
 
+// 筛选文章
+router.get('/api/admin/article/search', confirmToken, async (req, res) => {
+  const limit = 8
+  const skip = req.query.page * limit - limit
+  try {
+    const searchDoc = await db.article
+      .find(
+        {
+          ...req.query,
+          $or: [
+            { title: { $regex: req.query.keyword, $options: 'i' } },
+            { content_plain: { $regex: req.query.keyword, $options: 'i' } }
+          ]
+        },
+        { content: 0, content_plain: 0, content_draft: 0 }
+      )
+      .sort({ _id: -1 })
+      .skip(skip)
+      .limit(limit)
+
+    res.json({
+      status: 200,
+      data: searchDoc,
+      info: '搜索成功'
+    })
+  } catch (e) {
+    res.status(500).end()
+  }
+})
 module.exports = router

front/server/api/comments.js

@@ -34,20 +34,20 @@ router.get('/api/front/comments/get', async (req, res) => {
       { $set: { liked: 0 } }
     ])
     let ids = doc
-      .map(item => {
+      .map((item) => {
         if (item.reply && item.reply.length) {
-          return item.reply.map(erp => erp._id.toString()).concat(item._id.toString())
+          return item.reply.map((erp) => erp._id.toString()).concat(item._id.toString())
         }
         return item._id.toString()
       })
       .flat()
     const existed = await db.commentIp.find({ ip, type: 1, like: 1, msgid: { $in: ids } })
     if (existed.length) {
-      const ipIds = existed.map(ee => ee.msgid.toString())
-      doc.forEach(d => {
+      const ipIds = existed.map((ee) => ee.msgid.toString())
+      doc.forEach((d) => {
         if (ipIds.includes(d._id.toString())) d.liked = 1
         if (d.reply && d.reply.length) {
-          d.reply.forEach(er => {
+          d.reply.forEach((er) => {
             if (ipIds.includes(er._id.toString())) er.liked = 1
           })
         }
@@ -69,11 +69,7 @@ router.get('/api/front/comments/new', async (req, res) => {
   const limit = parseInt(req.query.limit) || 10
   const skip = req.query.page * limit - limit
   try {
-    const doc = await db
-      .comment({})
-      .sort({ _id: -1 })
-      .skip(skip)
-      .limit(limit)
+    const doc = await db.comment({}).sort({ _id: -1 }).skip(skip).limit(limit)
     res.json({
       status: 200,
       data: doc,
@@ -86,9 +82,17 @@ router.get('/api/front/comments/new', async (req, res) => {
 //添加文章评论
 router.post('/api/front/comments/save', async (req, res) => {
   try {
+    const { articleId, name, imgUrl, email, link, content, parentId, aite } = req.body
     // 存储文章评论
     const commentDoc = await new db.comment({
-      ...req.body,
+      articleId,
+      name,
+      imgUrl,
+      email,
+      link,
+      content,
+      parentId,
+      aite,
       like: 0,
       date: new Date()
     }).save()
@@ -208,13 +212,13 @@ router.get('/api/getAdminComments', confirmToken, (req, res) => {
 })
 //后台管理删除评论 TODO:  前端进行吧区分一二级的逻辑去掉
 router.delete('/api/removeComments', confirmToken, (req, res) => {
-  db.comment.remove({ _id: { $in: req.query.id } }, err => {
+  db.comment.remove({ _id: { $in: req.query.id } }, (err) => {
     if (err) {
       res.status(500).end()
     } else {
       //删除一级评论，联动文章评论数
       if (req.query.level === 1) {
-        db.article.update({ articleId: req.query.articleId }, { $inc: { commentNum: -1 } }, (err, doc) => {
+        db.article.update({ articleId: req.query.articleId }, { $inc: { commentNum: -1 } }, (err) => {
           if (err) {
             res.status(500)
           }

front/server/api/msgBoard.js

@@ -32,9 +32,9 @@ router.get('/api/front/messageBoard/gets', async (req, res) => {
       { $set: { liked: 0 } }
     ])
     let ids = doc
-      .map(item => {
+      .map((item) => {
         if (item.reply && item.reply.length) {
-          return item.reply.map(erp => erp._id.toString()).concat(item._id.toString())
+          return item.reply.map((erp) => erp._id.toString()).concat(item._id.toString())
         }
         return item._id.toString()
       })
@@ -43,12 +43,12 @@ router.get('/api/front/messageBoard/gets', async (req, res) => {
     const existed = await db.commentIp.find({ ip, type: 0, like: 1, msgid: { $in: ids } })
 
     if (existed.length) {
-      const ipIds = existed.map(ee => ee.msgid.toString())
-      doc.forEach(d => {
+      const ipIds = existed.map((ee) => ee.msgid.toString())
+      doc.forEach((d) => {
         if (ipIds.includes(d._id.toString())) d.liked = 1
 
         if (d.reply && d.reply.length) {
-          d.reply.forEach(er => {
+          d.reply.forEach((er) => {
             if (ipIds.includes(er._id.toString())) er.liked = 1
           })
         }
@@ -145,8 +145,15 @@ router.get('/api/getAdminBoard', confirmToken, (req, res) => {
 // 留言存储
 router.post('/api/front/messageBoard/save', async (req, res) => {
   try {
+    const { name, imgUrl, email, link, content, parentId, aite } = req.body
     const doc = await new db.msgBoard({
-      ...req.body,
+      name,
+      imgUrl,
+      email,
+      link,
+      content,
+      parentId,
+      aite,
       like: 0
     }).save()
     res.json({
@@ -180,7 +187,7 @@ router.post('/api/front/messageBoard/save', async (req, res) => {
 
 //后台管理删除二级留言
 router.patch('/api/reduceLeavewords', confirmToken, (req, res) => {
-  db.msgBoard.update({ _id: req.body.mainId }, { $pull: { reply: { _id: req.body.secondId } } }, (err, doc) => {
+  db.msgBoard.update({ _id: req.body.mainId }, { $pull: { reply: { _id: req.body.secondId } } }, (err) => {
     if (err) {
       res.status(500).end()
     } else {
@@ -190,7 +197,7 @@ router.patch('/api/reduceLeavewords', confirmToken, (req, res) => {
 })
 router.delete('/api/removeLeavewords', confirmToken, (req, res) => {
   //因为用到批量删除，所以删除项的_id均放到数组中
-  db.msgBoard.remove({ _id: { $in: req.query.id } }, err => {
+  db.msgBoard.remove({ _id: { $in: req.query.id } }, (err) => {
     if (err) {
       res.status(500).end()
     } else {

front/server/db/schema.js

@@ -44,9 +44,16 @@ const articleSchema = new mongoose.Schema({
   title: 'string',
   abstract: 'string',
   content: 'string',
+  // 当前最新编辑内容，当文档发布后，与content保持严格一致
+  content_draft: 'string',
   content_plain: 'string',
   headerPic: 'string',
+  // 是否发布 0：未发布 1：发布
+  // 新建文档初始值为 0
+  // 文档编辑阶段 可保存，可发布/更新；
   publish: 'number',
+  // 是否存在未经发布的编辑内容 0：不存在（即已发布） 1：存在最新编辑内容
+  editing: 'number',
   tag: 'array',
   commentNum: 'number',
   likeNum: 'number',

front/src/views/messageBoard/index.vue

@@ -62,7 +62,7 @@ export default {
       messages: []
     }
   },
-  async asyncData({ route }) {
+  async asyncData() {
     const msgRes = await api.getMessageBoard({
       page: 1
     })
@@ -121,14 +121,14 @@ export default {
       })
       if (likeRes.status === 200) {
         let finder
-        this.messages.some(msg => {
+        this.messages.some((msg) => {
           if (msg._id === likeRes.data._id) {
             finder = msg
             return true
           }
           if (msg.reply && msg.reply.length) {
             let done = false
-            msg.reply.some(er => {
+            msg.reply.some((er) => {
               if (er._id === likeRes.data._id) {
                 finder = er
                 done = true
@@ -147,7 +147,7 @@ export default {
         })
       }
     },
-    currentChange(val) {
+    currentChange() {
       this.getMessageBoard()
     }
   }