github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-03-25 06:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

调整代码逻辑

Browse Source
This commit is contained in:
kuaifan 2022-07-14 12:17:41 +08:00
parent b24eca0c5b
commit 26d0d07850
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Api/SystemController.php
View File

@ -109,13 +109,14 @@ class SystemController extends AbstractController
*/ */
public function setting__email() public function setting__email()
{ {
$user = User::auth();
// //
$type = trim(Request::input('type')); $type = trim(Request::input('type'));
if ($type == 'save') { if ($type == 'save') {
User::auth('admin');
if (env("SYSTEM_SETTING") == 'disabled') { if (env("SYSTEM_SETTING") == 'disabled') {
return Base::retError('当前环境禁止修改'); return Base::retError('当前环境禁止修改');
} }
$user->identity('admin');
$all = Request::input(); $all = Request::input();
foreach ($all as $key => $value) { foreach ($all as $key => $value) {
if (!in_array($key, [ if (!in_array($key, [
@ -138,7 +139,6 @@ class SystemController extends AbstractController
} }
$setting = Base::setting('emailSetting', Base::newTrim($all)); $setting = Base::setting('emailSetting', Base::newTrim($all));
} else { } else {
User::auth();
$setting = Base::setting('emailSetting'); $setting = Base::setting('emailSetting');
} }
// //
@ -156,6 +156,10 @@ class SystemController extends AbstractController
$setting['msg_unread_group_minute'] = intval($setting['msg_unread_group_minute'] ?? -1); $setting['msg_unread_group_minute'] = intval($setting['msg_unread_group_minute'] ?? -1);
$setting['ignore_addr'] = $setting['ignore_addr'] ?: ''; $setting['ignore_addr'] = $setting['ignore_addr'] ?: '';
// //
if ($type != 'save' && !in_array('admin', $user->identity)) {
$setting = array_intersect_key($setting, array_flip(['reg_verify']));
}
//
return Base::retSuccess('success', $setting ?: json_decode('{}')); return Base::retSuccess('success', $setting ?: json_decode('{}'));
} }

6
app/Http/Controllers/Api/UsersController.php
View File

@ -1043,9 +1043,6 @@ class UsersController extends AbstractController
public function email__edit() public function email__edit()
{ {
$user = User::auth(); $user = User::auth();
if (env("SYSTEM_SETTING") == 'disabled') {
return Base::retError('当前环境禁止修改');
}
// //
$user->checkSystem(); $user->checkSystem();
// //
@ -1092,9 +1089,6 @@ class UsersController extends AbstractController
public function delete__account() public function delete__account()
{ {
$user = User::auth(); $user = User::auth();
if (env("SYSTEM_SETTING") == 'disabled') {
return Base::retError('当前环境禁止删除');
}
// //
$user->checkSystem(1); $user->checkSystem(1);
// //