feat(email): 增加了单独定制发件人的方法

Signed-off-by: 李东云 <dongyu.li@luxcreo.ai>

.idea/HDK-Core.iml

@@ -91,7 +91,6 @@
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php80" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-ctype" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php81" />
-      <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/polyfill-php72" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/translation-contracts" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/symfony/event-dispatcher" />

.idea/php.xml

@@ -107,7 +107,6 @@
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
       <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php81" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
       <path value="$PROJECT_DIR$/vendor/symfony/translation" />
       <path value="$PROJECT_DIR$/vendor/symfony/translation-contracts" />
       <path value="$PROJECT_DIR$/vendor/symfony/event-dispatcher" />
@@ -154,46 +153,10 @@
       <path value="$PROJECT_DIR$/vendor/symfony/stopwatch" />
       <path value="$PROJECT_DIR$/vendor/phpstan/phpstan" />
       <path value="$PROJECT_DIR$/vendor/doctrine/deprecations" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/guzzle" />
-      <path value="$PROJECT_DIR$/vendor/symfony/serializer" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php83" />
-      <path value="$PROJECT_DIR$/vendor/symfony/http-foundation" />
       <path value="$PROJECT_DIR$/vendor/psr/clock" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/pipeline" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/collection" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/coordinator" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/serializer" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/tappable" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/coroutine" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/codec" />
       <path value="$PROJECT_DIR$/vendor/hyperf/crontab" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/code-parser" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/conditionable" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/engine-contract" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/support" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/db" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/resource" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/paginator" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/stringable" />
-      <path value="$PROJECT_DIR$/vendor/swow/psr7-plus" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/stdlib" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/testing" />
-      <path value="$PROJECT_DIR$/vendor/pestphp/pest-plugin-arch" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
-      <path value="$PROJECT_DIR$/vendor/brianium/paratest" />
       <path value="$PROJECT_DIR$/vendor/fidry/cpu-core-counter" />
-      <path value="$PROJECT_DIR$/vendor/nunomaduro/termwind" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-common" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/type-resolver" />
-      <path value="$PROJECT_DIR$/vendor/phpdocumentor/reflection-docblock" />
-      <path value="$PROJECT_DIR$/vendor/ta-tikoma/phpunit-architecture-test" />
-      <path value="$PROJECT_DIR$/vendor/jean85/pretty-package-versions" />
-      <path value="$PROJECT_DIR$/vendor/friendsofhyperf/pest-plugin-hyperf" />
-      <path value="$PROJECT_DIR$/vendor/friendsofhyperf/rector" />
-      <path value="$PROJECT_DIR$/vendor/spatie/test-time" />
-      <path value="$PROJECT_DIR$/vendor/spatie/pest-plugin-test-time" />
       <path value="$PROJECT_DIR$/vendor/carbonphp/carbon-doctrine-types" />
-      <path value="$PROJECT_DIR$/vendor/symfony/polyfill-php82" />
       <path value="$PROJECT_DIR$/vendor/cooper/hyperf-pest" />
       <path value="$PROJECT_DIR$/vendor/clue/ndjson-react" />
       <path value="$PROJECT_DIR$/vendor/evenement/evenement" />
@@ -203,27 +166,6 @@
       <path value="$PROJECT_DIR$/vendor/react/stream" />
       <path value="$PROJECT_DIR$/vendor/react/event-loop" />
       <path value="$PROJECT_DIR$/vendor/react/socket" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/code-parser" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/collection" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/codec" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/conditionable" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/coordinator" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/coroutine" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/db" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/engine-contract" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/guzzle" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/pipeline" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/paginator" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/serializer" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/resource" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/support" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/stringable" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/tappable" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/testing" />
-      <path value="$PROJECT_DIR$/vendor/hyperf/stdlib" />
-      <path value="$PROJECT_DIR$/vendor/pestphp/pest-plugin-arch" />
-      <path value="$PROJECT_DIR$/vendor/nunomaduro/termwind" />
-      <path value="$PROJECT_DIR$/vendor/phpstan/phpdoc-parser" />
     </include_path>
   </component>
   <component name="PhpProjectSharedConfiguration" php_language_level="7.4" />

src/Events/EmailWillSent.php

@@ -9,6 +9,8 @@
 
 namespace Singularity\HDK\Core\Events;
 
+use Singularity\HDK\Core\Service\EmailService;
+
 /**
  * Singularity\HDK\Core\Events\EmailWillSent@HDK-Core
  *
@@ -51,6 +53,11 @@ class EmailWillSent
      */
     public string $type = 'text';
 
+    /**
+     * @var EmailService|null
+     */
+    public ?EmailService $sender;
+
 
     public function __construct(
         /**
@@ -64,7 +71,8 @@ class EmailWillSent
          */
         array $cc = [],
         string $type = 'text',
-        array $bcc = []
+        array $bcc = [],
+        ?EmailService $sender = null
     ) {
         $this->type = $type;
         $this->cc = $cc;
@@ -72,5 +80,6 @@ class EmailWillSent
         $this->subject = $subject;
         $this->target = $target;
         $this->bcc = $bcc;
+        $this->sender = $sender;
     }
 }

src/Listener/EmailWillSentListener.php

@@ -48,9 +48,10 @@ class EmailWillSentListener extends AbstractListener
     public function process(object $event): void
     {
         $stdoutLogger = $this->container->get(StdoutLoggerInterface::class);
-        $emailService = $this->container->get(EmailService::class);
+
+        /** @var $event EmailWillSent */
+        $emailService = $event->sender ?? EmailService::make();
         try {
-            /** @var $event EmailWillSent */
             $event->type === 'html'
                 ? $emailService->sendHtml(
                     $event->target,

src/Service/EmailService.php

@@ -42,6 +42,18 @@ class EmailService
         );
     }
 
+    public static function make(
+        ?string $dsn = null,
+        ?string $mailSenderName = null,
+        ?string $mailSender = null
+    ): EmailService {
+        return new static(
+            $dsn,
+            $mailSenderName,
+            $mailSender,
+        );
+    }
+
     /**
      * 发送邮件
      *