mirror of
https://github.com/lkddi/Xboard.git
synced 2026-04-14 19:40:53 +08:00
feat: optimize settings management and admin functionality
- Add system log cleanup functionality with batch processing - Optimize v2_settings table performance by unifying value storage - Add comprehensive client support list for one-click subscription - Fix QR code subscription links for specific node types - Fix route addition issues in admin management panel - Enhance admin system controller with log management APIs
This commit is contained in:
@@ -5,17 +5,32 @@ namespace App\Support;
|
||||
use App\Models\Setting as SettingModel;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Fluent;
|
||||
|
||||
class Setting
|
||||
{
|
||||
const CACHE_KEY = 'admin_settings';
|
||||
|
||||
private $cache;
|
||||
public function __construct()
|
||||
private static $instance = null;
|
||||
private static $inMemoryCache = null;
|
||||
private static $cacheLoaded = false;
|
||||
|
||||
private function __construct()
|
||||
{
|
||||
$this->cache = Cache::store('redis');
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单例实例
|
||||
*/
|
||||
public static function getInstance(): self
|
||||
{
|
||||
if (self::$instance === null) {
|
||||
self::$instance = new self();
|
||||
}
|
||||
return self::$instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取配置.
|
||||
*
|
||||
@@ -26,7 +41,28 @@ class Setting
|
||||
public function get($key, $default = null)
|
||||
{
|
||||
$key = strtolower($key);
|
||||
return Arr::get($this->fromDatabase(), $key, $default);
|
||||
return Arr::get($this->getInMemoryCache(), $key, $default);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取内存缓存数据
|
||||
*/
|
||||
private function getInMemoryCache(): array
|
||||
{
|
||||
if (!self::$cacheLoaded) {
|
||||
self::$inMemoryCache = $this->fromDatabase();
|
||||
self::$cacheLoaded = true;
|
||||
}
|
||||
return self::$inMemoryCache ?? [];
|
||||
}
|
||||
|
||||
/**
|
||||
* 清除内存缓存
|
||||
*/
|
||||
public static function clearInMemoryCache(): void
|
||||
{
|
||||
self::$inMemoryCache = null;
|
||||
self::$cacheLoaded = false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -38,16 +74,16 @@ class Setting
|
||||
*/
|
||||
public function set(string $key, $value = null): bool
|
||||
{
|
||||
if (is_array($value)) {
|
||||
$value = json_encode($value);
|
||||
}
|
||||
$key = strtolower($key);
|
||||
SettingModel::updateOrCreate(['name' => $key], ['value' => $value]);
|
||||
SettingModel::createOrUpdate($key, $value);
|
||||
$this->cache->forget(self::CACHE_KEY);
|
||||
|
||||
// 清除内存缓存,下次访问时重新加载
|
||||
self::clearInMemoryCache();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 保存配置到数据库.
|
||||
*
|
||||
@@ -57,8 +93,13 @@ class Setting
|
||||
public function save(array $settings): bool
|
||||
{
|
||||
foreach ($settings as $key => $value) {
|
||||
$this->set($key, $value);
|
||||
$key = strtolower($key);
|
||||
SettingModel::createOrUpdate($key, $value);
|
||||
}
|
||||
|
||||
// 批量更新后清除缓存
|
||||
$this->cache->forget(self::CACHE_KEY);
|
||||
self::clearInMemoryCache();
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -73,6 +114,7 @@ class Setting
|
||||
{
|
||||
SettingModel::where('name', $key)->delete();
|
||||
$this->cache->forget(self::CACHE_KEY);
|
||||
self::clearInMemoryCache();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -83,9 +125,25 @@ class Setting
|
||||
public function fromDatabase(): array
|
||||
{
|
||||
try {
|
||||
return $this->cache->rememberForever(self::CACHE_KEY, function (): array {
|
||||
return array_change_key_case(SettingModel::pluck('value', 'name')->toArray(), CASE_LOWER);
|
||||
// 统一从 value 字段获取所有配置
|
||||
$settings = $this->cache->rememberForever(self::CACHE_KEY, function (): array {
|
||||
return array_change_key_case(
|
||||
SettingModel::pluck('value', 'name')->toArray(),
|
||||
CASE_LOWER
|
||||
);
|
||||
});
|
||||
|
||||
// 处理JSON格式的值
|
||||
foreach ($settings as $key => $value) {
|
||||
if (is_string($value) && $value !== null) {
|
||||
$decoded = json_decode($value, true);
|
||||
if (json_last_error() === JSON_ERROR_NONE) {
|
||||
$settings[$key] = $decoded;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $settings;
|
||||
} catch (\Throwable $th) {
|
||||
return [];
|
||||
}
|
||||
@@ -98,7 +156,7 @@ class Setting
|
||||
*/
|
||||
public function toArray(): array
|
||||
{
|
||||
return $this->fromDatabase();
|
||||
return $this->getInMemoryCache();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -110,12 +168,34 @@ class Setting
|
||||
*/
|
||||
public function update(string $key, $value): bool
|
||||
{
|
||||
if (is_array($value)) {
|
||||
$value = json_encode($value);
|
||||
return $this->set($key, $value);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量获取配置项,优化多个配置项获取的性能
|
||||
*
|
||||
* @param array $keys 配置键名数组,格式:['key1', 'key2' => 'default_value', ...]
|
||||
* @return array 返回键值对数组
|
||||
*/
|
||||
public function getBatch(array $keys): array
|
||||
{
|
||||
$cache = $this->getInMemoryCache();
|
||||
$result = [];
|
||||
|
||||
foreach ($keys as $index => $item) {
|
||||
if (is_numeric(value: $index)) {
|
||||
// 格式:['key1', 'key2']
|
||||
$key = strtolower($item);
|
||||
$default = config('v2board.'. $item);
|
||||
$result[$item] = Arr::get($cache, $key, $default);
|
||||
} else {
|
||||
// 格式:['key1' => 'default_value']
|
||||
$key = strtolower($index);
|
||||
$default = config('v2board.'. $index) ?? $item;
|
||||
$result[$index] = Arr::get($cache, $key, $default);
|
||||
}
|
||||
}
|
||||
$key = strtolower($key);
|
||||
SettingModel::updateOrCreate(['name' => $key], ['value' => $value]);
|
||||
$this->cache->forget(self::CACHE_KEY);
|
||||
return true;
|
||||
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user