From b39f059c0fcbb9d2c2ddb5546d2b246e9d22e5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Thu, 17 Feb 2022 14:38:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Services/SettingService.php | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/app/Services/SettingService.php b/app/Services/SettingService.php
index d75724d3..aefc0b5d 100644
--- a/app/Services/SettingService.php
+++ b/app/Services/SettingService.php
@@ -9,11 +9,6 @@ use Illuminate\Support\Arr;
 
 class SettingService
 {
-    /**
-     * @var array
-     */
-    protected $items = [];
-
     /**
      * @var integer
      */
@@ -40,19 +35,17 @@ class SettingService
 
         $_key = $this->getSettingKey($key);
 
-        if (! array_key_exists($_key, $this->items)) {
-            try {
-                $this->items[$_key] = $this->cache->remember($this->cacheKey($_key), $this->ttl, function () use ($_key) {
-                    $settings = Setting::where('key', $_key)->firstOrFail();
+        try {
+            $settings[$_key] = $this->cache->remember($this->cacheKey($_key), $this->ttl, function () use ($_key) {
+                $setting = Setting::where('key', $_key)->firstOrFail();
 
-                    return $settings->value;
-                });
-            } catch (ModelNotFoundException $e) {
-                return $default;
-            }
+                return $setting->value;
+            });
+        } catch (ModelNotFoundException $e) {
+            return $default;
         }
 
-        return Arr::get($this->items, $key, $default);
+        return Arr::get($settings, $key, $default);
     }
 
     /**
@@ -110,7 +103,6 @@ class SettingService
     public function cleanCache(string $key): void
     {
         $_key = $this->getSettingKey($key);
-        unset($this->items[$_key]);
 
         $this->cache->forget($this->cacheKey($_key));
     }