panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf: 优化saenv、config配置

Browse Source
This commit is contained in:
Ying
2022-09-01 18:38:42 +08:00
parent 3b4eb2c222
commit f6aee95cfc
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/common/model/system/Config.php
View File

@@ -36,11 +36,18 @@ class Config extends Model
*/ */
public static function all(string $name = '', bool $group = false): array public static function all(string $name = '', bool $group = false): array
{ {
$where = [];
$config = []; $config = [];
$where = $group ? ['group' => $name] : [];
if (!empty($name) && $group) {
$where[] = ['group', '=', $name];
} else {
if (!empty($name)) {
$where[] = ['name', '=', $name];
}
}
$list = self::where($where)->select()->toArray(); $list = self::where($where)->select()->toArray();
foreach ($list as $option) { foreach ($list as $option) {
if (!is_empty($option['type']) && 'array' == trim($option['type'])) { if (!is_empty($option['type']) && 'array' == trim($option['type'])) {
$config[$option['name']] = json_decode($option['value'], true); $config[$option['name']] = json_decode($option['value'], true);

10
app/functions.php
View File

@@ -582,21 +582,21 @@ if (!function_exists('saenv')) {
{ {
$redis = 'config_' . $name; $redis = 'config_' . $name;
$config = Cache::get($redis); $config = Cache::get($redis);
try { try {
$configList = Cache::get('config_list') ?? []; $configList = Cache::get('config_list') ?? [];
if (empty($config)) { if (empty($config)) {
$config = $group ? Config::all($name, true) : Config::where('name', $name)->value('value'); $config = Config::all($name, $group);
if (!empty($config)) { if (!empty($config)) {
// 是否开启分组查询
if (empty($group)) {
$config = $config[$name];
}
$configList[$name] = $redis; $configList[$name] = $redis;
Cache::set($redis, $config); Cache::set($redis, $config);
Cache::set('config_list', $configList); Cache::set('config_list', $configList);
} }
} }
} catch (\Exception $e) {} } catch (\Exception $e) {}
return $config; return $config;
} }
} }