From a2d1af454910636887ca2adc4b84d42b3a5e6394 Mon Sep 17 00:00:00 2001
From: XiaoLFeng <gm@x-lf.cn>
Date: Thu, 4 May 2023 22:30:08 +0800
Subject: [PATCH] SendMail

---
 class/Mailer/MailTemplate.php |  7 ++++--
 class/Mailer/SendMail.php     | 47 +++++++++++++++++++----------------
 2 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/class/Mailer/MailTemplate.php b/class/Mailer/MailTemplate.php
index 7393360..ed5e153 100644
--- a/class/Mailer/MailTemplate.php
+++ b/class/Mailer/MailTemplate.php
@@ -5,8 +5,11 @@
  * https://www.x-lf.com/
  */
 
+
 namespace Mailer;
 
+require_once dirname(__FILE__, 3) . "/class/Mailer/SendMail.php";
+
 class MailTemplate
 {
     private static string $GCode;
@@ -14,10 +17,10 @@ class MailTemplate
 
     /**
      * 检查使用邮件发送模板
-     * @param string $G_code 获取后端发送来的验证码用于发送
+     * @param string|null $G_code 获取后端发送来的验证码用于发送
      * @return string|null 需要返回值，返回HTML信息给邮箱模板用于发送
      */
-    public static function Templates(string $G_code): ?string
+    public static function Templates(string $G_code = null): ?string
     {
         // 赋值给全局
         self::$GCode = $G_code;
diff --git a/class/Mailer/SendMail.php b/class/Mailer/SendMail.php
index 68cafe4..924ba13 100644
--- a/class/Mailer/SendMail.php
+++ b/class/Mailer/SendMail.php
@@ -5,26 +5,28 @@
  * https://www.x-lf.com/
  */
 
+
 namespace Mailer;
 
-use Mailer\PHPMailer\Exception;
-use Mailer\PHPMailer\PHPMailer;
+require_once dirname(__FILE__, 3) . "/class/Mailer/PHPMailer/PHPMailer.php";
+require_once dirname(__FILE__, 3) . "/class/Mailer/PHPMailer/Exception.php";
+require_once dirname(__FILE__, 3) . "/class/Mailer/PHPMailer/SMTP.php";
+require_once dirname(__FILE__, 3) . "/class/Mailer/MailTemplate.php";
 
 class SendMail
 {
     public static int $EmailType;
     public static string $EmailReceiver;
 
-    private array $ConfigData;
+    private static array $ConfigData;
     public static int $ExpTime;
     public static string $WebTitle;
-
-    private PHPMailer $Mail;
+    protected PHPMailer $Mail;
 
     /**
      * @return void 导入文件，无具体返回值
      */
-    protected function __consort()
+    public function __construct()
     {
         // 文件导入
         $Array_ConfigData = null;
@@ -32,13 +34,13 @@ protected function __consort()
         while (!feof($FileData))
             $Array_ConfigData .= fgetc($FileData);
         $Array_ConfigData = json_decode($Array_ConfigData, JSON_UNESCAPED_UNICODE);
-        $this->ConfigData = json_decode($Array_ConfigData, JSON_UNESCAPED_UNICODE)["Smtp"];
+        self::$ConfigData = $Array_ConfigData["Smtp"];
         fclose($FileData);
         // 参数赋予
         self::$ExpTime = $Array_ConfigData["Mail"]['ExpDate'];
         self::$WebTitle = $Array_ConfigData["Web"]['Title'];
 
-        // 类导入
+        // 导入类
         $this->Mail = new PHPMailer(true);
     }
 
@@ -76,42 +78,43 @@ public function PostMail(string $EmailReceiver, int $EmailType, string $OtherPus
     {
         self::$EmailType = $EmailType;
         self::$EmailReceiver = $EmailReceiver;
+
         // 尝试邮件发送
         try {
             // 服务器配置
             $this->Mail->CharSet = "UTF-8";
             $this->Mail->SMTPDebug = 0;
             $this->Mail->isSMTP();
-            $this->Mail->Host = $this->ConfigData['Host'];
-            $this->Mail->SMTPAuth = $this->ConfigData['SmtpAuth'];
-            $this->Mail->Username = $this->ConfigData['Username'];
-            $this->Mail->Password = $this->ConfigData['Password'];
+            $this->Mail->Host = self::$ConfigData['Host'];
+            $this->Mail->SMTPAuth = self::$ConfigData['SmtpAuth'];
+            $this->Mail->Username = self::$ConfigData['Username'];
+            $this->Mail->Password = self::$ConfigData['Password'];
             $this->Mail->SMTPSecure = $this->SSLCheck('Secure');
             $this->Mail->Port = $this->SSLCheck('Port');
-            $this->Mail->setFrom($this->ConfigData['User'], $this->ConfigData['Name']);
+            $this->Mail->setFrom(self::$ConfigData['User'], self::$ConfigData['Name']);
             $this->Mail->addAddress($EmailReceiver);
 
             // 发件编写
-            if ($EmailType == 1) $this->EmailRegister($OtherPush);
-            else if ($EmailType == 2) $this->EmailLogin($OtherPush);
+            if ($EmailType == 1) $this->EmailRegister();
+            else if ($EmailType == 2) $this->EmailLogin();
 
             $this->Mail->send();
             return true;
         } catch (Exception $e) {
-            //echo '邮件发送失败：', $this->Mail->ErrorInfo;
+            //echo '邮件发送失败：', $this->$this->Mail->ErrorInfo;
             return false;
         }
     }
 
-    private function EmailRegister(string $Input_Code): void
+    protected function EmailRegister(): void
     {
-        $this->Mail->Subject = $this->ConfigData['Name'] . ' - 站点注册'; // 邮箱标题
-        $this->Mail->Body = MailTemplate::Templates($Input_Code);
+        $this->Mail->Subject = self::$ConfigData['Name'] . ' - 站点注册'; // 邮箱标题
+        $this->Mail->Body = MailTemplate::Templates();
     }
 
-    private function EmailLogin(string $OtherPush)
+    protected function EmailLogin(): void
     {
-        $this->Mail->Subject = $this->ConfigData['Name'] . ' - 邮箱登录验证码'; // 邮箱标题
-        $this->Mail->Body = MailTemplate::Templates($Input_Code);
+        $this->Mail->Subject = self::$ConfigData['Name'] . ' - 邮箱登录验证码'; // 邮箱标题
+        $this->Mail->Body = MailTemplate::Templates();
     }
 }
\ No newline at end of file