From 26d0d0785025197104d6cce512307bf8ff6374d4 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 14 Jul 2022 12:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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