Song 4 gadi atpakaļ
vecāks
revīzija
903325a632
4 mainītis faili ar 16 papildinājumiem un 6 dzēšanām
  1. 3 3
      common/message.js
  2. 5 1
      common/wechat-corp.js
  3. 6 1
      routers/index.js
  4. 2 1
      routers/user.js

+ 3 - 3
common/message.js

@@ -13,13 +13,13 @@ async function processMessage(userPrefix, message) {
   if (!checkPrefix(userPrefix)) {
   if (!checkPrefix(userPrefix)) {
     return {
     return {
       success: false,
       success: false,
-      message: `不存在的前缀:${userPrefix}`,
+      message: `不存在的用户前缀:${userPrefix}`,
     };
     };
   }
   }
   if (!checkAccessToken(userPrefix, message.token)) {
   if (!checkAccessToken(userPrefix, message.token)) {
     return {
     return {
       success: false,
       success: false,
-      message: `无效的 access token`,
+      message: `无效的访问凭证,请检查 token 参数是否正确`,
     };
     };
   }
   }
   if (message.email) {
   if (message.email) {
@@ -50,7 +50,7 @@ async function processMessage(userPrefix, message) {
     default:
     default:
       result = {
       result = {
         success: false,
         success: false,
-        message: `unsupported message type ${message.type}`,
+        message: `不支持的消息类型:${message.type}`,
       };
       };
       break;
       break;
   }
   }

+ 5 - 1
common/wechat-corp.js

@@ -82,9 +82,13 @@ async function pushWeChatCorpMessage(userPrefix, message) {
     }
     }
   } catch (e) {
   } catch (e) {
     console.error(e);
     console.error(e);
+    let msg = e.message;
+    if (msg.startsWith('access_token missing')) {
+      msg = '请求微信服务器失败,请检查配置是否正确或重试!';
+    }
     return {
     return {
       success: false,
       success: false,
-      message: e.message,
+      message: msg,
     };
     };
   }
   }
 }
 }

+ 6 - 1
routers/index.js

@@ -14,7 +14,12 @@ const config = require('../config');
 
 
 router.get('/', (req, res, next) => {
 router.get('/', (req, res, next) => {
   let showGuidance = false;
   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;
     showGuidance = true;
   }
   }
   if (process.env.MODE === '1') {
   if (process.env.MODE === '1') {

+ 2 - 1
routers/user.js

@@ -24,8 +24,9 @@ router.all('/:userPrefix/verify', (req, res, next) => {
 router.all('/:userPrefix/:description', async (req, res, next) => {
 router.all('/:userPrefix/:description', async (req, res, next) => {
   const userPrefix = req.params.userPrefix;
   const userPrefix = req.params.userPrefix;
   let message = {
   let message = {
-    title: '无标题',
+    title: '消息推送',
     description: req.params.description,
     description: req.params.description,
+    token: req.query.token,
   };
   };
   res.json(await processMessage(userPrefix, message));
   res.json(await processMessage(userPrefix, message));
 });
 });