From bae1a3a127ba5aa3bd188ac810b6226c6e3f73d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=A4=A7=E4=BA=BA?= Date: Fri, 2 Aug 2024 22:27:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/data/notify.ts | 2 +- back/services/notify.ts | 36 +++++++++++++++++++----------------- sample/notify.js | 2 +- src/locales/zh-CN.json | 2 +- src/utils/config.ts | 2 +- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/back/data/notify.ts b/back/data/notify.ts index bf5eabc9..9b592698 100644 --- a/back/data/notify.ts +++ b/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 = ''; diff --git a/back/services/notify.ts b/back/services/notify.ts index 7a19a76f..3e4969c4 100644 --- a/back/services/notify.ts +++ b/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, '
')}`, + 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, '
')}`, - topic: `${pushPlusUser || ''}`, - template: `${pushPlusTempalte || 'html'}`, - channel: `${pushplusChannel || 'wechat'}`, - webhook: `${pushplusWebhook}`, - callbackUrl: `${pushplusCallbackUrl}`, - to: `${pushplusTo}` - }, - }) + .post(url, body) .json(); if (res.code === 200) { diff --git a/sample/notify.js b/sample/notify.js index aee288c2..acaa778c 100644 --- a/sample/notify.js +++ b/sample/notify.js @@ -802,7 +802,7 @@ function pushPlusNotify(text, desp) { console.log( `pushplus 发送${ PUSH_PLUS_USER ? '一对多' : '一对一' - }通知请求成功🎉，可根据流水号查询推送结果：${data.data}\n`, + }通知请求成功🎉，可根据流水号查询推送结果：${data.data}\n注意：请求成功并不代表推送成功，如未收到消息，请到pushplus官网使用流水号查询推送最终结果`, ); } else { console.log( diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index 914ce451..b53cdb64 100644 --- a/src/locales/zh-CN.json +++ b/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", diff --git a/src/utils/config.ts b/src/utils/config.ts index 2febbfec..058804a5 100644 --- a/src/utils/config.ts +++ b/src/utils/config.ts @@ -313,7 +313,7 @@ export default { ), }, { - label: 'pushPlusTempalte', + label: 'pushplusTemplate', tip: intl.get( '发送模板', ),