diff --git a/app/Admin/Controllers/AuthController.php b/app/Admin/Controllers/AuthController.php index 2c1c808..dda7fa9 100644 --- a/app/Admin/Controllers/AuthController.php +++ b/app/Admin/Controllers/AuthController.php @@ -2,8 +2,22 @@ namespace App\Admin\Controllers; +use App\Common\UserStatus; use Dcat\Admin\Http\Controllers\AuthController as BaseAuthController; +use Illuminate\Http\Request; class AuthController extends BaseAuthController { + public function postLogin(Request $request) + { + $login_result = parent::postLogin($request); + if ($login_result->isOk() && $this->guard()->getUser()->status != UserStatus::NORMAL) { + $this->guard()->logout(); //必须加这句,否则还是登录成功 + $request->session()->invalidate(); + return $this->validationErrorsResponse([ + $this->username() => '账号未审核或已被禁用', + ]); + } + return $login_result; + } } diff --git a/app/Admin/routes.php b/app/Admin/routes.php index f7b41fc..0e19cdc 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -13,6 +13,7 @@ Route::group([ ], function (Router $router) { $router->get('/', 'HomeController@index'); + $router->post('auth/login', 'AuthController@postLogin'); $router->resource('user/list', 'UserController'); $router->resource('order/list', 'OrderController'); diff --git a/app/AdminAgent/Controllers/AuthController.php b/app/AdminAgent/Controllers/AuthController.php index ad1b82f..94278bf 100644 --- a/app/AdminAgent/Controllers/AuthController.php +++ b/app/AdminAgent/Controllers/AuthController.php @@ -2,8 +2,22 @@ namespace App\AdminAgent\Controllers; +use App\Common\UserStatus; use Dcat\Admin\Http\Controllers\AuthController as BaseAuthController; +use Illuminate\Http\Request; class AuthController extends BaseAuthController { + public function postLogin(Request $request) + { + $login_result = parent::postLogin($request); + if ($login_result->isOk() && $this->guard()->getUser()->status != UserStatus::NORMAL) { + $this->guard()->logout(); //必须加这句,否则还是登录成功 + $request->session()->invalidate(); + return $this->validationErrorsResponse([ + $this->username() => '账号未审核或已被禁用', + ]); + } + return $login_result; + } } diff --git a/app/AdminAgent/routes.php b/app/AdminAgent/routes.php index b002d7e..ef30e84 100644 --- a/app/AdminAgent/routes.php +++ b/app/AdminAgent/routes.php @@ -13,6 +13,7 @@ Route::group([ ], function (Router $router) { $router->get('/', 'HomeController@index'); + $router->post('auth/login', 'AuthController@postLogin'); $router->resource('product/list', 'AgentProductController'); $router->resource('category/list', 'CategoryController'); diff --git a/app/AdminGuide/Controllers/AuthController.php b/app/AdminGuide/Controllers/AuthController.php index 049a1f3..c7288e1 100644 --- a/app/AdminGuide/Controllers/AuthController.php +++ b/app/AdminGuide/Controllers/AuthController.php @@ -2,8 +2,22 @@ namespace App\AdminGuide\Controllers; +use App\Common\UserStatus; use Dcat\Admin\Http\Controllers\AuthController as BaseAuthController; +use Illuminate\Http\Request; class AuthController extends BaseAuthController { + public function postLogin(Request $request) + { + $login_result = parent::postLogin($request); + if ($login_result->isOk() && $this->guard()->getUser()->status != UserStatus::NORMAL) { + $this->guard()->logout(); //必须加这句,否则还是登录成功 + $request->session()->invalidate(); + return $this->validationErrorsResponse([ + $this->username() => '账号未审核或已被禁用', + ]); + } + return $login_result; + } } diff --git a/app/AdminGuide/routes.php b/app/AdminGuide/routes.php index 317bdfe..e5db293 100644 --- a/app/AdminGuide/routes.php +++ b/app/AdminGuide/routes.php @@ -13,5 +13,7 @@ Route::group([ ], function (Router $router) { $router->get('/', 'HomeController@index'); + $router->post('auth/login', 'AuthController@postLogin'); + $router->resource('order/list', 'OrderController'); }); diff --git a/app/AdminSettled/routes.php b/app/AdminSettled/routes.php index 577d201..0c44a85 100644 --- a/app/AdminSettled/routes.php +++ b/app/AdminSettled/routes.php @@ -10,7 +10,9 @@ Route::group([ 'prefix' => config('admin.route.prefix'), 'namespace' => config('admin.route.namespace'), ], function (Router $router) { - $router->resource('/', 'SupplierController'); + $router->redirect('/', admin_url('supplier/create')); + $router->redirect('auth/login', admin_url('supplier/create')); + $router->resource('supplier', 'SupplierController'); $router->resource('agent', 'AgentController'); $router->resource('guide', 'GuideController'); diff --git a/app/AdminSupplier/Controllers/AuthController.php b/app/AdminSupplier/Controllers/AuthController.php index 58ece43..cd8e45e 100644 --- a/app/AdminSupplier/Controllers/AuthController.php +++ b/app/AdminSupplier/Controllers/AuthController.php @@ -2,8 +2,22 @@ namespace App\AdminSupplier\Controllers; +use App\Common\UserStatus; use Dcat\Admin\Http\Controllers\AuthController as BaseAuthController; +use Illuminate\Http\Request; class AuthController extends BaseAuthController { + public function postLogin(Request $request) + { + $login_result = parent::postLogin($request); + if ($login_result->isOk() && $this->guard()->getUser()->status != UserStatus::NORMAL) { + $this->guard()->logout(); //必须加这句,否则还是登录成功 + $request->session()->invalidate(); + return $this->validationErrorsResponse([ + $this->username() => '账号未审核或已被禁用', + ]); + } + return $login_result; + } } diff --git a/app/AdminSupplier/routes.php b/app/AdminSupplier/routes.php index 577cef1..40df52a 100644 --- a/app/AdminSupplier/routes.php +++ b/app/AdminSupplier/routes.php @@ -13,6 +13,7 @@ Route::group([ ], function (Router $router) { $router->get('/', 'HomeController@index'); + $router->post('auth/login', 'AuthController@postLogin'); $router->resource('product/list', 'ProductController'); $router->resource('order/list', 'OrderController'); diff --git a/config/admin-settled.php b/config/admin-settled.php index e818c61..ab921f3 100644 --- a/config/admin-settled.php +++ b/config/admin-settled.php @@ -86,7 +86,7 @@ return [ | Html title for all pages. | */ - 'title' => 'Admin', + 'title' => '商家入驻', /* |--------------------------------------------------------------------------