diff --git a/catchAdmin/user/controller/User.php b/catchAdmin/user/controller/User.php index 0f570ca..eb19109 100644 --- a/catchAdmin/user/controller/User.php +++ b/catchAdmin/user/controller/User.php @@ -8,6 +8,7 @@ use catchAdmin\user\request\UpdateRequest; use catcher\base\BaseController; use catcher\CatchForm; use catcher\CatchResponse; +use think\response\Json; class User extends BaseController { @@ -60,7 +61,7 @@ class User extends BaseController * * @param CreateRequest $request * @time 2019年12月06日 - * @return \think\response\Json + * @return Json */ public function save(CreateRequest $request) { @@ -71,13 +72,18 @@ class User extends BaseController * * @time 2019年12月04日 * @param $id - * @return \think\response\Json + * @return Json */ public function read($id) { return CatchResponse::success($this->user->findBy($id)); } + /** + * @param $id + * @return string + * @throws \Exception + */ public function edit($id) { $user = $this->user->findBy($id, ['id','username', 'email']); @@ -101,7 +107,7 @@ class User extends BaseController * @time 2019年12月04日 * @param $id * @param UpdateRequest $request - * @return \think\response\Json + * @return Json */ public function update($id, UpdateRequest $request) { @@ -112,7 +118,7 @@ class User extends BaseController * * @time 2019年12月04日 * @param $id - * @return \think\response\Json + * @return Json */ public function delete($id) { @@ -123,9 +129,9 @@ class User extends BaseController * * @time 2019年12月07日 * @param $id - * @return \think\response\Json + * @return Json */ - public function switchStatus($id): \think\response\Json + public function switchStatus($id): Json { $user = $this->user->findBy($id); return CatchResponse::success($this->user->updateBy($id, [ @@ -137,12 +143,12 @@ class User extends BaseController * * @time 2019年12月07日 * @param $id - * @return \think\response\Json + * @return Json * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException * @throws \think\db\exception\DataNotFoundException */ - public function recover($id): \think\response\Json + public function recover($id): Json { $trashedUser = $this->user->findBy($id, ['*'], true); diff --git a/catchAdmin/user/view/create.html b/catchAdmin/user/view/create.html index 0f2bdb1..7bdb3fb 100644 --- a/catchAdmin/user/view/create.html +++ b/catchAdmin/user/view/create.html @@ -14,7 +14,7 @@ form.on('submit(submitUser)', function (data) { var url = mUser ? '{:url("user")}' : '{:url("user")}'; $.post(url, data.field, function (response) { layer.closeAll('loading'); - if (response.code == 10000) { + if (response.code === 10000) { layer.msg(response.msg, {icon: 1}); admin.putLayerData('formOk', true, '#userForm'); // 设置操作成功的标识,#modelUserForm这个只要写弹窗内任意一个元素的id即可 admin.closeDialog('#userForm'); // 关闭页面层弹窗 diff --git a/extend/catcher/command/InstallCommand.php b/extend/catcher/command/InstallCommand.php index 8fb5f5c..15c555e 100644 --- a/extend/catcher/command/InstallCommand.php +++ b/extend/catcher/command/InstallCommand.php @@ -97,9 +97,9 @@ class InstallCommand extends Command * 安装第一步 * * @time 2019年11月29日 - * @return bool + * @return mixed */ - protected function firstStep(): bool + protected function firstStep() { if (file_exists($this->app->getRootPath() . '.env')) { return false;