@@ -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 | { |
@@ -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\Http\Request; |
| 9 | 9 | use Sco\Admin\Exceptions\AdminHttpException; |
@@ -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 | { |
@@ -65,6 +65,10 @@ |
||
| 65 | 65 | $roleEdit->id, 0, '', '用于编辑角色时获取数据'); |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | + /** |
|
| 69 | + * @param string $name |
|
| 70 | + * @param string $displayName |
|
| 71 | + */ |
|
| 68 | 72 | private function insertPerm( |
| 69 | 73 | $name, $displayName, $pid, $isMenu = 0, $icon = '', $description = '' |
| 70 | 74 | ) { |
@@ -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 | { |
@@ -4,8 +4,8 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Http\Request; |
| 6 | 6 | use Illuminate\Routing\Controller; |
| 7 | -use Sco\Admin\Http\Requests\StorePermissionRequest; |
|
| 8 | 7 | use Sco\Admin\Http\Requests\PermissionRequest; |
| 8 | +use Sco\Admin\Http\Requests\StorePermissionRequest; |
|
| 9 | 9 | use Sco\Admin\Http\Requests\UpdatePermissionRequest; |
| 10 | 10 | use Sco\Admin\Models\Permission; |
| 11 | 11 | |
@@ -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 | { |