From 16ac8d6b06376bfbc195c65cca6e84eff8af4e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A6=E8=8D=A3=E8=B6=85?= <302645122@qq.com>
Date: Thu, 14 Jul 2022 11:01:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9/=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=8E=A5=E5=8F=A3=E6=97=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=EF=BC=9B=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?env=E6=96=87=E4=BB=B6'SYSTEM=5FSETTING'=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E8=83=BD=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?/=E5=88=A0=E9=99=A4=E8=B4=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/SystemController.php | 3 ++-
 app/Http/Controllers/Api/UsersController.php  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Api/SystemController.php b/app/Http/Controllers/Api/SystemController.php
index 1b38b15e8..596f68c1f 100755
--- a/app/Http/Controllers/Api/SystemController.php
+++ b/app/Http/Controllers/Api/SystemController.php
@@ -109,10 +109,10 @@ class SystemController extends AbstractController
      */
     public function setting__email()
     {
-        User::auth('admin');
         //
         $type = trim(Request::input('type'));
         if ($type == 'save') {
+            User::auth('admin');
             if (env("SYSTEM_SETTING") == 'disabled') {
                 return Base::retError('当前环境禁止修改');
             }
@@ -138,6 +138,7 @@ class SystemController extends AbstractController
             }
             $setting = Base::setting('emailSetting', Base::newTrim($all));
         } else {
+            User::auth();
             $setting = Base::setting('emailSetting');
         }
         //
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index f98dc1a71..d6870f582 100755
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -1043,6 +1043,9 @@ class UsersController extends AbstractController
     public function email__edit()
     {
         $user = User::auth();
+        if (env("SYSTEM_SETTING") == 'disabled') {
+            return Base::retError('当前环境禁止修改');
+        }
         //
         $user->checkSystem();
         //
@@ -1089,6 +1092,9 @@ class UsersController extends AbstractController
     public function delete__account()
     {
         $user = User::auth();
+        if (env("SYSTEM_SETTING") == 'disabled') {
+            return Base::retError('当前环境禁止删除');
+        }
         //
         $user->checkSystem(1);
         //