refactor: some api modules

Author: justJokee

front/server/api/articles.js

@@ -9,10 +9,10 @@ const db = require('../db/')
 const getIp = require('../utils/getIp')
 const api = require('../http/')
 const confirmToken = require('../middleware/confirmToken')
-const unpublishedPermission = require('../middleware/unpublishedPermission')
+const confirmUnpublish = require('../middleware/confirmUnpublish')
 
 // 获取文章列表 / 按分类 / 按标签 筛选文章
-router.get('/api/front/article/gets', unpublishedPermission, async (req, res) => {
+router.get('/api/front/article/gets', confirmUnpublish, async (req, res) => {
   const params = {}
   if (req.query.publish) params.publish = req.query.publish
   if (req.query.categoryId) params.categoryId = req.query.categoryId
@@ -164,7 +164,7 @@ router.patch('/api/front/article/like', async (req, res) => {
 })
 
 // 文章搜索
-router.get('/api/front/article/search', unpublishedPermission, async (req, res) => {
+router.get('/api/front/article/search', confirmUnpublish, async (req, res) => {
   const limit = 8
   const skip = req.query.page * limit - limit
   try {
@@ -231,6 +231,7 @@ router.get('/api/front/article/archives', async (req, res) => {
     // 按月筛选
     if (req.query.filter) {
       const pipe = [
+        { $match: { publish: 1 } },
         {
           $project: {
             month: { $dateToString: { format: '%Y-%m', date: '$createTime' } },
@@ -249,7 +250,7 @@ router.get('/api/front/article/archives', async (req, res) => {
       total = totalRes[0].total
     } else {
       doc = await db.article.aggregate([
-        { $match: {} },
+        { $match: { publish: 1 } },
         { $sort: { _id: -1 } },
         { $skip: skip },
         { $limit: limit },
@@ -294,7 +295,7 @@ router.get('/api/front/article/hot', (req, res) => {
 /***********后台管理文章： 改动 删除 修改 TODO:待重构**************/
 
 // 获取文章详细信息
-router.get('/api/admin/article/getDraft', unpublishedPermission, async (req, res) => {
+router.get('/api/admin/article/getDraft', confirmToken, async (req, res) => {
   const { articleId, excludeContent } = req.query
   const project = excludeContent ? { content: 0, content_plain: 0, content_draft: 0 } : { content_plain: 0 }
   try {
@@ -337,7 +338,7 @@ router.post('/api/admin/article/save', confirmToken, async (req, res) => {
   }
 })
 
-// 编辑文档
+// 编辑文档（保存、更新/发布）
 router.patch('/api/admin/article/edit', confirmToken, async (req, res) => {
   const updates = {}
   try {
@@ -354,7 +355,12 @@ router.patch('/api/admin/article/edit', confirmToken, async (req, res) => {
         updates.content = updates.content_draft
       }
     }
-
+    // 数据存储前获取原始发布状态
+    const oldDoc = await db.article.find(
+      { articleId: req.body.articleId },
+      { content: 0, content_plain: 0, content_draft: 0 }
+    )
+    const oldPublish = oldDoc[0].publish
     await db.article.update(
       { articleId: req.body.articleId },
       {
@@ -367,6 +373,12 @@ router.patch('/api/admin/article/edit', confirmToken, async (req, res) => {
       { articleId: req.body.articleId },
       { content: 0, content_plain: 0, content_draft: 0 }
     )
+    // 状态不一致说明发布状态已变更，更新分类表的统计字段
+    if (oldPublish != doc[0].publish) {
+      const inc = doc[0].publish ? 1 : -1
+      await db.category.update({ _id: doc[0].categoryId }, { $inc: { total: inc } })
+    }
+
     res.json({
       status: 200,
       data: doc[0],
@@ -381,7 +393,17 @@ router.patch('/api/admin/article/edit', confirmToken, async (req, res) => {
 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 } }
+    // 维护分类表
+    const articlesDoc = await db.article.find(params)
+    if (articlesDoc.length) {
+      articlesDoc.forEach(async (doc) => {
+        if (doc.publish) {
+          await db.category.update({ _id: doc.categoryId }, { $inc: { total: -1 } })
+        }
+      })
+    }
     await db.article.remove(params)
+
     res.json({
       status: 200,
       info: '删除文档成功'

front/server/api/category.js

@@ -6,7 +6,6 @@
 const express = require('express')
 const router = express.Router()
 const db = require('../db/')
-// const confirmToken = require('../middleware/confirmToken')
 
 // 获取分类列表
 router.get('/api/front/category/get', async (req, res) => {

front/server/api/count.js

@@ -1,13 +1,14 @@
 /**
  * @desc 统计类
+ * @author justJokee
  */
 const express = require('express')
 const router = express.Router()
 const db = require('../db/')
-// const confirmToken = require('../middleware/confirmToken')
+const confirmToken = require('../middleware/confirmToken')
 
-// 获取分类列表
-router.get('/api/admin/count', async (req, res) => {
+// 管理端首页统计项
+router.get('/api/admin/count', confirmToken, async (req, res) => {
   try {
     const article = await db.article.find({}).count()
     const comment = await db.comment.find({}).count()

front/server/api/donload.js

@@ -1,38 +1,29 @@
 const articles = require('./articles')
 const tags = require('./tags')
-const getCount = require('./getCount')
 const comments = require('./comments')
-const getTime = require('./getTime')
 const msgBoard = require('./msgBoard')
 const visitor = require('./visitor')
 const login = require('./login')
-const copyData = require('./copyData')
+const mongodump = require('./mongodump')
 const news = require('./news')
-const reviseKey = require('./reviseKey')
-const donload = require('./donload')
+const resetpwd = require('./resetpwd')
 const category = require('./category')
 const movies = require('./movies')
 const qiniu = require('./qiniu')
 const viewer = require('./viewer')
 const count = require('./count')
 
-// const confirmToken = require('../middleware/confirmToken')
-
 module.exports = (app) => {
-  // app.use(confirmToken)
   app.use(viewer)
   app.use(articles)
   app.use(tags)
-  app.use(getCount)
   app.use(comments)
-  app.use(getTime)
   app.use(msgBoard)
   app.use(login)
   app.use(visitor)
-  app.use(copyData)
+  app.use(mongodump)
   app.use(news)
-  app.use(reviseKey)
-  app.use(donload)
+  app.use(resetpwd)
   app.use(category)
   app.use(movies)
   app.use(qiniu)

front/server/api/getCount.js

@@ -5,12 +5,11 @@
 const express = require('express')
 const router = express.Router()
 const jwt = require('jsonwebtoken')
-const md5 = require('md5')
 const db = require('../db/')
 const { userSecret } = require('../db/secret')
 
 const createToken = (id, account) => {
-  const secret = `${userSecret.pwd}.${userSecret.salt}`
+  const secret = `${userSecret.salt}`
   return jwt.sign(
     {
       id: id,
@@ -21,25 +20,25 @@ const createToken = (id, account) => {
   )
 }
 // 登录验证
-router.post('/api/login', async (req, res) => {
+router.post('/api/admin/login', async (req, res) => {
   try {
     const user = await db.user.find({ account: req.body.account })
     // 用户名不存在，返回401
     if (!user.length) {
       res.json({
-        status: 401,
+        status: 402,
         info: '用户名或密码不正确'
       })
       return
     }
     const pwd = user[0].password
-    console.log('body-----', req.body, md5(req.body.password))
-    if (md5(req.body.password) === pwd) {
+    if (req.body.password === pwd) {
       const token = createToken(user[0]._id, user[0].account)
       res.json({
         status: 200,
         data: {
           token,
+          uid: user[0]._id,
           account: user[0].account,
           avatar: user[0].avatar,
           lastLoginTime: user[0].lastLoginTime
@@ -50,7 +49,7 @@ router.post('/api/login', async (req, res) => {
       await db.user.update({ user: req.body.user }, { lastLoginTime: new Date() })
     } else {
       res.json({
-        status: 401,
+        status: 402,
         info: '用户名或密码不正确'
       })
     }