From cb252784173cf537bd10668588c72a285f6ffd54 Mon Sep 17 00:00:00 2001 From: ykxiao Date: Wed, 31 Jan 2024 09:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=91=BD=E5=90=8D=E7=A9=BA?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- publish/message.php | 22 +++++++++---------- src/Channel/AbstractChannel.php | 6 ++--- src/Channel/DingTalkChannel.php | 6 ++--- src/Channel/FeiShuChannel.php | 6 ++--- src/Channel/MailChannel.php | 4 ++-- src/Channel/WechatChannel.php | 6 ++--- src/Client.php | 16 +++++++------- src/ConfigProvider.php | 6 ++--- ...Interface.php => EasyMessageInterface.php} | 4 ++-- .../MessageNotificationException.php | 2 +- src/Notify.php | 2 +- src/Template/AbstractTemplate.php | 6 ++--- src/Template/Markdown.php | 2 +- src/Template/Text.php | 2 +- test/NotifyTest.php | 18 +++++++-------- 16 files changed, 55 insertions(+), 55 deletions(-) rename src/Contracts/{MessageNotifyInterface.php => EasyMessageInterface.php} (83%) diff --git a/README.md b/README.md index 4c2e520..328904e 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ composer require ykxiao/easy-message -vvv 发布配置文件`config/message.php` ```bash -hyperf vendor:publish ykxiao/easy-message +php bin/hyperf.php vendor:publish ykxiao/easy-message ``` diff --git a/publish/message.php b/publish/message.php index e6d80fb..ce07b73 100644 --- a/publish/message.php +++ b/publish/message.php @@ -2,27 +2,27 @@ declare(strict_types=1); -use MessageNotify\Channel\DingTalkChannel; -use MessageNotify\Channel\FeiShuChannel; -use MessageNotify\Channel\MailChannel; -use MessageNotify\Channel\WechatChannel; -use MessageNotify\Contracts\MessageNotifyInterface; +use EasyMessage\Channel\DingTalkChannel; +use EasyMessage\Channel\FeiShuChannel; +use EasyMessage\Channel\MailChannel; +use EasyMessage\Channel\WechatChannel; +use EasyMessage\Contracts\EasyMessageInterface; return [ 'default' => env('NOTIFY_DEFAULT_CHANNEL', 'mail'), 'channels' => [ // 钉钉群机器人 DingTalkChannel::class => [ - 'default' => MessageNotifyInterface::INFO, + 'default' => EasyMessageInterface::INFO, 'pipeline' => [ // 业务信息告警群 - MessageNotifyInterface::INFO => [ + EasyMessageInterface::INFO => [ 'token' => env('NOTIFY_DINGTALK_TOKEN', ''), 'secret' => env('NOTIFY_DINGTALK_SECRET', ''), 'keyword' => env('NOTIFY_DINGTALK_KEYWORD', []), ], // 错误信息告警群 - MessageNotifyInterface::ERROR => [ + EasyMessageInterface::ERROR => [ 'token' => env('NOTIFY_DINGTALK_TOKEN', ''), 'secret' => env('NOTIFY_DINGTALK_SECRET', ''), 'keyword' => env('NOTIFY_DINGTALK_KEYWORD', []), @@ -32,7 +32,7 @@ return [ // 飞书群机器人 FeiShuChannel::class => [ - 'default' => MessageNotifyInterface::INFO, + 'default' => EasyMessageInterface::INFO, 'pipeline' => [ 'info' => [ 'token' => env('NOTIFY_FEISHU_TOKEN', ''), @@ -44,7 +44,7 @@ return [ // 邮件 MailChannel::class => [ - 'default' => MessageNotifyInterface::INFO, + 'default' => EasyMessageInterface::INFO, 'pipeline' => [ 'info' => [ 'dsn' => env('NOTIFY_MAIL_DSN'), @@ -56,7 +56,7 @@ return [ // 企业微信群机器人 WechatChannel::class => [ - 'default' => MessageNotifyInterface::INFO, + 'default' => EasyMessageInterface::INFO, 'pipeline' => [ 'info' => [ 'token' => env('NOTIFY_WECHAT_TOKEN'), diff --git a/src/Channel/AbstractChannel.php b/src/Channel/AbstractChannel.php index b22ee7f..69d90bf 100644 --- a/src/Channel/AbstractChannel.php +++ b/src/Channel/AbstractChannel.php @@ -2,11 +2,11 @@ declare(strict_types=1); -namespace MessageNotify\Channel; +namespace EasyMessage\Channel; use Hyperf\Contract\ConfigInterface; -use MessageNotify\Exceptions\MessageNotificationException; -use MessageNotify\Template\AbstractTemplate; +use EasyMessage\Exceptions\MessageNotificationException; +use EasyMessage\Template\AbstractTemplate; abstract class AbstractChannel { diff --git a/src/Channel/DingTalkChannel.php b/src/Channel/DingTalkChannel.php index 089bd6d..2dd240f 100644 --- a/src/Channel/DingTalkChannel.php +++ b/src/Channel/DingTalkChannel.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace MessageNotify\Channel; +namespace EasyMessage\Channel; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\RequestOptions; -use MessageNotify\Exceptions\MessageNotificationException; -use MessageNotify\Template\AbstractTemplate; +use EasyMessage\Exceptions\MessageNotificationException; +use EasyMessage\Template\AbstractTemplate; class DingTalkChannel extends AbstractChannel { diff --git a/src/Channel/FeiShuChannel.php b/src/Channel/FeiShuChannel.php index d23babf..0c73cdc 100644 --- a/src/Channel/FeiShuChannel.php +++ b/src/Channel/FeiShuChannel.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace MessageNotify\Channel; +namespace EasyMessage\Channel; use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use GuzzleHttp\RequestOptions; -use MessageNotify\Exceptions\MessageNotificationException; -use MessageNotify\Template\AbstractTemplate; +use EasyMessage\Exceptions\MessageNotificationException; +use EasyMessage\Template\AbstractTemplate; class FeiShuChannel extends AbstractChannel { diff --git a/src/Channel/MailChannel.php b/src/Channel/MailChannel.php index bc5cb4b..6ec0a5e 100644 --- a/src/Channel/MailChannel.php +++ b/src/Channel/MailChannel.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace MessageNotify\Channel; +namespace EasyMessage\Channel; -use MessageNotify\Template\AbstractTemplate; +use EasyMessage\Template\AbstractTemplate; class MailChannel extends AbstractChannel { diff --git a/src/Channel/WechatChannel.php b/src/Channel/WechatChannel.php index 1885ac6..dcadfbc 100644 --- a/src/Channel/WechatChannel.php +++ b/src/Channel/WechatChannel.php @@ -2,12 +2,12 @@ declare(strict_types=1); -namespace MessageNotify\Channel; +namespace EasyMessage\Channel; use GuzzleHttp\Client; use GuzzleHttp\RequestOptions; -use MessageNotify\Exceptions\MessageNotificationException; -use MessageNotify\Template\AbstractTemplate; +use EasyMessage\Exceptions\MessageNotificationException; +use EasyMessage\Template\AbstractTemplate; class WechatChannel extends AbstractChannel { diff --git a/src/Client.php b/src/Client.php index b9a664f..9373250 100644 --- a/src/Client.php +++ b/src/Client.php @@ -2,13 +2,13 @@ declare(strict_types=1); -namespace MessageNotify; +namespace EasyMessage; -use MessageNotify\Channel\AbstractChannel; -use MessageNotify\Contracts\MessageNotifyInterface; -use MessageNotify\Exceptions\MessageNotificationException; -use MessageNotify\Template\AbstractTemplate; -use MessageNotify\Template\Text; +use EasyMessage\Channel\AbstractChannel; +use EasyMessage\Contracts\EasyMessageInterface; +use EasyMessage\Exceptions\MessageNotificationException; +use EasyMessage\Template\AbstractTemplate; +use EasyMessage\Template\Text; class Client { @@ -18,7 +18,7 @@ class Client protected array $at = []; - protected string $pipeline = MessageNotifyInterface::INFO; + protected string $pipeline = EasyMessageInterface::INFO; protected string $title = ''; @@ -78,7 +78,7 @@ class Client public function setPipeline(string $pipeline = ''): Client { - $this->pipeline = $pipeline ?? MessageNotifyInterface::INFO; + $this->pipeline = $pipeline ?? EasyMessageInterface::INFO; return $this; } diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php index b658214..2e472ba 100644 --- a/src/ConfigProvider.php +++ b/src/ConfigProvider.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace MessageNotify; +namespace EasyMessage; -use MessageNotify\Contracts\MessageNotifyInterface; +use EasyMessage\Contracts\EasyMessageInterface; class ConfigProvider { @@ -12,7 +12,7 @@ class ConfigProvider { return [ 'dependencies' => [ - MessageNotifyInterface::class => Client::class, + EasyMessageInterface::class => Client::class, ], 'annotations' => [ 'scan' => [ diff --git a/src/Contracts/MessageNotifyInterface.php b/src/Contracts/EasyMessageInterface.php similarity index 83% rename from src/Contracts/MessageNotifyInterface.php rename to src/Contracts/EasyMessageInterface.php index 04f21b9..14a9bee 100644 --- a/src/Contracts/MessageNotifyInterface.php +++ b/src/Contracts/EasyMessageInterface.php @@ -2,9 +2,9 @@ declare(strict_types=1); -namespace MessageNotify\Contracts; +namespace EasyMessage\Contracts; -interface MessageNotifyInterface +interface EasyMessageInterface { public const INFO = 'info'; diff --git a/src/Exceptions/MessageNotificationException.php b/src/Exceptions/MessageNotificationException.php index 2c05b68..c26ea43 100644 --- a/src/Exceptions/MessageNotificationException.php +++ b/src/Exceptions/MessageNotificationException.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MessageNotify\Exceptions; +namespace EasyMessage\Exceptions; class MessageNotificationException extends \RuntimeException { diff --git a/src/Notify.php b/src/Notify.php index edf14a0..8abc130 100644 --- a/src/Notify.php +++ b/src/Notify.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MessageNotify; +namespace EasyMessage; use Hyperf\Utils\ApplicationContext; diff --git a/src/Template/AbstractTemplate.php b/src/Template/AbstractTemplate.php index 80aeec5..3bbbfae 100644 --- a/src/Template/AbstractTemplate.php +++ b/src/Template/AbstractTemplate.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace MessageNotify\Template; +namespace EasyMessage\Template; -use MessageNotify\Contracts\MessageNotifyInterface; +use EasyMessage\Contracts\EasyMessageInterface; abstract class AbstractTemplate { protected array $at = []; - protected string $pipeline = MessageNotifyInterface::INFO; + protected string $pipeline = EasyMessageInterface::INFO; protected string $text = ''; diff --git a/src/Template/Markdown.php b/src/Template/Markdown.php index ce30564..e93e176 100644 --- a/src/Template/Markdown.php +++ b/src/Template/Markdown.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MessageNotify\Template; +namespace EasyMessage\Template; class Markdown extends AbstractTemplate { diff --git a/src/Template/Text.php b/src/Template/Text.php index 92ad6af..0424fdc 100644 --- a/src/Template/Text.php +++ b/src/Template/Text.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace MessageNotify\Template; +namespace EasyMessage\Template; class Text extends AbstractTemplate { diff --git a/test/NotifyTest.php b/test/NotifyTest.php index 44a20b0..5b2f8b8 100644 --- a/test/NotifyTest.php +++ b/test/NotifyTest.php @@ -2,15 +2,15 @@ declare(strict_types=1); -namespace MessageNotifyTest; +namespace EasyMessageTest; -use MessageNotify\Channel\DingTalkChannel; -use MessageNotify\Channel\FeiShuChannel; -use MessageNotify\Channel\WechatChannel; -use MessageNotify\Contracts\MessageNotifyInterface; -use MessageNotify\Notify; -use MessageNotify\Template\Markdown; -use MessageNotify\Template\Text; +use EasyMessage\Channel\DingTalkChannel; +use EasyMessage\Channel\FeiShuChannel; +use EasyMessage\Channel\WechatChannel; +use EasyMessage\Contracts\EasyMessageInterface; +use EasyMessage\Notify; +use EasyMessage\Template\Markdown; +use EasyMessage\Template\Text; use PHPUnit\Framework\TestCase; /** @@ -32,7 +32,7 @@ class NotifyTest extends TestCase ->setAt(['all']) ->setTitle('标题') ->setText('测试') - ->setPipeline(MessageNotifyInterface::INFO) + ->setPipeline(EasyMessageInterface::INFO) ->setTemplate(Markdown::class) ->send();