From 277115a30f15e9a06b9e63bf361965e9878cb664 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 7 Mar 2024 15:53:31 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/UserBot.php     |  5 +++--
 app/Tasks/JokeSoupTask.php | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/Models/UserBot.php b/app/Models/UserBot.php
index bd6a560a1..8a463187c 100644
--- a/app/Models/UserBot.php
+++ b/app/Models/UserBot.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use App\Module\Base;
 use App\Module\Doo;
 use App\Module\Extranet;
+use App\Tasks\JokeSoupTask;
 use Cache;
 use Carbon\Carbon;
 
@@ -229,8 +230,8 @@ class UserBot extends AbstractModel
         if ($checkins && $botUser = User::botGetOrCreate('check-in')) {
             $getJokeSoup = function($type) {
                 $pre = $type == "up" ? "每日开心：" : "心灵鸡汤：";
-                $key = $type == "up" ? "JokeSoupTask:jokes" : "JokeSoupTask:soups";
-                $array = Base::json2array(Cache::get($key));
+                $key = $type == "up" ? "jokes" : "soups";
+                $array = Base::json2array(Cache::get(JokeSoupTask::keyName($key)));
                 if ($array) {
                     $item = $array[array_rand($array)];
                     if ($item) {
diff --git a/app/Tasks/JokeSoupTask.php b/app/Tasks/JokeSoupTask.php
index 4967b210d..9764d2e97 100644
--- a/app/Tasks/JokeSoupTask.php
+++ b/app/Tasks/JokeSoupTask.php
@@ -17,7 +17,10 @@ use Carbon\Carbon;
  */
 class JokeSoupTask extends AbstractTask
 {
-    private $keyPrefix = "JokeSoupTask-v2";
+    public static function keyName($key)
+    {
+        return "JokeSoupTask-v2:{$key}";
+    }
 
     public function __construct()
     {
@@ -27,24 +30,24 @@ class JokeSoupTask extends AbstractTask
     public function start()
     {
         // 判断每分钟执行一次
-        if (Cache::get("{$this->keyPrefix}:YmdHi") == date("YmdHi")) {
+        if (Cache::get(self::keyName("YmdHi")) == date("YmdHi")) {
             return;
         }
-        Cache::put("{$this->keyPrefix}:YmdHi", date("YmdHi"), Carbon::now()->addDay());
+        Cache::put(self::keyName("YmdHi"), date("YmdHi"), Carbon::now()->addDay());
         //
-        $array = Base::json2array(Cache::get("{$this->keyPrefix}:jokes"));
+        $array = Base::json2array(Cache::get(self::keyName("jokes")));
         $data = Extranet::randJoke();
         if ($data) {
             $array[] = $data;
         }
-        Cache::forever("{$this->keyPrefix}:jokes", Base::array2json(array_slice($array, -200)));
+        Cache::forever(self::keyName("jokes"), Base::array2json(array_slice($array, -200)));
         //
-        $array = Base::json2array(Cache::get("{$this->keyPrefix}:soups"));
+        $array = Base::json2array(Cache::get(self::keyName("soups")));
         $data = Extranet::soups();
         if ($data) {
             $array[] = $data;
         }
-        Cache::forever("{$this->keyPrefix}:soups", Base::array2json(array_slice($array, -200)));
+        Cache::forever(self::keyName("soups"), Base::array2json(array_slice($array, -200)));
     }
 
     public function end()