blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2019-11-28 17:16:01 +08:00
parent 18f9e70755
commit d4f6b04ebb
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -783,12 +783,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99"
"reference": "8d5bb74a4956debf5a37fa1e04d81723910cb889"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8d5bb74a4956debf5a37fa1e04d81723910cb889",
"reference": "8d5bb74a4956debf5a37fa1e04d81723910cb889",
"shasum": "",
"mirrors": [
{
@ -832,7 +832,7 @@
],
"description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top",
"time": "2019-11-28T08:04:45+00:00"
"time": "2019-11-28T09:07:59+00:00"
}
],
"packages-dev": [],

8
vendor/composer/installed.json vendored
View File

@ -805,12 +805,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99"
"reference": "8d5bb74a4956debf5a37fa1e04d81723910cb889"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"reference": "4a616d7c4852a46b4d4038a6715c9d62303e5d99",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8d5bb74a4956debf5a37fa1e04d81723910cb889",
"reference": "8d5bb74a4956debf5a37fa1e04d81723910cb889",
"shasum": "",
"mirrors": [
{
@ -826,7 +826,7 @@
"ext-json": "*",
"topthink/framework": "^6.0"
},
"time": "2019-11-28T08:04:45+00:00",
"time": "2019-11-28T09:07:59+00:00",
"type": "library",
"extra": {
"think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2019-11-28 16:10:35
// This file is automatically generated at:2019-11-28 17:15:19
declare (strict_types = 1);
return array (
0 => 'think\\app\\Service',

12
vendor/zoujingli/think-library/src/service/SystemService.php vendored
View File

@ -139,13 +139,17 @@ class SystemService extends Service
/**
* 读取数据内容
* @param string $name
* @param string $default
* @param mixed $default
* @return mixed
*/
public function getData($name, $default = null)
public function getData($name, $default = [])
{
$value = $this->app->db->name('SystemData')->where(['name' => $name])->value('value', null);
return is_null($value) ? $default : unserialize($value);
try {
$value = $this->app->db->name('SystemData')->where(['name' => $name])->value('value', null);
return is_null($value) ? $default : unserialize($value);
} catch (\Exception $e) {
return $default;
}
}
/**