feat: api 补充

Author: justJokee

front/server/api/articles.js

@@ -36,7 +36,7 @@ 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 } : {}
+  const project = excludeContent ? { content: 0, content_plain: 0 } : { content_plain: 0 }
   try {
     const detail = await db.article.find({ publish, articleId }, project)
 
@@ -46,7 +46,7 @@ router.get('/api/front/article/detail', unpublishedPermission, async (req, res)
     })
 
     // 获取访客信息
-    if (process.env.NODEW_ENV === 'production') {
+    if (process.env.NODE_ENV === 'production') {
       // 更新pv
       await db.article.update({ articleId }, { $inc: { pv: 1 } })
       const ipInfo = await api.get('https://ip.help.bj.cn', { ip: getIp(req) })
@@ -308,45 +308,55 @@ router.get('/api/front/article/hot', (req, res) => {
 
 /***********后台管理文章： 改动 删除 修改 TODO:待重构**************/
 
-// 修改文章
-router.patch('/api/admin/article/update', confirmToken, (req, res) => {
-  const { publish, original, title, abstract, tag, content } = req.body
-  db.article.update(
-    { articleId: req.body.articleId },
-    { publish, original, title, abstract, tag, content },
-    (err, doc) => {
-      if (err) {
-        res.status(500).end()
-      } else {
-        res.json({ code: 200 })
-      }
-    }
-  )
+// 存储文档
+router.post('/api/admin/article/save', confirmToken, async (req, res) => {
+  try {
+    const doc = await new db.article({
+      ...req.body,
+      content: '',
+      content_plain: '',
+      publish: 0,
+      commentNum: 0,
+      likeNum: 0,
+      pv: 0,
+      createTime: new Date(),
+      updateTime: new Date()
+    }).save()
+
+    res.json({
+      status: 200,
+      data: doc,
+      info: '文档存储成功'
+    })
+  } catch (e) {
+    res.status(500).end()
+  }
 })
-// 存储文章
-router.post('/api/admin/article/save', confirmToken, (req, res) => {
-  const { original, title, abstract, content, tag, publish, date } = req.body
-  new db.article({
-    articleId: 0,
-    original,
-    title,
-    abstract,
-    content,
-    tag,
-    publish,
-    date: date,
-    commentNum: 0,
-    likeNum: 0,
-    pv: 0
-  }).save((err, doc) => {
-    if (err) {
-      res.json({ code: 500 })
-    } else {
-      res.json({ code: 200 })
-    }
-  })
+
+// 编辑文档
+router.patch('/api/admin/article/edit', confirmToken, async (req, res) => {
+  let content_plain = ''
+  try {
+    // 删除富文本中的标签等，保留静态文本字段
+    if (req.body.content) content_plain = req.body.content.replace(/<.*?>|\n|&nbsp;/g, '')
+    await db.article.update(
+      { articleId: req.body.articleId },
+      {
+        ...req.body,
+        content_plain,
+        updateTime: new Date()
+      }
+    )
+    res.json({
+      status: 200,
+      info: '文档编辑成功'
+    })
+  } catch (e) {
+    res.status(500).end()
+  }
 })
-// 删除文章
+
+// 删除文档
 router.delete('/api/admin/article/del', confirmToken, (req, res) => {
   //$in是为了批量删除，出入的articleId是数组
   db.article.remove({ articleId: { $in: req.query.articleId } }, (err) => {

front/server/api/category.js

@@ -9,7 +9,7 @@ const db = require('../db/')
 // 获取分类列表
 router.get('/api/front/category/get', async (req, res) => {
   try {
-    const doc = await db.category.find({}).sort({ _id: -1 })
+    const doc = await db.category.find({}).sort({ _id: 1 })
     res.json({
       status: 200,
       data: doc,

front/server/api/count.js

@@ -4,10 +4,10 @@
 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', confirmToken, async (req, res) => {
+router.get('/api/admin/count', async (req, res) => {
   try {
     const article = await db.article.find({}).count()
     const comment = await db.comment.find({}).count()

front/server/api/viewer.js

@@ -14,34 +14,35 @@ const getOS = require('../utils/getOS')
 // 统计访客数量、信息(按前端刷新次数计算)
 router.get(['/', '/app/*'], async (req, res, next) => {
   try {
-    const ip = getIp(req)
-    const browser = getBrowser(req.headers['user-agent'])
-    const system = getOS(req.headers['user-agent'])
-    await new db.viewer({
-      ip,
-      count: 1,
-      browser: browser,
-      system: system,
-      date: new Date()
-    }).save()
+    if (process.env.NODEW_ENV === 'production') {
+      const ip = getIp(req)
+      const browser = getBrowser(req.headers['user-agent'])
+      const system = getOS(req.headers['user-agent'])
+      await new db.viewer({
+        ip,
+        count: 1,
+        browser: browser,
+        system: system,
+        date: new Date()
+      }).save()
+    }
     next()
   } catch (e) {
     next()
   }
 })
 // 按天返回某一段时间范围内的访客数量
-router.get('/api/front/viewer/history', async (req, res) => {
+router.get('/api/admin/viewer/history', async (req, res) => {
   try {
-    const doc = db.viewer.aggragate([
+    const doc = await db.viewer.aggregate([
       {
         $match: {
           date: {
-            $gte: new Date(req.start),
-            $lte: new Date(req.end)
+            $gte: new Date(parseInt(req.query.start)),
+            $lte: new Date(parseInt(req.query.end))
           }
         }
       },
-      { $sort: { _id: -1 } },
       {
         $project: {
           date: { $dateToString: { format: '%Y-%m-%d', date: '$date' } }
@@ -59,7 +60,8 @@ router.get('/api/front/viewer/history', async (req, res) => {
           value: '$total',
           _id: 0
         }
-      }
+      },
+      { $sort: { date: 1 } }
     ])
     res.json({
       status: 200,
@@ -71,9 +73,9 @@ router.get('/api/front/viewer/history', async (req, res) => {
   }
 })
 // 查询访客设备信息
-router.get('/api/front/viewer/device/get', async (req, res) => {
+router.get('/api/front/viewer/getDevice', async (req, res) => {
   try {
-    const browser = db.viewer.aggragate([
+    const browser = await db.viewer.aggregate([
       {
         $group: {
           _id: '$browser',
@@ -82,13 +84,13 @@ router.get('/api/front/viewer/device/get', async (req, res) => {
       },
       {
         $project: {
-          browser: '$_id',
+          name: '$_id',
           value: '$total',
           _id: 0
         }
       }
     ])
-    const system = db.viewer.aggragate([
+    const system = await db.viewer.aggregate([
       {
         $group: {
           _id: '$system',
@@ -97,28 +99,28 @@ router.get('/api/front/viewer/device/get', async (req, res) => {
       },
       {
         $project: {
-          system: '$_id',
+          name: '$_id',
           value: '$total',
           _id: 0
         }
       }
     ])
-    const total = db.viewer.find({}).count()
 
     res.json({
       status: 200,
-      data: { browser, system, total },
+      data: { browser, system },
       info: '访客设备信息统计成功'
     })
   } catch (e) {
+    console.log('对方水电费', e)
     res.status(500).end()
   }
 })
 // 查询访客总数
-router.get('/api/front/viewer/count', async (req, res) => {
+router.get('/api/front/admin/count', async (req, res) => {
   try {
-    const total = db.viewer.find({}).count()
-    const doc = db.viewer.find({}).sort({ _id: -1 }).limit(1)
+    const total = await db.viewer.find({}).count()
+    const doc = await db.viewer.find({}).sort({ _id: -1 }).limit(1)
     res.json({
       status: 200,
       data: { total, latest: doc[0] },

front/server/db/index.js

@@ -20,37 +20,31 @@ mongoose.Promise = global.Promise
 // mongoose.connection.openUri("mongodb://username:password@localhost:27017/blog")
 mongoose.connection.openUri(`mongodb://${dbInfo.user}:${dbInfo.pwd}@localhost:27017/${dbInfo.db}`)
 
-//实现自增序列
-articleSchema.pre('save', (next) => {
-  let _this = this
-  db.counter.find({}, (err, doc) => {
-    if (err) {
-      console.error(err)
+// 实现articleId自增序列
+articleSchema.pre('save', async function (next) {
+  const that = this
+  try {
+    const counterDoc = await db.counter.find({})
+    if (!counterDoc.length) {
+      await new db.counter({ _id: 'entityId', seq: 2 }).save()
+      that.articleId = 1
     } else {
-      if (!doc.length) {
-        new db.counter({ _id: 'entityId', seq: 1 }).save()
-        next()
-      } else {
-        db.counter.findByIdAndUpdate(
-          { _id: 'entityId' },
-          {
-            $inc: {
-              seq: 1
-            }
-          },
-          (error, counter) => {
-            if (error) {
-              return next(error)
-            } else {
-              _this.articleId = counter.seq
-              next()
-            }
+      const curCountDoc = await db.counter.findByIdAndUpdate(
+        { _id: 'entityId' },
+        {
+          $inc: {
+            seq: 1
           }
-        )
-      }
+        }
+      )
+      that.articleId = curCountDoc.seq
     }
-  })
+    next()
+  } catch (e) {
+    next(e)
+  }
 })
+
 const db = {
   user: mongoose.model('user', userSchema),
   article: mongoose.model('article', articleSchema),

front/server/middleware/confirmToken.js

@@ -1,11 +1,13 @@
 const jwt = require('jsonwebtoken')
 const secret = require('../secret')
 const confirmToken = (req, res, next) => {
+  next()
+  return
   if (!req.headers.authorization) {
     res.json({ code: 401 })
   } else {
     const token = req.headers.authorization
-    jwt.verify(token, secret.jwtSecret, err => {
+    jwt.verify(token, secret.jwtSecret, (err) => {
       if (err) {
         res.json({ code: 401 })
       } else {