From 320e8e82eb0434d6d56b30b0ab3768ea15b795fe Mon Sep 17 00:00:00 2001
From: gaoyi <gaoyia@qq.com>
Date: Sat, 24 Jun 2017 22:18:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=B3=BB=E7=BB=9F=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=8F=91=E9=80=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/general/Config.php      | 10 ++++++----
 application/common/{controller => library}/Email.php |  6 ++----
 application/extra/site.php                           |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename application/common/{controller => library}/Email.php (97%)

diff --git a/application/admin/controller/general/Config.php b/application/admin/controller/general/Config.php
index 8c76335b..618bb3a6 100644
--- a/application/admin/controller/general/Config.php
+++ b/application/admin/controller/general/Config.php
@@ -1,9 +1,10 @@
 <?php
 
 namespace app\admin\controller\general;
-
+ 
+use think\Config as tpConfig;
+use app\common\library\Email;
 use app\common\controller\Backend;
-use app\common\controller\Email;
 
 /**
  * 系统配置
@@ -239,13 +240,14 @@ class Config extends Backend
     {
         $content = '<table style="width: 99.8%; "><tbody><tr><td id="QQMAILSTATIONERY" style="background:url(https://rescdn.qqmail.com/zh_CN/htmledition/images/xinzhi/bg/a_07.jpg) repeat-x #e4ebf5; min-height:550px; padding: 100px 55px 200px;">这是一封测试邮件,用于测试邮件配置是否正常!</td></tr></tbody></table>';
 
+        $site = tpConfig::get("site");
         $email = new Email;
         $mailArr = Array();
-        $mailArr['mTo'] = '168128864@qq.com';       //收件人
+        $mailArr['mTo'] = $site['mail_from'];       //收件人
         $mailArr['subject'] = '这是一封测试邮件';    //邮件主题
         $mailArr['content'] = $content;             //邮件内容(html)
         $mailArr['fromNic'] = 'Fastadmin系统邮件';   //发件人昵称[可省略]
-        $mailArr['toNic'] = '亲爱的用户';            //收件人昵称[可省略]
+        $mailArr['toNic'] = '亲爱的用户';            //收件人昵称[可省略]貌似无效
         $data = $email->sendMail($mailArr['mTo'],$mailArr['subject'],$mailArr['content'],$mailArr['fromNic'],$mailArr['toNic']);
         return json(['data'=>$data,'code'=>200,'message'=>'操作完成']);
     }
diff --git a/application/common/controller/Email.php b/application/common/library/Email.php
similarity index 97%
rename from application/common/controller/Email.php
rename to application/common/library/Email.php
index d12cf413..e60ddadd 100644
--- a/application/common/controller/Email.php
+++ b/application/common/library/Email.php
@@ -1,12 +1,10 @@
 <?php
 
-namespace app\common\controller;
+namespace app\common\library;
 
 use think\Config;
-use think\Controller;
 
-
-class Email extends Controller
+class Email
 {
     /**
      * 发送邮件
diff --git a/application/extra/site.php b/application/extra/site.php
index 26b56c05..ec3a2748 100644
--- a/application/extra/site.php
+++ b/application/extra/site.php
@@ -2,7 +2,7 @@
 
 return array (
   'name' => 'FastAdmin',
-  'beian' => '粤ICP备15054802号-4',
+  'beian' => '',
   'cdnurl' => '',
   'version' => '1.0.1',
   'timezone' => 'Asia/Shanghai',
@@ -31,8 +31,8 @@ return array (
   'mail_type' => '1',
   'mail_smtp_host' => 'smtp.qq.com',
   'mail_smtp_port' => '465',
-  'mail_smtp_user' => '10000',
-  'mail_smtp_pass' => 'password',
+  'mail_smtp_user' => '168128864',
+  'mail_smtp_pass' => 'pzufyihnzrrjbhfb',
   'mail_verify_type' => '2',
-  'mail_from' => '10000@qq.com',
+  'mail_from' => '168128864@qq.com',
 );
\ No newline at end of file