|
|
@@ -10,6 +10,7 @@ use App\Models\Manager\Personnel\Employee as EmployeeModel;
|
|
|
use App\Facades\Servers\Sms\VerifyCode as Sms;
|
|
|
use App\Models\Manager\Personnel\EmployeeOpenid as EmployeeOpenidModel;
|
|
|
use App\Servers\Wechat\WeChatWebApp;
|
|
|
+use App\Models\Manager\Personnel\RolesAuthRule as RolesAuthRuleModel;
|
|
|
|
|
|
/**
|
|
|
* 管理后台登录控制器
|
|
|
@@ -30,7 +31,7 @@ class Login extends Manager
|
|
|
* @param string password 登录密码
|
|
|
*
|
|
|
* */
|
|
|
- public function index(Request $Request, AdminUser $AdminUser, AuthRule $AuthRule, EmployeeModel $EmployeeModel)
|
|
|
+ public function index(Request $Request, AdminUser $AdminUser, AuthRule $AuthRule, EmployeeModel $EmployeeModel,RolesAuthRuleModel $RolesAuthRuleModel)
|
|
|
{
|
|
|
// 验证规则
|
|
|
$Request->scene('login')->validate();
|
|
|
@@ -56,7 +57,7 @@ class Login extends Manager
|
|
|
// 获取权限列表
|
|
|
$accessToken['username'] = $admin['username'];
|
|
|
// 获取权限列表
|
|
|
- $accessToken['auth_rules'] = $AuthRule->getAuthList($admin['uid'], '1', 'manager');
|
|
|
+ $accessToken['auth_rules'] = $AuthRule->getAdminAuthList($admin['uid'], '1', 'manager');
|
|
|
} else {
|
|
|
$admin = $EmployeeModel->where('employee_code', $username)->first(['id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
|
|
|
// 用户不存在
|
|
|
@@ -73,7 +74,7 @@ class Login extends Manager
|
|
|
if (isset($accessToken['error'])) return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
|
|
|
// 获取权限列表
|
|
|
$accessToken['username'] = $admin['username'];
|
|
|
- $accessToken['auth_rules'] = $AuthRule->getAuthList($admin['uid'], '0', 'manager');
|
|
|
+ $accessToken['auth_rules'] = $RolesAuthRuleModel->getAuthList($admin['uid'], '0', 'manager');
|
|
|
}
|
|
|
|
|
|
// 表单令牌
|
