mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
ComposerUpdate
This commit is contained in:
parent
8501669f50
commit
39dcd2a4e4
8
vendor/composer/installed.json
vendored
8
vendor/composer/installed.json
vendored
@ -401,12 +401,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "9b520cd35b4c7e9da6b928def3c5ec779e67bc0f"
|
||||
"reference": "8821ce7703baafc18f32668cf949e803e8c19904"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/9b520cd35b4c7e9da6b928def3c5ec779e67bc0f",
|
||||
"reference": "9b520cd35b4c7e9da6b928def3c5ec779e67bc0f",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8821ce7703baafc18f32668cf949e803e8c19904",
|
||||
"reference": "8821ce7703baafc18f32668cf949e803e8c19904",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -426,7 +426,7 @@
|
||||
"qiniu/php-sdk": "^7.2",
|
||||
"topthink/framework": "5.1.*"
|
||||
},
|
||||
"time": "2019-11-28T08:41:39+00:00",
|
||||
"time": "2019-11-28T09:08:14+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
|
@ -86,10 +86,14 @@ class SystemService extends Service
|
||||
* @param mixed $default 默认值
|
||||
* @return mixed
|
||||
*/
|
||||
public function getData($name, $default = null)
|
||||
public function getData($name, $default = [])
|
||||
{
|
||||
$value = Db::name('SystemData')->where(['name' => $name])->value('value');
|
||||
return empty($value) ? $default : unserialize($value);
|
||||
try {
|
||||
$value = Db::name('SystemData')->where(['name' => $name])->value('value');
|
||||
return empty($value) ? $default : unserialize($value);
|
||||
} catch (\Exception $e) {
|
||||
return $default;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user