c-my/NEUP-FleaMarket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use email-daemon as mail service

Browse Source
This commit is contained in:
LI JIAHAO
2017-06-24 12:19:36 +08:00
parent e8e23b1188
commit ef719e62aa
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+3
View File
@@ -29,6 +29,9 @@ MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_RPC_HOST=127.0.0.1
MAIL_RPC_PORT=65525
ALLOW_REG=false
# 大一同学的入学年份（两位），用来判断用户是否过期
FRESH_YEAR=16
app/Http/Controllers/AdminController.php
+1
View File
@@ -181,6 +181,7 @@ class AdminController extends Controller
$mailSettings = [];
$mailSettings["Body"] = view('auth.checkLetter')->with(['host' => $request->server("HTTP_HOST"), 'token' => "sometesttokenhhhh"])->render();
$mailSettings["To"] = "wangkule@cool2645.com";
$mailSettings["FromName"] = "先锋市场";
$mailSettings["Subject"] = "PHP 邮件测试";
$mailSettings["SendID"] = "notify";
$response = $conn->Call("Daemon.SendMail", $mailSettings);
app/Http/Controllers/AuthController.php
+31 -16
View File
@@ -16,7 +16,7 @@ use App\Http\Requests\ResetPassRequest;
use App\User;
use App\CheckEmail;
use App\PasswordReset;
use Mail;
use JsonRpcClient;
use Illuminate\Support\Facades\Storage;
use App\AuthLog;
use phpCAS;
@@ -259,11 +259,16 @@ class AuthController extends Controller
$time = time();
$data['token'] = base64_encode($token . "#" . $time . "#" . $email . "#" . substr(sha1($time . $email . env('APP_KEY')), 0, 6));
$data['host'] = $request->server("HTTP_HOST");
if (env('APP_ENV') != "testing")
Mail::send('auth.checkLetter', $data, function ($m) use ($user, $email) {
$m->from(env('MAIL_USERNAME'), "先锋市场");
$m->to($email, $user->username)->subject('验证你的邮箱');
});
if (env('APP_ENV') != "testing") {
$conn = new JsonRpcClient(env('MAIL_RPC_HOST', "127.0.0.1"), env('MAIL_RPC_PORT', 65525));
$mailSettings = [];
$mailSettings["Body"] = view('auth.checkLetter')->with($data)->render();
$mailSettings["To"] = $email;
$mailSettings["FromName"] = "先锋市场";
$mailSettings["Subject"] = "验证你的邮箱";
$mailSettings["SendID"] = "service";
$conn->Call("Daemon.SendMail", $mailSettings);
}
self::log($user->id, "sendcheckletter", $request);
}
@@ -295,11 +300,16 @@ class AuthController extends Controller
$time = time();
$data['token'] = base64_encode($token . "#" . $time . "#" . $email . "#" . substr(sha1($time . $email . env('APP_KEY')), 0, 6));
$data['host'] = $request->server("HTTP_HOST");
if (env('APP_ENV') != "testing")
Mail::send('auth.unbindLetter', $data, function ($m) use ($user, $email) {
$m->from(env('MAIL_USERNAME'), "先锋市场");
$m->to($email, $user->username)->subject('邮箱解绑请求');
});
if (env('APP_ENV') != "testing") {
$conn = new JsonRpcClient(env('MAIL_RPC_HOST', "127.0.0.1"), env('MAIL_RPC_PORT', 65525));
$mailSettings = [];
$mailSettings["Body"] = view('auth.unbindLetter')->with($data)->render();
$mailSettings["To"] = $email;
$mailSettings["FromName"] = "先锋市场";
$mailSettings["Subject"] = "邮箱解绑请求";
$mailSettings["SendID"] = "service";
$conn->Call("Daemon.SendMail", $mailSettings);
}
self::log($user->id, "sendunbindletter", $request);
}
@@ -442,11 +452,16 @@ class AuthController extends Controller
$time = time();
$data['token'] = base64_encode($token . "#" . $time . "#" . substr(sha1($time . env('APP_KEY')), 0, 6));
$data['host'] = $request->server("HTTP_HOST");
if (env('APP_ENV') != "testing")
Mail::send('auth.resetLetter', $data, function ($m) use ($user, $email) {
$m->from(env('MAIL_USERNAME'), '先锋市场');
$m->to($email, $user->username)->subject('重置密码');
});
if (env('APP_ENV') != "testing") {
$conn = new JsonRpcClient(env('MAIL_RPC_HOST', "127.0.0.1"), env('MAIL_RPC_PORT', 65525));
$mailSettings = [];
$mailSettings["Body"] = view('auth.resetLetter')->with($data)->render();
$mailSettings["To"] = $email;
$mailSettings["FromName"] = "先锋市场";
$mailSettings["Subject"] = "重置密码";
$mailSettings["SendID"] = "service";
$conn->Call("Daemon.SendMail", $mailSettings);
}
$this->log($user->id, "sendpwdresetletter", $request);