Merge branch 'develop' of https://github.com/pcstx/qinglong into develop

back/data/notify.ts

@@ -99,7 +99,7 @@ export class IGotNotification extends NotificationBaseInfo {
 export class PushPlusNotification extends NotificationBaseInfo {
   public pushPlusToken = '';
   public pushPlusUser = '';
-  public pushPlusTempalte = '';
+  public pushPlusTemplate = '';
   public pushplusChannel = '';
   public pushplusWebhook = '';
   public pushplusCallbackUrl = '';

back/services/notify.ts

@@ -5,7 +5,7 @@ import nodemailer from 'nodemailer';
 import { Inject, Service } from 'typedi';
 import winston from 'winston';
 import { parseBody, parseHeaders } from '../config/util';
-import { NotificationInfo, PushPlusNotification } from '../data/notify';
+import { NotificationInfo } from '../data/notify';
 import UserService from './user';
 
 @Service()
@@ -495,25 +495,27 @@ export default class NotificationService {
     }
   }
 
-  private async () {
-    const { pushPlusToken, pushPlusUser, pushplusWebhook, pushPlusTempalte, pushplusChannel, pushplusCallbackUrl, pushplusTo} = this.params;
+  private async pushPlus() {
+    const { pushPlusToken, pushPlusUser, pushplusWebhook, pushPlusTemplate, pushplusChannel, pushplusCallbackUrl, pushplusTo} = this.params;
     const url = `https://www.pushplus.plus/send`;
     try {
+      let body = {
+        ...this.gotOption,
+        json: {
+          token: `${pushPlusToken}`,
+          title: `${this.title}`,
+          content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
+          topic: `${pushPlusUser || ''}`,
+          template: `${pushPlusTemplate || 'html'}`,
+          channel: `${pushplusChannel || 'wechat'}`,
+          webhook: `${pushplusWebhook || ''}`,
+          callbackUrl: `${pushplusCallbackUrl || ''}`,
+          to: `${pushplusTo || ''}`
+        },
+      }
+
       const res: any = await got
-        .post(url, {
-          ...this.gotOption,
-          json: {
-            token: `${pushPlusToken}`,
-            title: `${this.title}`,
-            content: `${this.content.replace(/[\n\r]/g, '<br>')}`,
-            topic: `${pushPlusUser || ''}`,
-            template: `${pushPlusTempalte || 'html'}`,
-            channel: `${pushplusChannel || 'wechat'}`,
-            webhook: `${pushplusWebhook}`,
-            callbackUrl: `${pushplusCallbackUrl}`,
-            to: `${pushplusTo}`
-          },
-        })
+        .post(url, body)
         .json();
 
       if (res.code === 200) {

sample/notify.js

@@ -801,7 +801,7 @@ function pushPlusNotify(text, desp) {
               console.log(
                 `pushplus 发送${
                   PUSH_PLUS_USER ? '一对多' : '一对一'
-                }通知请求成功🎉，可根据流水号查询推送结果：${data.data}\n`,
+                }通知请求成功🎉，可根据流水号查询推送结果：${data.data}\n注意：请求成功并不代表推送成功，如未收到消息，请到pushplus官网使用流水号查询推送最终结果`,
               );
             } else {
               console.log(

src/locales/zh-CN.json

@@ -377,7 +377,7 @@
   "好友": "好友",
   "要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称": "要发送的用户昵称或群名，如果目标是群，需要填群名，如果目标是好友，需要填好友昵称",
   "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX": "iGot的信息推送key，例如：https://push.hellyw.com/XXXXXXXX",
-  "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
+  "微信扫码登录后一对一推送或一对多推送下面的token(您的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/": "微信扫码登录后一对一推送或一对多推送下面的token(你的Token)，不提供PUSH_PLUS_USER则默认为一对一推送，参考 https://www.pushplus.plus/",
   "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）": "一对多推送的“群组编码”（一对多推送下面->您的群组(如无则创建)->群组编码，如果您是创建群组人。也需点击“查看二维码”扫描绑定，否则不能接受群组消息推送）",
   "发送模板": "发送模板，支持html,txt,json,markdown,cloudMonitor,jenkins,route,pay",
   "发送渠道": "发送渠道，支持wechat,webhook,cp,mail,sms",

src/utils/config.ts

@@ -313,7 +313,7 @@ export default {
         ),
       },
       {
-        label: 'pushPlusTempalte',
+        label: 'pushplusTemplate',
         tip: intl.get(
           '发送模板',
         ),