mirror of
http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore.git
synced 2026-01-15 07:35:08 +08:00
Compare commits
9 Commits
v1.0.0-alp
...
v1.0.0-alp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
02655228ae | ||
|
|
9f7d4effb7 | ||
|
|
5980ea773b | ||
|
|
110679448f | ||
|
|
64f936ab36 | ||
|
|
2afc3ad45b | ||
|
|
cff919a21e | ||
|
|
2d6d12e1c3 | ||
|
|
73420153d3 |
29
CHANGELOG.md
29
CHANGELOG.md
@@ -1,4 +1,33 @@
|
||||
# 版本更新日志
|
||||
## [1.0.0-alpha.8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.7...v1.0.0-alpha.8) (2023-10-08)
|
||||
|
||||
|
||||
### ✨ Features | 新功能
|
||||
|
||||
* **email:** 增加了对邮件优先级的兼容 ([9f7d4ef](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/9f7d4effb7e39500d0f65d35788551cc4e7a91f1))
|
||||
|
||||
## [1.0.0-alpha.7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.6...v1.0.0-alpha.7) (2023-09-28)
|
||||
|
||||
|
||||
### 🐛 Bug Fixes | Bug 修复
|
||||
|
||||
* **rest:** 修复不存在的具名参数 ([1106794](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/110679448f310e1d4e25f370b74f2901ca9425d0))
|
||||
|
||||
## [1.0.0-alpha.6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.5...v1.0.0-alpha.6) (2023-09-28)
|
||||
|
||||
|
||||
### 🐛 Bug Fixes | Bug 修复
|
||||
|
||||
* **i18n:** 修复了无法正确无视大小写导致无法识别的问题 ([cff919a](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/cff919a21e6d50e396a0d5ceaeefbe3b7c0e3095))
|
||||
* **rest:** 修复没有返回值的问题 ([2afc3ad](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/2afc3ad45b97e3df97827efdd9d16d6dedb3238a))
|
||||
|
||||
## [1.0.0-alpha.5](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.4...v1.0.0-alpha.5) (2023-09-26)
|
||||
|
||||
|
||||
### 🐛 Bug Fixes | Bug 修复
|
||||
|
||||
* **i18n:** 修复了无法正确无视大小写导致无法识别的问题 ([7342015](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/73420153d3791bff38ddd57b5a17120a4ed3cd08))
|
||||
|
||||
## [1.0.0-alpha.4](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-alpha.3...v1.0.0-alpha.4) (2023-09-26)
|
||||
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
1.0.0-alpha.4
|
||||
1.0.0-alpha.8
|
||||
@@ -116,5 +116,5 @@
|
||||
"url": "https://mirrors.aliyun.com/composer/"
|
||||
}
|
||||
},
|
||||
"version": "1.0.0-alpha.4"
|
||||
"version": "1.0.0-alpha.8"
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
|
||||
namespace Singularity\HDK\Core\Events;
|
||||
|
||||
use Symfony\Component\Mime\Email;
|
||||
|
||||
/**
|
||||
* Singularity\HDK\Core\Events\EmailWillSent@HDK-Core
|
||||
*
|
||||
@@ -44,7 +46,13 @@ class EmailWillSent
|
||||
/**
|
||||
* @var 'text'|'html' $type
|
||||
*/
|
||||
public string $type = 'text'
|
||||
public string $type = 'text',
|
||||
|
||||
/**
|
||||
* @var int
|
||||
* @see Email::priority()
|
||||
*/
|
||||
public int $priority = Email::PRIORITY_NORMAL
|
||||
) {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ enum Languages: string
|
||||
|
||||
public static function getLanguage(string $language): Languages
|
||||
{
|
||||
return match ($language) {
|
||||
return match (mb_strtolower($language)) {
|
||||
'en', 'en_us', 'en-us', 'en-uk', 'en_uk' => self::EN,
|
||||
'zh', 'zh_cn', 'zh-cn' => self::ZH_CN,
|
||||
default => self::from(config('translation.locale')),
|
||||
|
||||
@@ -62,18 +62,21 @@ class EmailWillSentListener implements ListenerInterface
|
||||
target: $event->target,
|
||||
subject: $event->subject,
|
||||
html: $event->content,
|
||||
cc: $event->cc
|
||||
cc: $event->cc,
|
||||
priority: $event->priority
|
||||
)
|
||||
: $emailService->sendText(
|
||||
target: $event->target,
|
||||
subject: $event->subject,
|
||||
text: $event->content,
|
||||
cc: $event->cc
|
||||
cc: $event->cc,
|
||||
priority: $event->priority
|
||||
);
|
||||
|
||||
$stdoutLogger->info('邮件发送成功!');
|
||||
$stdoutLogger->info("To: $event->target");
|
||||
$stdoutLogger->info("Subject: $event->subject");
|
||||
$stdoutLogger->info("Priority: $event->priority");
|
||||
$stdoutLogger->debug('Content: ');
|
||||
$stdoutLogger->debug($event->content);
|
||||
} catch (TransportExceptionInterface $e) {
|
||||
|
||||
@@ -79,12 +79,14 @@ class EmailService
|
||||
string|array $target,
|
||||
string $subject,
|
||||
string $text,
|
||||
array $cc = []
|
||||
array $cc = [],
|
||||
int $priority = Email::PRIORITY_NORMAL
|
||||
): bool {
|
||||
$email = (new Email())
|
||||
->from(Address::create($this->from))
|
||||
->to(...(is_array($target) ? $target : [$target]))
|
||||
->cc(...$cc)
|
||||
->priority($priority)
|
||||
->subject($subject)
|
||||
->text($text);
|
||||
|
||||
@@ -100,7 +102,7 @@ class EmailService
|
||||
* @param string $subject
|
||||
* @param string $html
|
||||
* @param array<string> $cc
|
||||
*
|
||||
* @param int $priority
|
||||
* @return bool
|
||||
* @throws TransportExceptionInterface
|
||||
*/
|
||||
@@ -108,12 +110,14 @@ class EmailService
|
||||
string|array $target,
|
||||
string $subject,
|
||||
string $html,
|
||||
array $cc = []
|
||||
array $cc = [],
|
||||
int $priority = Email::PRIORITY_NORMAL
|
||||
): bool {
|
||||
$email = (new Email())
|
||||
->from(Address::create($this->from))
|
||||
->to(...(is_array($target) ? $target : [$target]))
|
||||
->cc(...$cc)
|
||||
->priority($priority)
|
||||
->subject($subject)
|
||||
->html($html);
|
||||
|
||||
|
||||
@@ -26,12 +26,14 @@ trait RestfulList
|
||||
|
||||
protected function restSelect(Closure $callback, ?Closure $filter = null)
|
||||
{
|
||||
$options = [];
|
||||
$result = $this->parseParameters(function ($query, $parsedOptions) use ($callback, &$options) {
|
||||
$options = $parsedOptions;
|
||||
$callback($query, $parsedOptions);
|
||||
});
|
||||
return $this->responseFormatter($options, $result, $filter);
|
||||
$parsed_options = [];
|
||||
$result = $this->parseParameters(
|
||||
callback: function ($query, $options) use ($callback, &$parsed_options) {
|
||||
$parsed_options = $options;
|
||||
return $callback($query, $options);
|
||||
}
|
||||
);
|
||||
return $this->responseFormatter($parsed_options, $result, $filter);
|
||||
}
|
||||
|
||||
protected function parseParameters(Closure $callback): mixed
|
||||
|
||||
Reference in New Issue
Block a user