diff --git a/src/plugin/admin/app/common/LayuiForm.php b/src/plugin/admin/app/common/LayuiForm.php index 4bd4c84..f4a9fec 100644 --- a/src/plugin/admin/app/common/LayuiForm.php +++ b/src/plugin/admin/app/common/LayuiForm.php @@ -454,7 +454,7 @@ EOF; } /** - * swtich组件 + * switch组件 * @param $options * @return void */ diff --git a/src/plugin/admin/app/controller/AccountController.php b/src/plugin/admin/app/controller/AccountController.php index 2fb1803..fc36a34 100644 --- a/src/plugin/admin/app/controller/AccountController.php +++ b/src/plugin/admin/app/controller/AccountController.php @@ -95,7 +95,6 @@ class AccountController extends Crud return $this->json(0); } - /** * 获取登录信息 * @param Request $request @@ -123,7 +122,6 @@ class AccountController extends Crud /** * 更新 - * * @param Request $request * @return Response */ @@ -196,7 +194,6 @@ class AccountController extends Crud /** * 检查登录频率限制 - * * @param $username * @return void * @throws BusinessException @@ -229,7 +226,6 @@ class AccountController extends Crud } } - /** * 解除登录频率限制 * @param $username diff --git a/src/plugin/admin/app/controller/AdminController.php b/src/plugin/admin/app/controller/AdminController.php index a6d4166..de23b36 100644 --- a/src/plugin/admin/app/controller/AdminController.php +++ b/src/plugin/admin/app/controller/AdminController.php @@ -2,8 +2,6 @@ namespace plugin\admin\app\controller; -use plugin\admin\app\controller\Base; -use plugin\admin\app\controller\Crud; use plugin\admin\app\model\Admin; use support\exception\BusinessException; use support\Request; diff --git a/src/plugin/admin/app/controller/AdminRoleController.php b/src/plugin/admin/app/controller/AdminRoleController.php index 9d9ed6a..9060cce 100644 --- a/src/plugin/admin/app/controller/AdminRoleController.php +++ b/src/plugin/admin/app/controller/AdminRoleController.php @@ -59,7 +59,7 @@ class AdminRoleController extends Crud return view("admin-role/update"); } [$id, $data] = $this->updateInput($request); - // 管理员id为1的用户权限固定为* + // id为1的管理员权限固定为* if (isset($data['rules']) && $id == 1) { $data['rules'] = '*'; } diff --git a/src/plugin/admin/app/controller/AdminRuleController.php b/src/plugin/admin/app/controller/AdminRuleController.php index 92ff4da..4f50907 100644 --- a/src/plugin/admin/app/controller/AdminRuleController.php +++ b/src/plugin/admin/app/controller/AdminRuleController.php @@ -2,8 +2,6 @@ namespace plugin\admin\app\controller; -use Doctrine\Inflector\InflectorFactory; -use plugin\admin\app\common\LayuiForm; use plugin\admin\app\common\Util; use plugin\admin\app\model\AdminRole; use plugin\admin\app\model\AdminRule; @@ -28,7 +26,6 @@ class AdminRuleController extends Crud */ protected $model = null; - /** * 构造函数 */ diff --git a/src/plugin/admin/app/controller/Base.php b/src/plugin/admin/app/controller/Base.php index 06c6810..e620d6a 100644 --- a/src/plugin/admin/app/controller/Base.php +++ b/src/plugin/admin/app/controller/Base.php @@ -4,7 +4,6 @@ namespace plugin\admin\app\controller; use support\Model; use support\Response; -use function json; /** * 基础控制器 diff --git a/src/plugin/admin/app/controller/Crud.php b/src/plugin/admin/app/controller/Crud.php index 78017e8..d46b8c5 100644 --- a/src/plugin/admin/app/controller/Crud.php +++ b/src/plugin/admin/app/controller/Crud.php @@ -2,6 +2,8 @@ namespace plugin\admin\app\controller; +use Illuminate\Database\Eloquent\Builder as EloquentBuilder; +use Illuminate\Database\Query\Builder as QueryBuilder; use plugin\admin\app\common\Util; use support\exception\BusinessException; use support\Model; @@ -16,7 +18,6 @@ class Crud extends Base */ protected $model = null; - /** * 查询 * @param Request $request @@ -126,7 +127,7 @@ class Crud extends Base * @param array $where * @param string|null $field * @param string $order - * @return \Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Query\Builder|Model + * @return EloquentBuilder|QueryBuilder|Model */ protected function doSelect(array $where, string $field = null, string $order= 'desc') { @@ -253,7 +254,7 @@ class Crud extends Base * @return array * @throws BusinessException */ - protected function inputFilter(array $data) + protected function inputFilter(array $data): array { $table = $this->model->getTable(); $allow_column = Util::db()->select("desc `$table`");