add new

Author: lc11235

headerPhotoFromBing.js

@@ -54,12 +54,12 @@ function writeFile(image, pathStatic) {
         if (exists) {
             fs.unlink(pathStatic + '/header.jpg', err => {
                 if (err) {
-                    console.log(1);
+                    console.log(err.toString());
                     return;
                 }
                 fs.writeFile(pathStatic + '/header.jpg', image, 'binary', err => {
                     if (err) {
-                        console.log(2);
+                        console.log(err.toString());
                         return;
                     }
                 });

package-lock.json

@@ -33,8 +33,10 @@ const routes = require('./server/routes/index');
 const routesWX = require('./server/routes/wx');
 
 // 引入题图的定时更新组件
-const headerPhoto = require('./headerPhotoFromBing');
-headerPhoto.getPhotoFromBing();
+if (isProd) {
+    const headerPhoto = require('./headerPhotoFromBing');
+    headerPhoto.getPhotoFromBing();
+}
 
 function createRenderer(bundle, template) {
     // https://github.com/vuejs/vue/blob/dev/packages/vue-server-renderer/README.md#why-use-bundlerenderer

server.js

@@ -24,4 +24,61 @@ exports.getUnreadMessageCount = (req, res) => {
             message: err.toString()
         });
     });
+};
+
+/**
+ * 取得所有未读消息数量
+ * @method
+ * @param {[object]} req [请求体]
+ * @param {[object]} res [回复体]
+ */
+exports.getAllMessage = (req, res) => {
+    let userid = req.cookies.f_userId;
+    Message.find({ id: userid }).then(result => {
+        let unread = [];
+        let readed = [];
+        let trash = [];
+        if (result) {
+            for (let i = 0; i < result.length; i++) {
+                if (result.is_readed === 0 && result.is_delete === 0) {
+                    unread.push({
+                        title: result.title,
+                        content: result.content,
+                        create_time: result.create_date
+                    });
+                } else if (result.is_readed === 1 && result.is_delete === 0) {
+                    readed.push({
+                        title: result.title,
+                        content: result.content,
+                        create_time: result.create_date
+                    });
+                } else {
+                    trash.push({
+                        title: result.title,
+                        content: result.content,
+                        create_time: result.create_date
+                    });
+                }
+            }
+            return res.json({
+                code: 200,
+                message: '取出消息成功',
+                data: {
+                    unread: unread,
+                    readed: readed,
+                    trash: trash
+                }
+            });
+        }
+        return res.json({
+            code: -200,
+            message: '取出消息失败'
+        });
+
+    }).catch(err => {
+        res.json({
+            code: -200,
+            message: err.toString()
+        });
+    });
 };

server/api/backend-message.js

@@ -263,7 +263,7 @@ exports.getInfo = (req, res) => {
         if (result) {
             return res.json({
                 code: 200,
-                messgae: '拉取信息成功',
+                message: '拉取信息成功',
                 data: {
                     avator: result.avator,
                     access: result.access

server/api/backend-user.js

@@ -9,6 +9,7 @@ const MessageSchema = new Schema({
     update_date: String,
     is_readed: Number,
     is_delete: Number,
+    id: String,
     timestamp: Number
 });
 

server/models/message.js

@@ -73,7 +73,7 @@ router.get('/backend/admin/recover', isAdmin, backendUser.recover);
 // 取得未读消息条数
 router.get('/backend/message/count', isAdmin, backendMessage.getUnreadMessageCount);
 // 取得已读，未读，回收站的消息
-router.get('backend/message/init', isAdmin, backendMessage.getAllMessage);
+router.get('/backend/message/init', isAdmin, backendMessage.getAllMessage);
 
 // ================= 前台 =================
 // ------ 文章 ------

server/routes/index.js

@@ -3,9 +3,9 @@ const config = require('../config');
 const secret = config.secretServer;
 
 module.exports = (req, res, next) => {
-    let token = req.cookies.b_user;
-    let userid = req.cookies.b_userid;
-    let username = req.cookies.b_username;
+    let token = req.cookies.f_token;
+    let userid = req.cookies.f_userId;
+    let username = req.cookies.f_userName;
     if (token) {
         jwt.verify(token, secret, (err, decoded) => {
             if (!err && decoded.id === userid && decoded.username === username) {

server/routes/is-admin.js

@@ -137,8 +137,8 @@ export default {
         this.turnToPage(this.$config.homeName)
       } else if (routeEqual(this.$route, route)) {
         if (type !== 'others') {
+          console.log(this.$route, route);
           const nextRoute = getNextRoute(this.tagNavList, route)
-          console.log(nextRoute);
           this.$router.push(nextRoute)
         }
       }

src/components/main/main.vue

@@ -230,6 +230,7 @@ export const getParams = url => {
  * @param {String} name 当前关闭的标签的name
  */
 export const getNextRoute = (list, route) => {
+    console.log(list, route);
     let res = {};
     if (list.length === 2) {
         res = getHomeRoute(list);