chore(release): 1.0.0-beta.8

- 在 EmailWillSent 事件中添加 attachmentPaths 和 attachments 属性
- 在 EmailService 中添加处理附件的逻辑
- 更新 EmailWillSentListener 以支持附件发送

.devcontainer/devcontainer.json

@@ -0,0 +1,49 @@
+{
+    "name": "Hyperf Development Kit Core Dev Container",
+    "image": "harbor.luxcreo.cn/library/hyperf:8.1-swoole",
+    // 基础配置
+    "workspaceFolder": "/srv/www", // 对应 --workdir
+    "workspaceMount": "source=${localWorkspaceFolder},target=/srv/www,type=bind", // 主工作区挂载
+    // 附加挂载
+    "mounts": [
+        "source=${env:HOME}/.ssh,target=/root/.ssh,type=bind", // SSH 密钥挂载
+        "source=${env:HOME}/.gitconfig,target=/root/.gitconfig,type=bind" // SSH 密钥挂载
+    ],
+    // 容器生命周期
+    "shutdownAction": "stopContainer", // 类似 --rm 的清理行为
+    "updateRemoteUserUID": true, // 确保用户 ID 同步
+    // 保留的必要 runArgs
+    "runArgs": [
+        "--pull=always", // 强制拉取最新镜像
+        "--name=hdk-core" // 容器命名（需保持唯一性）
+    ],
+    // 初始化命令
+    "postCreateCommand": "echo 'Container initialized!'",
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "rid9.datetime",
+                "MS-CEINTL.vscode-language-pack-zh-hans",
+                "ms-azuretools.vscode-docker",
+                "janisdd.vscode-edit-csv",
+                "onecentlin.laravel-blade",
+                "DavidWang.ini-for-vscode",
+                "bmewburn.vscode-intelephense-client",
+                "mechatroner.rainbow-csv",
+                "Alibaba-Cloud.tongyi-lingma",
+                "atommaterial.a-file-icon-vscode",
+                "ParthR2031.colorful-comments",
+                "vincaslt.highlight-matching-tag",
+                "xabikos.JavaScriptSnippets",
+                "shufo.vscode-blade-formatter",
+                "dansysanalyst.pest-snippets",
+                "m1guelpf.better-pest",
+                "xoronic.pestfile",
+                "xdebug.php-debug",
+                "golang.go",
+                "cweijan.vscode-typora",
+                "ciceroisback.loam"
+            ]
+        }
+    }
+}

CHANGELOG.md

@@ -1,4 +1,28 @@
 # 版本更新日志
+## [1.0.0-beta.8](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.7...v1.0.0-beta.8) (2025-03-04)
+
+
+### ✨ Features | 新功能
+
+* **email:** 添加邮件附件功能 ([3b3502f](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/3b3502f7634b48c31c3e7689cdcfe1f4b504b968))
+
+
+### 📦‍ Build System | 打包构建
+
+* **composer:** Update Dependencies ([b4dcd01](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/b4dcd01e8d1fcd2c1fa211ef2a54512593500780))
+
+## [1.0.0-beta.7](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.6...v1.0.0-beta.7) (2025-03-03)
+
+
+### 📦‍ Build System | 打包构建
+
+* **devcontainer:** 添加 Hyperf 开发套件核心配置文件 ([aaa4382](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/aaa4382ff2c5105bc362777f62156b8383b67ed8))
+
+
+### ✨ Features | 新功能
+
+* **EmailService:** 添加邮件附件功能并更新单元测试 ([225bded](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/commit/225bdedd23b1655d5fb7260838fc8c60db5d8f9f))
+
 ## [1.0.0-beta.6](http://124.126.16.154:8888/singularity/HyperfDevelopmentKitCore/compare/v1.0.0-beta.5...v1.0.0-beta.6) (2024-12-06)
 
 

VERSION_TRACKER.txt

@@ -1 +1 @@
-1.0.0-beta.6
+1.0.0-beta.8

composer.json

@@ -130,5 +130,5 @@
       "url": "https://mirrors.aliyun.com/composer/"
     }
   },
-  "version": "1.0.0-beta.6"
+  "version": "1.0.0-beta.8"
 }

src/Events/EmailWillSent.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * EmailWillSent.php@HDK-Core
  *
@@ -10,6 +11,7 @@
 namespace Singularity\HDK\Core\Events;
 
 use Singularity\HDK\Core\Service\EmailService;
