diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 935ec4fd..399ab49b 100755 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -210,6 +210,7 @@ class UsersController extends AbstractController { $user = User::auth(); $data = Request::all(); + $user->checkSystem(1); //头像 if (Arr::exists($data, 'userimg')) { $userimg = Request::input('userimg'); @@ -267,6 +268,7 @@ class UsersController extends AbstractController public function editpass() { $user = User::auth(); + $user->checkSystem(); // $oldpass = trim(Request::input('oldpass')); $newpass = trim(Request::input('newpass')); @@ -279,15 +281,6 @@ class UsersController extends AbstractController return Base::retError('新旧密码一致'); } // - if (env("PASSWORD_ADMIN") == 'disabled') { - if ($user->userid == 1) { - return Base::retError('当前环境禁止修改密码'); - } - } - if (env("PASSWORD_OWNER") == 'disabled') { - return Base::retError('当前环境禁止修改密码'); - } - // $verify = User::whereUserid($user->userid)->wherePassword(Base::md52($oldpass, User::token2encrypt()))->count(); if (empty($verify)) { return Base::retError('请填写正确的旧密码'); @@ -462,6 +455,7 @@ class UsersController extends AbstractController if (empty($userInfo)) { return Base::retError('会员不存在或已被删除'); } + $userInfo->checkSystem(1); // $upArray = []; switch ($type) { diff --git a/app/Models/User.php b/app/Models/User.php index 607a6526..d37ea3c2 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -145,6 +145,24 @@ class User extends AbstractModel } } + /** + * 检查环境是否允许 + * @param null $onlyUserid 仅指定会员 + */ + public function checkSystem($onlyUserid = null) + { + if ($onlyUserid && $onlyUserid != $this->userid) { + return; + } + if (env("PASSWORD_ADMIN") == 'disabled') { + if ($this->userid == 1) { + throw new ApiException('当前环境禁止此操作'); + } + } + if (env("PASSWORD_OWNER") == 'disabled') { + throw new ApiException('当前环境禁止此操作'); + } + } /** ***************************************************************************************** */ /** ***************************************************************************************** */ diff --git a/resources/assets/js/pages/manage/components/DialogView.vue b/resources/assets/js/pages/manage/components/DialogView.vue index 069a85c0..6bfb7d64 100644 --- a/resources/assets/js/pages/manage/components/DialogView.vue +++ b/resources/assets/js/pages/manage/components/DialogView.vue @@ -124,6 +124,8 @@ export default { }, }).then(({data}) => { this.read_list = data; + }).catch(() => { + this.read_list = []; }); }, diff --git a/resources/assets/js/pages/manage/dashboard.vue b/resources/assets/js/pages/manage/dashboard.vue index a787abb0..ef08ecad 100644 --- a/resources/assets/js/pages/manage/dashboard.vue +++ b/resources/assets/js/pages/manage/dashboard.vue @@ -219,6 +219,8 @@ export default { url: 'system/get/appinfo', }).then(({data}) => { this.downList = data.list; + }).catch(() => { + this.downList = []; }); },