@@ -100,7 +100,7 @@ |
||
| 100 | 100 | * |
| 101 | 101 | * @param Request $request |
| 102 | 102 | * |
| 103 | - * @return \Illuminate\Http\Response |
|
| 103 | + * @return \Illuminate\Http\RedirectResponse |
|
| 104 | 104 | */ |
| 105 | 105 | public function logout(Request $request) |
| 106 | 106 | { |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | /** |
| 35 | 35 | * 菜单列表 |
| 36 | 36 | * |
| 37 | - * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View |
|
| 37 | + * @return \Illuminate\Http\JsonResponse |
|
| 38 | 38 | */ |
| 39 | 39 | public function getList() |
| 40 | 40 | { |
@@ -136,6 +136,9 @@ discard block |
||
| 136 | 136 | } |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | + /** |
|
| 140 | + * @param \Illuminate\Http\Request $request |
|
| 141 | + */ |
|
| 139 | 142 | protected function isAdmin($request) |
| 140 | 143 | { |
| 141 | 144 | $route = $request->route(); |
@@ -146,7 +149,7 @@ discard block |
||
| 146 | 149 | * @param \Illuminate\Http\Request $request |
| 147 | 150 | * @param \Sco\Admin\Exceptions\AdminException $exception |
| 148 | 151 | * |
| 149 | - * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response |
|
| 152 | + * @return \Symfony\Component\HttpFoundation\Response|null |
|
| 150 | 153 | */ |
| 151 | 154 | protected function renderAdminException($request, AdminException $exception) |
| 152 | 155 | { |
@@ -27,6 +27,10 @@ |
||
| 27 | 27 | //$this->storePermission('admin.system.menu', '菜单'); |
| 28 | 28 | } |
| 29 | 29 | |
| 30 | + /** |
|
| 31 | + * @param string $name |
|
| 32 | + * @param string $displayName |
|
| 33 | + */ |
|
| 30 | 34 | private function storePermission($name, $displayName, $description = '') |
| 31 | 35 | { |
| 32 | 36 | $permissionModelName = config('entrust.permission'); |