From 61cd08ac4c7fb0a70295fe2fb4875a8b9e21eb50 Mon Sep 17 00:00:00 2001 From: xiaochong0302 Date: Sun, 7 Jun 2020 18:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=B5=9E=E8=B5=8F=E5=92=8C?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E8=B4=AD=E4=B9=B0=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Admin/Services/User.php | 9 +++- app/Http/Admin/Views/order/macro.volt | 2 +- app/Http/Admin/Views/order/search.volt | 2 +- .../Web/Controllers/AccountController.php | 25 +++++++---- app/Http/Web/Views/account/edit_email.volt | 16 ++++--- app/Http/Web/Views/account/edit_password.volt | 39 +++++++---------- app/Http/Web/Views/account/edit_phone.volt | 16 ++++--- app/Http/Web/Views/my/account.volt | 42 +++---------------- app/Http/Web/Views/order/confirm.volt | 42 +++++++++++++++---- app/Http/Web/Views/templates/full.volt | 13 +++++- .../templates/{content.volt => layer.volt} | 4 +- app/Library/Validators/Common.php | 2 +- app/Models/Account.php | 8 ---- app/Services/Frontend/Account/EmailUpdate.php | 2 +- .../Frontend/Account/PasswordReset.php | 9 +++- .../Frontend/Account/PasswordResetByEmail.php | 33 --------------- .../Frontend/Account/PasswordResetByPhone.php | 33 --------------- .../Frontend/Account/PasswordUpdate.php | 9 +++- app/Services/Frontend/Account/PhoneUpdate.php | 2 +- .../Frontend/Account/RegisterByEmail.php | 41 ------------------ .../Frontend/Account/RegisterByPhone.php | 41 ------------------ app/Services/Frontend/Order/OrderConfirm.php | 2 + app/Services/Frontend/Order/OrderCreate.php | 4 +- app/Validators/Account.php | 16 +++++++ config/errors.php | 6 ++- public/static/admin/js/common.js | 6 +-- public/static/web/css/common.css | 10 +++-- public/static/web/js/captcha.verify.js | 11 ++++- public/static/web/js/common.js | 17 ++------ 29 files changed, 183 insertions(+), 279 deletions(-) rename app/Http/Web/Views/templates/{content.volt => layer.volt} (91%) delete mode 100644 app/Services/Frontend/Account/PasswordResetByEmail.php delete mode 100644 app/Services/Frontend/Account/PasswordResetByPhone.php delete mode 100644 app/Services/Frontend/Account/RegisterByEmail.php delete mode 100644 app/Services/Frontend/Account/RegisterByPhone.php diff --git a/app/Http/Admin/Services/User.php b/app/Http/Admin/Services/User.php index 5595d59b..22e4f258 100644 --- a/app/Http/Admin/Services/User.php +++ b/app/Http/Admin/Services/User.php @@ -5,6 +5,7 @@ namespace App\Http\Admin\Services; use App\Builders\UserList as UserListBuilder; use App\Caches\User as UserCache; use App\Library\Paginator\Query as PaginateQuery; +use App\Library\Utils\Password as PasswordUtil; use App\Models\Account as AccountModel; use App\Models\User as UserModel; use App\Repos\Account as AccountRepo; @@ -69,7 +70,11 @@ class User extends Service $account = new AccountModel(); + $salt = PasswordUtil::salt(); + $password = PasswordUtil::hash($password, $salt); + $account->phone = $phone; + $account->salt = $salt; $account->password = $password; $account->create(); @@ -191,7 +196,9 @@ class User extends Service } if (!empty($post['password'])) { - $data['password'] = $validator->checkPassword($post['password']); + $post['password'] = $validator->checkPassword($post['password']); + $data['salt'] = PasswordUtil::salt(); + $data['password'] = PasswordUtil::hash($post['password'], $data['salt']); } $account->update($data); diff --git a/app/Http/Admin/Views/order/macro.volt b/app/Http/Admin/Views/order/macro.volt index e7b73190..c2455b6b 100644 --- a/app/Http/Admin/Views/order/macro.volt +++ b/app/Http/Admin/Views/order/macro.volt @@ -44,7 +44,7 @@ {% elseif value == 'vip' %} 会员 {% elseif value == 'reward' %} - 打赏 + 赞赏 {% elseif value == 'test' %} 测试 {% endif %} diff --git a/app/Http/Admin/Views/order/search.volt b/app/Http/Admin/Views/order/search.volt index b637425d..42ae4f38 100644 --- a/app/Http/Admin/Views/order/search.volt +++ b/app/Http/Admin/Views/order/search.volt @@ -23,7 +23,7 @@
- +
diff --git a/app/Http/Web/Controllers/AccountController.php b/app/Http/Web/Controllers/AccountController.php index 7c3fbfbc..66a525cd 100644 --- a/app/Http/Web/Controllers/AccountController.php +++ b/app/Http/Web/Controllers/AccountController.php @@ -7,7 +7,6 @@ use App\Services\Frontend\Account\EmailUpdate as EmailUpdateService; use App\Services\Frontend\Account\PasswordReset as PasswordResetService; use App\Services\Frontend\Account\PasswordUpdate as PasswordUpdateService; use App\Services\Frontend\Account\PhoneUpdate as PhoneUpdateService; -use Phalcon\Mvc\View; /** * @RoutePrefix("/account") @@ -152,7 +151,6 @@ class AccountController extends Controller $captcha = $service->getSectionSettings('captcha'); - $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->pick('account/edit_password'); $this->view->setVar('captcha', $captcha); } @@ -170,7 +168,6 @@ class AccountController extends Controller $captcha = $service->getSectionSettings('captcha'); - $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->pick('account/edit_phone'); $this->view->setVar('captcha', $captcha); } @@ -188,7 +185,6 @@ class AccountController extends Controller $captcha = $service->getSectionSettings('captcha'); - $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW); $this->view->pick('account/edit_email'); $this->view->setVar('captcha', $captcha); } @@ -221,7 +217,12 @@ class AccountController extends Controller $service->handle(); - return $this->jsonSuccess(['msg' => '更新手机成功']); + $content = [ + 'location' => $this->url->get(['for' => 'web.my.account']), + 'msg' => '更新手机成功', + ]; + + return $this->jsonSuccess($content); } /** @@ -233,7 +234,12 @@ class AccountController extends Controller $service->handle(); - return $this->jsonSuccess(['msg' => '更新邮箱成功']); + $content = [ + 'location' => $this->url->get(['for' => 'web.my.account']), + 'msg' => '更新邮箱成功', + ]; + + return $this->jsonSuccess($content); } /** @@ -245,7 +251,12 @@ class AccountController extends Controller $service->handle(); - return $this->jsonSuccess(['msg' => '更新密码成功']); + $content = [ + 'location' => $this->url->get(['for' => 'web.my.account']), + 'msg' => '更新密码成功', + ]; + + return $this->jsonSuccess($content); } } diff --git a/app/Http/Web/Views/account/edit_email.volt b/app/Http/Web/Views/account/edit_email.volt index b709387c..affcacf8 100644 --- a/app/Http/Web/Views/account/edit_email.volt +++ b/app/Http/Web/Views/account/edit_email.volt @@ -1,17 +1,23 @@ -{% extends 'templates/content.volt' %} +{% extends 'templates/full.volt' %} {% block content %} +
+ 首页 + 帐号安全 + 绑定邮箱 +
+
- {{ js_include('lib/layui/layui.all.js') }} {{ js_include('web/js/common.js') }} + {% block include_js %}{% endblock %} {% block inline_js %}{% endblock %} diff --git a/app/Http/Web/Views/templates/content.volt b/app/Http/Web/Views/templates/layer.volt similarity index 91% rename from app/Http/Web/Views/templates/content.volt rename to app/Http/Web/Views/templates/layer.volt index 3b0258b7..87bcc7a5 100644 --- a/app/Http/Web/Views/templates/content.volt +++ b/app/Http/Web/Views/templates/layer.volt @@ -14,9 +14,7 @@ {% block inline_css %}{% endblock %} -
- {% block content %}{% endblock %} -
+{% block content %}{% endblock %} {{ js_include('lib/layui/layui.all.js') }} {{ js_include('web/js/common.js') }} {% block include_js %}{% endblock %} diff --git a/app/Library/Validators/Common.php b/app/Library/Validators/Common.php index 504d7f45..3c89c88f 100644 --- a/app/Library/Validators/Common.php +++ b/app/Library/Validators/Common.php @@ -66,7 +66,7 @@ class Common public static function phone($str) { - $pattern = '/^1(3|4|5|6|7|9)[0-9]{9}$/'; + $pattern = '/^1(3|4|5|6|7|8|9)[0-9]{9}$/'; return preg_match($pattern, $str) ? true : false; } diff --git a/app/Models/Account.php b/app/Models/Account.php index 8c7a8a3c..becf92e8 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -2,7 +2,6 @@ namespace App\Models; -use App\Library\Utils\Password; use Phalcon\Mvc\Model\Behavior\SoftDelete; class Account extends Model @@ -83,18 +82,11 @@ class Account extends Model public function beforeCreate() { - $this->salt = Password::salt(); - $this->password = Password::hash($this->password, $this->salt); $this->create_time = time(); } public function beforeUpdate() { - if (!empty($this->password)) { - $this->salt = Password::salt(); - $this->password = Password::hash($this->password, $this->salt); - } - $this->update_time = time(); } diff --git a/app/Services/Frontend/Account/EmailUpdate.php b/app/Services/Frontend/Account/EmailUpdate.php index ae61e9e0..bc8a63f4 100644 --- a/app/Services/Frontend/Account/EmailUpdate.php +++ b/app/Services/Frontend/Account/EmailUpdate.php @@ -28,7 +28,7 @@ class EmailUpdate extends FrontendService $accountValidator->checkIfEmailTaken($post['email']); } - $accountValidator->checkOriginPassword($account, $post['origin_password']); + $accountValidator->checkLoginPassword($account, $post['login_password']); $verifyValidator = new VerifyValidator(); diff --git a/app/Services/Frontend/Account/PasswordReset.php b/app/Services/Frontend/Account/PasswordReset.php index ff64b76f..8e549995 100644 --- a/app/Services/Frontend/Account/PasswordReset.php +++ b/app/Services/Frontend/Account/PasswordReset.php @@ -2,6 +2,7 @@ namespace App\Services\Frontend\Account; +use App\Library\Utils\Password as PasswordUtil; use App\Services\Frontend\Service as FrontendService; use App\Validators\Account as AccountValidator; use App\Validators\Verify as VerifyValidator; @@ -17,13 +18,17 @@ class PasswordReset extends FrontendService $account = $accountValidator->checkAccount($post['account']); - $accountValidator->checkPassword($post['new_password']); + $newPassword = $accountValidator->checkPassword($post['new_password']); $verifyValidator = new VerifyValidator(); $verifyValidator->checkCode($post['account'], $post['verify_code']); - $account->password = $post['new_password']; + $salt = PasswordUtil::salt(); + $password = PasswordUtil::hash($newPassword, $salt); + + $account->salt = $salt; + $account->password = $password; $account->update(); diff --git a/app/Services/Frontend/Account/PasswordResetByEmail.php b/app/Services/Frontend/Account/PasswordResetByEmail.php deleted file mode 100644 index fb4c4378..00000000 --- a/app/Services/Frontend/Account/PasswordResetByEmail.php +++ /dev/null @@ -1,33 +0,0 @@ -request->getPost(); - - $accountValidator = new AccountValidator(); - - $account = $accountValidator->checkAccount($post['email']); - - $accountValidator->checkPassword($post['new_password']); - - $verifyValidator = new VerifyValidator(); - - $verifyValidator->checkEmailCode($post['email'], $post['verify_code']); - - $account->password = $post['new_password']; - - $account->update(); - - return $account; - } - -} diff --git a/app/Services/Frontend/Account/PasswordResetByPhone.php b/app/Services/Frontend/Account/PasswordResetByPhone.php deleted file mode 100644 index 213b2593..00000000 --- a/app/Services/Frontend/Account/PasswordResetByPhone.php +++ /dev/null @@ -1,33 +0,0 @@ -request->getPost(); - - $accountValidator = new AccountValidator(); - - $account = $accountValidator->checkAccount($post['phone']); - - $accountValidator->checkPassword($post['new_password']); - - $verifyValidator = new VerifyValidator(); - - $verifyValidator->checkSmsCode($post['phone'], $post['verify_code']); - - $account->password = $post['new_password']; - - $account->update(); - - return $account; - } - -} diff --git a/app/Services/Frontend/Account/PasswordUpdate.php b/app/Services/Frontend/Account/PasswordUpdate.php index 7211e4d6..a2742501 100644 --- a/app/Services/Frontend/Account/PasswordUpdate.php +++ b/app/Services/Frontend/Account/PasswordUpdate.php @@ -2,6 +2,7 @@ namespace App\Services\Frontend\Account; +use App\Library\Utils\Password as PasswordUtil; use App\Repos\Account as AccountRepo; use App\Services\Frontend\Service as FrontendService; use App\Validators\Account as AccountValidator; @@ -25,7 +26,13 @@ class PasswordUpdate extends FrontendService $newPassword = $accountValidator->checkPassword($post['new_password']); - $account->password = $newPassword; + $accountValidator->checkConfirmPassword($post['new_password'], $post['confirm_password']); + + $salt = PasswordUtil::salt(); + $password = PasswordUtil::hash($newPassword, $salt); + + $account->salt = $salt; + $account->password = $password; $account->update(); diff --git a/app/Services/Frontend/Account/PhoneUpdate.php b/app/Services/Frontend/Account/PhoneUpdate.php index 947191ae..3074d4ec 100644 --- a/app/Services/Frontend/Account/PhoneUpdate.php +++ b/app/Services/Frontend/Account/PhoneUpdate.php @@ -28,7 +28,7 @@ class PhoneUpdate extends FrontendService $accountValidator->checkIfPhoneTaken($post['phone']); } - $accountValidator->checkOriginPassword($account, $post['origin_password']); + $accountValidator->checkLoginPassword($account, $post['login_password']); $verifyValidator = new VerifyValidator(); diff --git a/app/Services/Frontend/Account/RegisterByEmail.php b/app/Services/Frontend/Account/RegisterByEmail.php deleted file mode 100644 index 4d48cebe..00000000 --- a/app/Services/Frontend/Account/RegisterByEmail.php +++ /dev/null @@ -1,41 +0,0 @@ -request->getPost(); - - $verifyValidator = new VerifyValidator(); - - $verifyValidator->checkEmailCode($post['email'], $post['verify_code']); - - $accountValidator = new AccountValidator(); - - $data = []; - - $data['email'] = $accountValidator->checkEmail($post['email']); - - $accountValidator->checkIfEmailTaken($post['email']); - - $data['password'] = $accountValidator->checkPassword($post['password']); - - $account = new AccountModel(); - - $account->create($data); - - $userRepo = new UserRepo(); - - return $userRepo->findById($account->id); - } - -} diff --git a/app/Services/Frontend/Account/RegisterByPhone.php b/app/Services/Frontend/Account/RegisterByPhone.php deleted file mode 100644 index 6d88f854..00000000 --- a/app/Services/Frontend/Account/RegisterByPhone.php +++ /dev/null @@ -1,41 +0,0 @@ -request->getPost(); - - $verifyValidator = new VerifyValidator(); - - $verifyValidator->checkSmsCode($post['phone'], $post['verify_code']); - - $accountValidator = new AccountValidator(); - - $data = []; - - $data['phone'] = $accountValidator->checkPhone($post['phone']); - - $accountValidator->checkIfPhoneTaken($post['phone']); - - $data['password'] = $accountValidator->checkPassword($post['password']); - - $account = new AccountModel(); - - $account->create($data); - - $userRepo = new UserRepo(); - - return $userRepo->findById($account->id); - } - -} diff --git a/app/Services/Frontend/Order/OrderConfirm.php b/app/Services/Frontend/Order/OrderConfirm.php index 7dd1ac4f..15080fdb 100644 --- a/app/Services/Frontend/Order/OrderConfirm.php +++ b/app/Services/Frontend/Order/OrderConfirm.php @@ -134,6 +134,8 @@ class OrderConfirm extends FrontendService 'cover' => $course->cover, 'model' => $course->model, 'level' => $course->level, + 'user_count' => $course->user_count, + 'lesson_count' => $course->lesson_count, 'study_expiry' => $course->study_expiry, 'refund_expiry' => $course->refund_expiry, 'market_price' => $course->market_price, diff --git a/app/Services/Frontend/Order/OrderCreate.php b/app/Services/Frontend/Order/OrderCreate.php index e4f20f2c..f6faa631 100644 --- a/app/Services/Frontend/Order/OrderCreate.php +++ b/app/Services/Frontend/Order/OrderCreate.php @@ -177,11 +177,11 @@ class OrderCreate extends FrontendService $order = new OrderModel(); $order->user_id = $user->id; - $order->item_id = $course->id; + $order->item_id = "{$course->id}-{$reward->id}"; $order->item_type = OrderModel::ITEM_REWARD; $order->item_info = $itemInfo; $order->amount = $reward->price; - $order->subject = "打赏 - {$course->title}"; + $order->subject = "赞赏 - {$course->title}"; $order->create(); diff --git a/app/Validators/Account.php b/app/Validators/Account.php index b9ad27e8..08afc337 100644 --- a/app/Validators/Account.php +++ b/app/Validators/Account.php @@ -73,6 +73,13 @@ class Account extends Validator return $password; } + public function checkConfirmPassword($newPassword, $confirmPassword) + { + if ($newPassword != $confirmPassword) { + throw new BadRequestException('account.password_not_match'); + } + } + public function checkOriginPassword(AccountModel $account, $password) { $hash = PasswordUtil::hash($password, $account->salt); @@ -82,6 +89,15 @@ class Account extends Validator } } + public function checkLoginPassword(AccountModel $account, $password) + { + $hash = PasswordUtil::hash($password, $account->salt); + + if ($hash != $account->password) { + throw new BadRequestException('account.login_password_incorrect'); + } + } + public function checkIfPhoneTaken($phone) { $accountRepo = new AccountRepo(); diff --git a/config/errors.php b/config/errors.php index 8e3542b0..ea046e04 100644 --- a/config/errors.php +++ b/config/errors.php @@ -41,13 +41,15 @@ $error['captcha.invalid_code'] = '无效的验证码'; $error['account.not_found'] = '账号不存在'; $error['account.login_block'] = '账号被锁定，无法登录'; $error['account.login_password_incorrect'] = '登录密码不正确'; -$error['account.invalid_login_name'] = '无效的登录账户名'; +$error['account.invalid_login_name'] = '无效的登录名'; $error['account.invalid_email'] = '无效的电子邮箱'; $error['account.invalid_phone'] = '无效的手机号'; $error['account.invalid_password'] = '无效的密码（字母或数字6-16位）'; $error['account.email_taken'] = '邮箱被占用'; $error['account.phone_taken'] = '手机号被占用'; -$error['account.origin_password_incorrect'] = '原密码不正确'; +$error['account.password_not_match'] = '密码不匹配'; +$error['account.origin_password_incorrect'] = '原有密码不正确'; +$error['account.login_password_incorrect'] = '登录密码不正确'; /** * 用户相关 diff --git a/public/static/admin/js/common.js b/public/static/admin/js/common.js index 7c169bae..8e8b4e4b 100644 --- a/public/static/admin/js/common.js +++ b/public/static/admin/js/common.js @@ -18,7 +18,7 @@ layui.use(['jquery', 'form', 'element', 'layer', 'dropdown'], function () { form.on('submit(go)', function (data) { var submit = $(this); - submit.attr('disabled', true).addClass('layui-btn-disabled'); + submit.attr('disabled', 'disabled').addClass('layui-btn-disabled'); $.ajax({ type: 'POST', url: data.form.action, @@ -33,13 +33,13 @@ layui.use(['jquery', 'form', 'element', 'layer', 'dropdown'], function () { window.location.href = res.location; }, 1500); } else { - submit.attr('disabled', false).removeClass('layui-btn-disabled'); + submit.removeAttr('disabled').removeClass('layui-btn-disabled'); } }, error: function (xhr) { var json = JSON.parse(xhr.responseText); layer.msg(json.msg, {icon: 2}); - submit.attr('disabled', false).removeClass('layui-btn-disabled'); + submit.removeAttr('disabled').removeClass('layui-btn-disabled'); } }); return false; diff --git a/public/static/web/css/common.css b/public/static/web/css/common.css index 182fb03c..9d54c6bb 100644 --- a/public/static/web/css/common.css +++ b/public/static/web/css/common.css @@ -1,4 +1,4 @@ -body { +.body { background-color: #f2f2f2; } @@ -394,7 +394,7 @@ body { .lesson-item { position: relative; padding: 0 10px; - line-height: 40px; + line-height: 35px; } .lesson-item a { @@ -743,7 +743,7 @@ body { .payment .channel { margin-top: 50px; - margin-bottom: 80px; + margin-bottom: 50px; text-align: center; } @@ -1032,4 +1032,8 @@ body { .security-item .action { float: right; +} + +.layer-container .account-form { + padding-top: 40px; } \ No newline at end of file diff --git a/public/static/web/js/captcha.verify.js b/public/static/web/js/captcha.verify.js index 6196cfb8..6b30bb06 100644 --- a/public/static/web/js/captcha.verify.js +++ b/public/static/web/js/captcha.verify.js @@ -46,7 +46,16 @@ var captcha = new TencentCaptcha( ); $account.on('keyup', function () { - var accountOk = isEmail($(this).val()) || isPhone($(this).val()); + var accountOk; + var type = $(this).attr('data-type'); + var account = $(this).val(); + if (type === 'phone') { + accountOk = isPhone(account); + } else if (type === 'email') { + accountOk = isEmail(account); + } else { + accountOk = isPhone(account) || isEmail(account); + } if (accountOk && !timeCounting) { $emit.removeClass('layui-btn-disabled').removeAttr('disabled'); } else { diff --git a/public/static/web/js/common.js b/public/static/web/js/common.js index bf34ccf1..f2161f8a 100644 --- a/public/static/web/js/common.js +++ b/public/static/web/js/common.js @@ -2,7 +2,6 @@ var $ = layui.jquery; var element = layui.element; var form = layui.form; var layer = layui.layer; -var util = layui.util; $.ajaxSetup({ beforeSend: function (xhr) { @@ -10,16 +9,6 @@ $.ajaxSetup({ } }); -util.fixbar({ - bar1: true, - click: function (type) { - console.log(type); - if (type === 'bar1') { - alert('点击了bar1'); - } - } -}); - var helper = {}; helper.ajaxLoadHtml = function (url, target) { @@ -34,7 +23,7 @@ helper.ajaxLoadHtml = function (url, target) { form.on('submit(go)', function (data) { var submit = $(this); - submit.attr('disabled', true).addClass('layui-btn-disabled'); + submit.attr('disabled', 'disabled').addClass('layui-btn-disabled'); $.ajax({ type: 'POST', url: data.form.action, @@ -49,13 +38,13 @@ form.on('submit(go)', function (data) { window.location.href = res.location; }, 1500); } else { - submit.attr('disabled', false).removeClass('layui-btn-disabled'); + submit.removeAttr('disabled').removeClass('layui-btn-disabled'); } }, error: function (xhr) { var json = JSON.parse(xhr.responseText); layer.msg(json.msg, {icon: 2}); - submit.attr('disabled', false).removeClass('layui-btn-disabled'); + submit.removeAttr('disabled').removeClass('layui-btn-disabled'); } }); return false;