From 8b55020b3ae4a7ad29dfd4a959a5c029baa23ed4 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 21 Jan 2022 09:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=82=AE=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=8F=92=E4=BB=B6=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Ems.php | 10 +-----
 application/common/library/Ems.php | 51 ++++++++++++++++++++++--------
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/application/api/controller/Ems.php b/application/api/controller/Ems.php
index 40d65f55..7d39a12b 100644
--- a/application/api/controller/Ems.php
+++ b/application/api/controller/Ems.php
@@ -5,6 +5,7 @@ namespace app\api\controller;
 use app\common\controller\Api;
 use app\common\library\Ems as Emslib;
 use app\common\model\User;
+use think\Hook;
 
 /**
  * 邮箱验证码接口
@@ -17,15 +18,6 @@ class Ems extends Api
     public function _initialize()
     {
         parent::_initialize();
-        \think\Hook::add('ems_send', function ($params) {
-            $obj = \app\common\library\Email::instance();
-            $result = $obj
-                ->to($params->email)
-                ->subject('验证码')
-                ->message("你的验证码是：" . $params->code)
-                ->send();
-            return $result;
-        });
     }
 
     /**
diff --git a/application/common/library/Ems.php b/application/common/library/Ems.php
index 1d010e5b..4e5212a3 100644
--- a/application/common/library/Ems.php
+++ b/application/common/library/Ems.php
@@ -26,8 +26,8 @@ class Ems
     /**
      * 获取最后一次邮箱发送的数据
      *
-     * @param   int    $email 邮箱
-     * @param   string $event 事件
+     * @param int    $email 邮箱
+     * @param string $event 事件
      * @return  Ems
      */
     public static function get($email, $event = 'default')
@@ -43,9 +43,9 @@ class Ems
     /**
      * 发送验证码
      *
-     * @param   int    $email 邮箱
-     * @param   int    $code  验证码,为空时将自动生成4位数字
-     * @param   string $event 事件
+     * @param int    $email 邮箱
+     * @param int    $code  验证码,为空时将自动生成4位数字
+     * @param string $event 事件
      * @return  boolean
      */
     public static function send($email, $code = null, $event = 'default')
@@ -54,6 +54,18 @@ class Ems
         $time = time();
         $ip = request()->ip();
         $ems = \app\common\model\Ems::create(['event' => $event, 'email' => $email, 'code' => $code, 'ip' => $ip, 'createtime' => $time]);
+        if (!Hook::get('ems_send')) {
+            //采用框架默认的邮件推送
+            Hook::add('ems_send', function ($params) {
+                $obj = new Email();
+                $result = $obj
+                    ->to($params->email)
+                    ->subject('请查收你的验证码！')
+                    ->message("你的验证码是：" . $params->code . "，" . ceil(self::$expire / 60) . "分钟内有效。")
+                    ->send();
+                return $result;
+            });
+        }
         $result = Hook::listen('ems_send', $ems, null, true);
         if (!$result) {
             $ems->delete();
@@ -65,9 +77,9 @@ class Ems
     /**
      * 发送通知
      *
-     * @param   mixed  $email    邮箱,多个以,分隔
-     * @param   string $msg      消息内容
-     * @param   string $template 消息模板
+     * @param mixed  $email    邮箱,多个以,分隔
+     * @param string $msg      消息内容
+     * @param string $template 消息模板
      * @return  boolean
      */
     public static function notice($email, $msg = '', $template = null)
@@ -77,6 +89,19 @@ class Ems
             'msg'      => $msg,
             'template' => $template
         ];
+        if (!Hook::get('ems_notice')) {
+            //采用框架默认的邮件推送
+            Hook::add('ems_notice', function ($params) {
+                $subject = '你收到一封新的邮件！';
+                $content = $params['msg'];
+                $email = new Email();
+                $result = $email->to($params['email'])
+                    ->subject($subject)
+                    ->message($content)
+                    ->send();
+                return $result;
+            });
+        }
         $result = Hook::listen('ems_notice', $params, null, true);
         return $result ? true : false;
     }
@@ -84,9 +109,9 @@ class Ems
     /**
      * 校验验证码
      *
-     * @param   int    $email 邮箱
-     * @param   int    $code  验证码
-     * @param   string $event 事件
+     * @param int    $email 邮箱
+     * @param int    $code  验证码
+     * @param string $event 事件
      * @return  boolean
      */
     public static function check($email, $code, $event = 'default')
@@ -119,8 +144,8 @@ class Ems
     /**
      * 清空指定邮箱验证码
      *
-     * @param   int    $email 邮箱
-     * @param   string $event 事件
+     * @param int    $email 邮箱
+     * @param string $event 事件
      * @return  boolean
      */
     public static function flush($email, $event = 'default')