@@ -3,10 +3,10 @@ |
||
3 | 3 | namespace Sco\Admin\Http\Controllers\Auth; |
4 | 4 | |
5 | 5 | use Auth; |
6 | +use Illuminate\Foundation\Auth\AuthenticatesUsers; |
|
6 | 7 | use Illuminate\Foundation\Validation\ValidatesRequests; |
7 | 8 | use Illuminate\Http\Request; |
8 | 9 | use Illuminate\Routing\Controller; |
9 | -use Illuminate\Foundation\Auth\AuthenticatesUsers; |
|
10 | 10 | |
11 | 11 | class LoginController extends Controller |
12 | 12 | { |
@@ -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 | { |
@@ -11,8 +11,8 @@ |
||
11 | 11 | */ |
12 | 12 | |
13 | 13 | use Illuminate\Cache\TaggableStore; |
14 | -use Illuminate\Support\Facades\Config; |
|
15 | 14 | use Illuminate\Support\Facades\Cache; |
15 | +use Illuminate\Support\Facades\Config; |
|
16 | 16 | |
17 | 17 | trait EntrustRoleTrait |
18 | 18 | { |
@@ -3,9 +3,6 @@ |
||
3 | 3 | namespace Sco\Admin\Console; |
4 | 4 | |
5 | 5 | use Illuminate\Console\Command; |
6 | -use Symfony\Component\Process\Exception\ProcessFailedException; |
|
7 | -use Symfony\Component\Process\ExecutableFinder; |
|
8 | -use Symfony\Component\Process\Process; |
|
9 | 6 | |
10 | 7 | class InstallCommand extends Command |
11 | 8 | { |
@@ -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 | { |
@@ -5,7 +5,6 @@ |
||
5 | 5 | use Illuminate\Http\Request; |
6 | 6 | use Illuminate\Routing\Controller; |
7 | 7 | use Sco\Admin\Http\Requests\StorePermissionRequest; |
8 | -use Sco\Admin\Http\Requests\PermissionRequest; |
|
9 | 8 | use Sco\Admin\Http\Requests\UpdatePermissionRequest; |
10 | 9 | use Sco\Admin\Models\Permission; |
11 | 10 |
@@ -11,7 +11,6 @@ |
||
11 | 11 | */ |
12 | 12 | |
13 | 13 | use Illuminate\Support\Facades\Config; |
14 | -use Sco\Admin\Models\Role; |
|
15 | 14 | |
16 | 15 | trait EntrustPermissionTrait |
17 | 16 | { |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Sco\Admin\Models; |
4 | 4 | |
5 | -use DB; |
|
6 | 5 | use Cache; |
6 | +use DB; |
|
7 | 7 | use Illuminate\Database\Eloquent\Model; |
8 | 8 | use Illuminate\Database\Eloquent\ModelNotFoundException; |
9 | 9 | use Sco\Admin\Observers\PermissionObserver; |
@@ -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('admin.permission'); |
@@ -3,9 +3,9 @@ |
||
3 | 3 | |
4 | 4 | namespace Sco\Admin\Column; |
5 | 5 | |
6 | -use JsonSerializable; |
|
7 | 6 | use Illuminate\Contracts\Support\Arrayable; |
8 | 7 | use Illuminate\Contracts\Support\Jsonable; |
8 | +use JsonSerializable; |
|
9 | 9 | use Sco\Admin\Contracts\Column\Columns as ColumnsContract; |
10 | 10 | use Sco\Attributes\HasAttributesTrait; |
11 | 11 |