🚧 refactoring is ongoing

routers/index.js

@@ -1,35 +1,32 @@
-const express = require("express");
+const express = require('express');
 const router = express.Router();
-const crypto = require("crypto");
-const fs = require("fs");
+const crypto = require('crypto');
+const fs = require('fs');
 
-router.all("/", (req, res, next) => {
+router.all('/', (req, res, next) => {
   fs.promises
-    .access("./.env")
+    .access('./.env')
     .then(() => {
-      res.render("info", {
-        message: "服务已在运行。",
+      res.render('info', {
+        message: '服务已在运行。',
       });
-<<<<<<< HEAD:routers/index.js
-=======
       // pushMessage(
       //   req,
       //   res,
       //   `请注意，ip 地址为 ${req.ip} 的用户访问了你的消息通知服务，如果非你本人，则你的私有消息通知服务可能已被泄露，当前版本无法阻止其他用户通过本系统向你发送消息。`
       // );
->>>>>>> master:routes.js
     })
     .catch(() => {
-      res.render("configure");
+      res.render('configure');
     });
 });
 
-router.post("/configure", (req, res, next) => {
+router.post('/configure', (req, res, next) => {
   fs.promises
-    .access("./.env")
+    .access('./.env')
     .then(() => {
-      res.render("message", {
-        message: ".env 文件已经存在，请手动删除该文件后重试！",
+      res.render('message', {
+        message: '.env 文件已经存在，请手动删除该文件后重试！',
       });
     })
     .catch(() => {
@@ -40,51 +37,48 @@ router.post("/configure", (req, res, next) => {
         `TEMPLATE_ID=${req.body.TEMPLATE_ID}\n` +
         `OPEN_ID=${req.body.OPEN_ID}`;
       fs.promises
-        .writeFile("./.env", content, "utf8")
+        .writeFile('./.env', content, 'utf8')
         .then(() => {
-          res.render("message", {
+          res.render('message', {
             message:
-              ".env 文件写入成功，程序即将自动关闭以应用写入的新的环境变量，需要进程守护程序自动重启应用或者手动重启。",
+              '.env 文件写入成功，程序即将自动关闭以应用写入的新的环境变量，需要进程守护程序自动重启应用或者手动重启。',
           });
           process.exit();
         })
         .catch((e) => {
-          res.render("info", {
-            message: "在尝试写入 .env 文件时发生错误：" + e,
+          res.render('info', {
+            message: '在尝试写入 .env 文件时发生错误：' + e,
           });
         });
     });
 });
 
-router.all("/verify", (req, res, next) => {
+router.all('/verify', (req, res, next) => {
   // 验证消息来自微信服务器：https://developers.weixin.qq.com/doc/offiaccount/Basic_Information/Access_Overview.html
   const { signature, timestamp, nonce, echostr } = req.query;
   const token = process.env.TOKEN;
   let tmp_array = [token, timestamp, nonce].sort();
-  let tmp_string = tmp_array.join("");
-  tmp_string = crypto.createHash("sha1").update(tmp_string).digest("hex");
+  let tmp_string = tmp_array.join('');
+  tmp_string = crypto.createHash('sha1').update(tmp_string).digest('hex');
   if (tmp_string === signature) {
     res.send(echostr);
   } else {
-    res.send("verification failed");
+    res.send('verification failed');
   }
 });
 
-<<<<<<< HEAD:routers/index.js
-=======
-router.all("/push", (req, res, next) => {
+router.all('/push', (req, res, next) => {
   let content = req.query.content || req.body.content;
   pushMessage(req, res, content);
 });
 
-router.get("/favicon.ico", (req, res, next) => {
+router.get('/favicon.ico', (req, res, next) => {
   res.sendStatus(404);
 });
 
-router.all("/:content", (req, res, next) => {
+router.all('/:content', (req, res, next) => {
   let content = req.params.content;
   pushMessage(req, res, content);
 });
 
->>>>>>> master:routes.js
 module.exports = router;

routers/message.js

@@ -1,9 +1,9 @@
-const express = require("express");
-const lexer = require("marked").lexer;
-const parser = require("marked").parser;
-const Message = require("../models/message").Message;
-const pushWeChatMessage = require("../utils/wechat").pushWeChatMessage;
-const formatTime = require("../utils/utils").formatTime;
+const express = require('express');
+const lexer = require('marked').lexer;
+const parser = require('marked').parser;
+const Message = require('../models/message').Message;
+const pushWeChatMessage = require('../common/wechat').pushWeChatMessage;
+const formatTime = require('../common/utils').formatTime;
 
 const router = express.Router();
 
@@ -11,16 +11,16 @@ function md2html(markdown) {
   return parser(lexer(markdown));
 }
 
-router.get("/:description", (req, res, next) => {
+router.get('/:description', (req, res, next) => {
   req.query.description = req.params.description;
   next();
 });
 
-router.all("/", (req, res) => {
+router.all('/', (req, res) => {
   let message = {
-    title: req.query.title || req.body.title || "无标题",
+    title: req.query.title || req.body.title || '无标题',
     status: 1,
-    created_by: "系统", // TODO
+    created_by: '系统', // TODO
     created_time: formatTime(),
     description: req.query.description || req.body.description,
     content: md2html(req.query.content || req.body.content),
@@ -42,16 +42,16 @@ router.all("/", (req, res) => {
     });
 });
 
-router.get("/detail/:id", (req, res) => {
+router.get('/detail/:id', (req, res) => {
   const id = req.params.id;
   Message.getById(id)
     .then((value) => {
       console.log(value);
-      res.render("message", value[0]);
+      res.render('message', value[0]);
     })
     .catch((reason) => {
-      res.render("info", {
-        message: "获取该消息时发生了错误：" + reason,
+      res.render('info', {
+        message: '获取该消息时发生了错误：' + reason,
       });
     });
 });