新增修改手机功能、新增绑定邮箱功能、版本更新至2.2.2
Signed-off-by: vilson <545522390@qq.com>
This commit is contained in:
vilson
parent
5e3ba93e91
commit
41fb2eb7de
@ -9,7 +9,7 @@ use service\JwtService;
|
||||
use service\LogService;
|
||||
use service\NodeService;
|
||||
use service\RandomService;
|
||||
use sms\Sms;
|
||||
use mail\Mail;
|
||||
use think\Db;
|
||||
use think\db\exception\DataNotFoundException;
|
||||
use think\db\exception\ModelNotFoundException;
|
||||
@ -72,6 +72,9 @@ class Login extends BasicApi
|
||||
if (session('captcha') != Request::param('captcha')) {
|
||||
$this->error('验证码错误', 203);
|
||||
}
|
||||
if (session('captchaMobile') != $mobile) {
|
||||
$this->error('手机号与验证码不匹配', 203);
|
||||
}
|
||||
$member = \app\common\Model\Member::where(['mobile' => $mobile])->order('id asc')->find();
|
||||
} else {
|
||||
$member = \app\common\Model\Member::where(['account' => $data['account']])->whereOr(['email' => $data['account']])->order('id asc')->find();
|
||||
@ -119,7 +122,7 @@ class Login extends BasicApi
|
||||
$mobile = $this->request->post('mobile', '');
|
||||
$code = RandomService::numeric(6);
|
||||
if (!config('sms.debug')) {
|
||||
$sms = new Sms();
|
||||
$sms = new Mail();
|
||||
$result = $sms->vSend($mobile, [
|
||||
'data' => [
|
||||
'project' => 'DWYsW1',
|
||||
@ -131,6 +134,7 @@ class Login extends BasicApi
|
||||
}
|
||||
}
|
||||
session('captcha', $code);
|
||||
session('captchaMobile', $mobile);
|
||||
$this->success('', config('sms.debug') ? $code : '');
|
||||
}
|
||||
|
||||
@ -168,6 +172,9 @@ class Login extends BasicApi
|
||||
if (session('captcha') != $data['captcha']) {
|
||||
$this->error('验证码错误', 203);
|
||||
}
|
||||
if (session('captchaMobile') != $data['mobile']) {
|
||||
$this->error('手机号与验证码不匹配', 203);
|
||||
}
|
||||
$memberData = [
|
||||
'email' => $data['email'],
|
||||
'name' => $data['name'],
|
||||
@ -189,6 +196,105 @@ class Login extends BasicApi
|
||||
$this->success('');
|
||||
}
|
||||
|
||||
/**
|
||||
* 绑定手机
|
||||
* @throws DataNotFoundException
|
||||
* @throws DbException
|
||||
* @throws ModelNotFoundException
|
||||
*/
|
||||
public function _bindMobile()
|
||||
{
|
||||
$mobile = $this->request->post('mobile', '');
|
||||
if (session('captcha') != Request::param('captcha')) {
|
||||
$this->error('验证码错误', 203);
|
||||
}
|
||||
if (session('captchaMobile') != $mobile) {
|
||||
$this->error('手机号与验证码不匹配', 203);
|
||||
}
|
||||
$member = getCurrentMember();
|
||||
if ($mobile && $member['mobile'] == $mobile) {
|
||||
$this->error('你已绑定该手机', 203);
|
||||
}
|
||||
$other = Member::where(['mobile' => $mobile])->find();
|
||||
if ($other && $other['id'] != $member['id']) {
|
||||
$this->error('该手机已被绑定', 203);
|
||||
}
|
||||
$result = Member::update(['mobile' => $mobile], ['id' => $member['id']]);
|
||||
$member['mobile'] = $mobile;
|
||||
if ($result) {
|
||||
setCurrentMember($member);
|
||||
$tokenList = JwtService::initToken($member);
|
||||
$accessTokenExp = JwtService::decodeToken($tokenList['accessToken'])->exp;
|
||||
$tokenList['accessTokenExp'] = $accessTokenExp;
|
||||
$this->success('绑定成功！', ['member' => $member, 'tokenList' => $tokenList]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 绑定邮箱
|
||||
*/
|
||||
public function _bindMail()
|
||||
{
|
||||
if (!config('mail.open')) {
|
||||
$this->error('系统尚未开启邮件服务');
|
||||
}
|
||||
$email = $this->request->post('mail', '');
|
||||
$mailer = new Mail();
|
||||
try {
|
||||
$mail = $mailer->mail;
|
||||
$mail->setFrom(config('mail.Username'), 'pearProject');
|
||||
$mail->addAddress($email, getCurrentMember()['name']);
|
||||
//Content
|
||||
$mail->isHTML(true);
|
||||
$mail->Subject = '申请修改邮箱地址';
|
||||
$member = getCurrentMember();
|
||||
$info = [
|
||||
'member_code' => $member['code'],
|
||||
'email' => $member['email'],
|
||||
];
|
||||
$accessToken = JwtService::getAccessToken($info);
|
||||
$link = Request::domain() . '/#/reset/email?token=' . $accessToken;
|
||||
$mail->Body = '
|
||||
<p>您最近申请了修改您的邮箱地址，点击下面的链接进行修改，如果您从未提交过此申请，请忽略此邮件。</p>
|
||||
<a href="' . $link . '" target="_blank" style="display: inline-block;padding: 8px 24px;background: #1890ff;border-radius: 4px;font-weight: normal;letter-spacing: 1px;font-size: 14px;color: white;text-decoration: none;" rel="noopener">
|
||||
验证邮箱
|
||||
</a>
|
||||
<p>如果按钮无法点击，请点击以下链接进行验证:</p>
|
||||
<a href="' . $link . '">' . $link . '</a>
|
||||
';
|
||||
$mail->send();
|
||||
} catch (\Exception $e) {
|
||||
ob_clean();
|
||||
$this->error('发送失败 ');
|
||||
}
|
||||
$this->success('发送邮件成功');
|
||||
}
|
||||
|
||||
/**
|
||||
* 验证绑定邮箱
|
||||
* @throws DataNotFoundException
|
||||
* @throws DbException
|
||||
* @throws ModelNotFoundException
|
||||
*/
|
||||
public function _checkBindMail()
|
||||
{
|
||||
$accessToken = $this->request->post('token', '');
|
||||
$data = JwtService::decodeToken($accessToken);
|
||||
$isError = isError($data);
|
||||
if (!$isError) {
|
||||
$other = Member::where(['email' => $data->data->email])->find();
|
||||
if ($other && $other['code'] != $data->data->member_code) {
|
||||
$this->error('该邮箱已被绑定', 203);
|
||||
}
|
||||
$result = Member::update(['email' => $data->data->email], ['code' => $data->data->member_code]);
|
||||
if ($result) {
|
||||
$this->success();
|
||||
}
|
||||
}
|
||||
$this->error('验证失败！');
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 退出登录
|
||||
*/
|
||||
|
||||
@ -26,7 +26,8 @@
|
||||
"workerman/gateway-worker" : ">=3.0.0",
|
||||
"overtrue/easy-sms": "^1.1",
|
||||
"phpoffice/phpspreadsheet": "^1.5",
|
||||
"firebase/php-jwt": "^5.0"
|
||||
"firebase/php-jwt": "^5.0",
|
||||
"phpmailer/phpmailer": "^6.0"
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
|
||||
@ -6,7 +6,7 @@ return [
|
||||
// 应用名称
|
||||
'app_name' => 'pearProject',
|
||||
// 应用版本
|
||||
'app_version' => '2.2.1',
|
||||
'app_version' => '2.2.2',
|
||||
// 应用地址
|
||||
'app_host' => '',
|
||||
// 应用调试模式
|
||||
|
||||
11
config/mail.php
Normal file
11
config/mail.php
Normal file
@ -0,0 +1,11 @@
|
||||
<?php
|
||||
|
||||
return [
|
||||
'open' => false, //Weather open mail support
|
||||
'Host' => 'smtp.example.com',// Specify main and backup SMTP servers
|
||||
'SMTPAuth' => true,// Enable SMTP authentication
|
||||
'Username' => 'example@example.com',// SMTP username
|
||||
'Password' => 'example',// SMTP password
|
||||
'SMTPSecure' => 'tls',// Enable TLS encryption, `ssl` also accepted
|
||||
'Port' => 25,// TCP port to connect to
|
||||
];
|
||||
30
extend/mail/Mail.php
Normal file
30
extend/mail/Mail.php
Normal file
@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
|
||||
namespace mail;
|
||||
|
||||
use PHPMailer\PHPMailer\PHPMailer;
|
||||
|
||||
/**
|
||||
* 邮件服务
|
||||
* Class Sms
|
||||
* @package sms
|
||||
*/
|
||||
class Mail
|
||||
{
|
||||
public $mail;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$mail = new PHPMailer(true);
|
||||
// $mail->SMTPDebug = 2; // Enable verbose debug output
|
||||
$mail->isSMTP(); // Set mailer to use SMTP
|
||||
$mail->Host = config('mail.Host'); // Specify main and backup SMTP servers
|
||||
$mail->SMTPAuth = config('mail.SMTPAuth'); // Enable SMTP authentication
|
||||
$mail->Username = config('mail.Username'); // SMTP username
|
||||
$mail->Password = config('mail.Password'); // SMTP password
|
||||
$mail->SMTPSecure = config('mail.SMTPSecure'); // Enable TLS encryption, `ssl` also accepted
|
||||
$mail->Port = config('mail.Port'); // TCP port to connect to
|
||||
$this->mail = $mail;
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user