+use Symfony\Component\Mime\Address;
 use Symfony\Component\Mime\Email;
 
 /**
@@ -25,9 +27,9 @@ class EmailWillSent
 {
     public function __construct(
         /**
-         * @var string|string[] $target
+         * @var Address|string|string[]|Address[] $target
          */
-        public string|array $target,
+        public Address|string|array $target,
 
         /**
          * @var non-empty-string $subject
@@ -68,6 +70,17 @@ class EmailWillSent
          * @var EmailService|null
          */
         public ?EmailService $sender = null,
-    ) {
-    }
+
+        /**
+         * 附件路径集合、含附件路径、文件名、文件类型的数组集合
+         * @var string[]|array{'path': string, 'name': string, 'mimeType': string}[] $attachmentPaths
+         */
+        public array $attachmentPaths = [],
+
+        /**
+         * 附件内容集合、含附件内容、文件名、文件类型的数组集合
+         * @var string[]|array{'content': string, 'name': string, 'mimeType': string}[] $attachments
+         */
+        public array $attachments = [],
+    ) {}
 }

src/Listener/EmailWillSentListener.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * EmailWillSentListener.php@HDK-Core
  *
@@ -64,7 +65,9 @@ class EmailWillSentListener implements ListenerInterface
                     subject: $event->subject,
                     html: $event->content,
                     cc: $event->cc,
-                bcc: $event->bcc,
+                    bcc: $event->bcc,
+                    attachmentPaths: $event->attachmentPaths,
+                    attachments: $event->attachments,
                     priority: $event->priority
                 )
                 : $emailService->sendText(
@@ -72,7 +75,9 @@ class EmailWillSentListener implements ListenerInterface
                     subject: $event->subject,
                     text: $event->content,
                     cc: $event->cc,
-                bcc: $event->bcc,
+                    bcc: $event->bcc,
+                    attachmentPaths: $event->attachmentPaths,
+                    attachments: $event->attachments,
                     priority: $event->priority
                 );
 

src/Service/EmailService.php

