From 903325a632244c9ed8f608cfe918c885357a4136 Mon Sep 17 00:00:00 2001
From: Song <quanpengsong@gmail.com>
Date: Tue, 17 Aug 2021 23:10:11 +0800
Subject: [PATCH] :bug: fix #16, #17

---
 common/message.js     | 6 +++---
 common/wechat-corp.js | 6 +++++-
 routers/index.js      | 7 ++++++-
 routers/user.js       | 3 ++-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/common/message.js b/common/message.js
index 0a61af8..071b214 100644
--- a/common/message.js
+++ b/common/message.js
@@ -13,13 +13,13 @@ async function processMessage(userPrefix, message) {
   if (!checkPrefix(userPrefix)) {
     return {
       success: false,
-      message: `不存在的前缀：${userPrefix}`,
+      message: `不存在的用户前缀：${userPrefix}`,
     };
   }
   if (!checkAccessToken(userPrefix, message.token)) {
     return {
       success: false,
-      message: `无效的 access token`,
+      message: `无效的访问凭证，请检查 token 参数是否正确`,
     };
   }
   if (message.email) {
@@ -50,7 +50,7 @@ async function processMessage(userPrefix, message) {
     default:
       result = {
         success: false,
-        message: `unsupported message type ${message.type}`,
+        message: `不支持的消息类型：${message.type}`,
       };
       break;
   }
diff --git a/common/wechat-corp.js b/common/wechat-corp.js
index 402a448..24d90a0 100644
--- a/common/wechat-corp.js
+++ b/common/wechat-corp.js
@@ -82,9 +82,13 @@ async function pushWeChatCorpMessage(userPrefix, message) {
     }
   } catch (e) {
     console.error(e);
+    let msg = e.message;
+    if (msg.startsWith('access_token missing')) {
+      msg = '请求微信服务器失败，请检查配置是否正确或重试！';
+    }
     return {
       success: false,
-      message: e.message,
+      message: msg,
     };
   }
 }
diff --git a/routers/index.js b/routers/index.js
index 3ea3787..228eeb0 100644
--- a/routers/index.js
+++ b/routers/index.js
@@ -14,7 +14,12 @@ const config = require('../config');
 
 router.get('/', (req, res, next) => {
   let showGuidance = false;
-  if (req.session.user && !req.session.user.wechatAppId) {
+  if (
+    req.session.user &&
+    !req.session.user.wechatAppId &&
+    !req.session.user.corpId &&
+    !req.session.user.smtpUser
+  ) {
     showGuidance = true;
   }
   if (process.env.MODE === '1') {
diff --git a/routers/user.js b/routers/user.js
index 81c3c87..1dc1e21 100644
--- a/routers/user.js
+++ b/routers/user.js
@@ -24,8 +24,9 @@ router.all('/:userPrefix/verify', (req, res, next) => {
 router.all('/:userPrefix/:description', async (req, res, next) => {
   const userPrefix = req.params.userPrefix;
   let message = {
-    title: '无标题',
+    title: '消息推送',
     description: req.params.description,
+    token: req.query.token,
   };
   res.json(await processMessage(userPrefix, message));
 });