|
@@ -8,8 +8,8 @@
|
|
|
|
|
|
namespace app\admin\controller;
|
|
|
|
|
|
+use app\admin\business\AdminUser as AdminUserBusiness;
|
|
|
use app\admin\validate\AdminUser as AdminUserValidate;
|
|
|
-use app\common\model\mysql\AdminUser;
|
|
|
use think\facade\View;
|
|
|
|
|
|
|
|
@@ -50,7 +50,7 @@ class Login extends AdminBase
|
|
|
'captcha' => $captcha,
|
|
|
];
|
|
|
$validate = new AdminUserValidate();
|
|
|
- if ($validate->check($data)) {
|
|
|
+ if (!$validate->check($data)) {
|
|
|
return show(config('status.error'), $validate->getError());
|
|
|
}
|
|
|
// if (empty($username) || empty($password) || empty($captcha)) {
|
|
@@ -63,34 +63,14 @@ class Login extends AdminBase
|
|
|
// }
|
|
|
|
|
|
try {
|
|
|
- $adminUserObj = new AdminUser();
|
|
|
- $adminUser = $adminUserObj->getAdminUserByUsername($username);
|
|
|
- if (empty($adminUser) || $adminUser->status != config('status.mysql.table_normal')) {
|
|
|
- return show(config('status.error'), '不存在该用户');
|
|
|
- }
|
|
|
- $adminUser = $adminUser->toArray();
|
|
|
- if ($adminUser['password'] !== md5($password . '_singwa_abc')) {
|
|
|
- return show(config('status.error'), '密码错误');
|
|
|
- }
|
|
|
-
|
|
|
- // 记录session
|
|
|
- session(config('admin.session_admin'), $adminUser);
|
|
|
-
|
|
|
- // 记录信息到mysql中
|
|
|
- $updateData = [
|
|
|
- 'last_login_time' => time(),
|
|
|
- 'last_login_ip' => request()->ip(),
|
|
|
- 'update_time' => time(),
|
|
|
- ];
|
|
|
- $res = $adminUserObj->updateById($adminUser['id'], $updateData);
|
|
|
- if (empty($res)) {
|
|
|
- return show(config('status.error'), '登陆失败');
|
|
|
- }
|
|
|
+ $result = AdminUserBusiness::login($data);
|
|
|
} catch (\Exception $e) {
|
|
|
- // todo 记录日志 $e->getMessage()
|
|
|
- return show(config('status.error'), '内部异常,登陆失败');
|
|
|
+ return show(config('status.error'), $e->getMessage());
|
|
|
+ }
|
|
|
+ if ($result) {
|
|
|
+ return show(config('status.success'), '登录成功');
|
|
|
+ } else {
|
|
|
+ return show(config('status.error'), '登录失败');
|
|
|
}
|
|
|
-
|
|
|
- return show(config('status.success'), '登陆成功');
|
|
|
}
|
|
|
}
|