@@ -79,7 +79,7 @@ class EmailService
     }
 
     /**
-     * @param string|array<string> $target
+     * @param Address|string|array<string|Address> $target
      * @param string        $subject
      * @param string        $text
      * @param array<string> $cc
@@ -90,11 +90,13 @@ class EmailService
      * @throws TransportExceptionInterface
      */
     public function sendText(
-        string|array $target,
+        Address|string|array $target,
         string $subject,
         string $text,
         array $cc = [],
         array $bcc = [],
+        array $attachmentPaths = [],
+        array $attachments = [],
         int $priority = Email::PRIORITY_NORMAL
     ): bool {
         $email = (new Email())
@@ -106,6 +108,22 @@ class EmailService
             ->subject($subject)
             ->text($text);
 
+        foreach ($attachmentPaths as $attachmentPath) {
+            if (is_string($attachmentPath)) {
+                $email = $email->attachFromPath($attachmentPath);
+            } else {
+                $email = $email->attachFromPath($attachmentPath['path'], $attachmentPath['name'] ?? null, $attachmentPath['mimeType'] ?? null);
+            }
+        }
+
+        foreach ($attachments as $attachment) {
+            if (is_string($attachment)) {
+                $email = $email->attach($attachment);
+            } else {
+                $email = $email->attach($attachment['content'], $attachment['name'] ?? null, $attachment['mimeType'] ?? null);
+            }
+        }
+
         $this->mailer->send($email);
 
         return true;
@@ -114,7 +132,7 @@ class EmailService
     /**
      * 以 HTML 格式发送邮件
      *
-     * @param string|array<string> $target
+     * @param Address|string|array<string|Address> $target
      * @param string        $subject
      * @param string        $html
      * @param array<string> $cc
@@ -125,11 +143,13 @@ class EmailService
      * @throws TransportExceptionInterface
      */
     public function sendHtml(
-        string|array $target,
+        Address|string|array $target,
         string $subject,
         string $html,
         array $cc = [],
         array $bcc = [],
+        array $attachmentPaths = [],
+        array $attachments = [],
         int $priority = Email::PRIORITY_NORMAL
     ): bool {
         $email = (new Email())
@@ -141,6 +161,22 @@ class EmailService
             ->subject($subject)
             ->html($html);
 
+        foreach ($attachmentPaths as $attachmentPath) {
+            if (is_string($attachmentPath)) {
+                $email = $email->attachFromPath($attachmentPath);
+            } else {
+                $email = $email->attachFromPath($attachmentPath['path'], $attachmentPath['name'] ?? null, $attachmentPath['mimeType'] ?? null);
+            }
+        }
+
+        foreach ($attachments as $attachment) {
+            if (is_string($attachment)) {
+                $email = $email->attach($attachment);
+            } else {
+                $email = $email->attach($attachment['content'], $attachment['name'] ?? null, $attachment['mimeType'] ?? null);
+            }
+        }
+
         $this->mailer->send($email);
 
         return true;

tests/Unit/EmailServiceTest.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * EmailServiceTest.php@HDK-Core
  *
@@ -9,15 +10,19 @@
 
 namespace Singularity\HDK\Test\Core\Service;
 
+use PharIo\Manifest\Email;
 use Singularity\HDK\Core\Service\EmailService;
 use Symfony\Component\Mailer\Exception\TransportException;
 
-$dsn = 'smtp://account@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465';
-$mail_sender_name = 'LuxCreo';
-$mail_sender = 'account@luxcreo.ai';
-$email = new EmailService($dsn, $mail_sender_name, $mail_sender);
+use function Hyperf\Support\make;
 
-it('assertions that send HTML is available', function () use ($email) {
+
+it('assertions that send HTML is available', function () {
+    $dsn = 'smtp://account@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465';
+    $mail_sender_name = 'LuxCreo';
+    $mail_sender = 'account@luxcreo.ai';
+    // $email = new EmailService($dsn, $mail_sender_name, $mail_sender);
+    $email = make(EmailService::class, ['dsn' => $dsn, 'mailSenderName' => $mail_sender_name, 'mailSender' => $mail_sender]);
     $result = $email->sendHtml(
         'dongyun.li@luxcreo.ai',
         'HDK Unit Test HTML',
@@ -26,9 +31,15 @@ it('assertions that send HTML is available', function () use ($email) {
 HTML
     );
     expect($result)->toBeTrue();
-})->skip();
+});
+
+it('assertions that send Text is available', function () {
+    $dsn = 'smtp://account@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465';
+    $mail_sender_name = 'LuxCreo';
+    $mail_sender = 'account@luxcreo.ai';
+    // $email = new EmailService($dsn, $mail_sender_name, $mail_sender);
+    $email = make(EmailService::class, ['dsn' => $dsn, 'mailSenderName' => $mail_sender_name, 'mailSender' => $mail_sender]);
 
-it('assertions that send Text is available', function () use ($email) {
     $result = $email->sendText(
         'dongyun.li@luxcreo.ai',
         'HDK Unit Test Text',
@@ -37,9 +48,15 @@ it('assertions that send Text is available', function () use ($email) {
 Text
     );
     expect($result)->toBeTrue();
-})->skip();
+});
+
+it('assertions Error Receiver can be catch', function () {
+    $dsn = 'smtp://account@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465';
+    $mail_sender_name = 'LuxCreo';
+    $mail_sender = 'account@luxcreo.ai';
+    // $email = new EmailService($dsn, $mail_sender_name, $mail_sender);
+    $email = make(EmailService::class, ['dsn' => $dsn, 'mailSenderName' => $mail_sender_name, 'mailSender' => $mail_sender]);
 
-it('assertions Error Receiver can be catch', function () use ($email) {
     try {
         $email->sendHtml(
             'unknown@luxcreo.ai',
@@ -62,4 +79,30 @@ Text
     } catch (TransportException $t) {
         expect($t->getCode())->toBe(554);
     }
-})->skip('会报错必须运行在协程环境下');
+});
+
+it('should can contain attachment', function () {
+    $dsn = 'smtp://account@luxcreo.ai:Qfsd8866@smtp.qiye.aliyun.com:465';
+    $mail_sender_name = 'LuxCreo';
+    $mail_sender = 'account@luxcreo.ai';
+    // $email = new EmailService($dsn, $mail_sender_name, $mail_sender);
+    $email = make(EmailService::class, ['dsn' => $dsn, 'mailSenderName' => $mail_sender_name, 'mailSender' => $mail_sender]);
+
+    $email->sendHtml(
+        'dongyun.li@luxcreo.ai',
+        'HDK Unit Test HTML',
+        <<<HTML
+<h1>Hello, World!</h1>
+HTML,
+        [],
+        [],
+        [
+            [
+                'path' => __DIR__ . '/../../README.md',
+                'name' => 'README.md',
+                'mimeType' => 'text/markdown',
+            ],
+        ],
+        []
+    );
+})->only();