From d4f6b04ebbbf5c6046bc9fb52dce8e9bc96031ba Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Thu, 28 Nov 2019 17:16:01 +0800
Subject: [PATCH] ComposerUpdate
---
composer.lock | 8 ++++----
vendor/composer/installed.json | 8 ++++----
vendor/services.php | 2 +-
.../think-library/src/service/SystemService.php | 12 ++++++++----
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/composer.lock b/composer.lock
index d879f9ab2..bbba82195 100644
--- a/composer.lock
+++ b/composer.lock
@@ -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": [],
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 35841df7e..cf468bfce 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -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": {
diff --git a/vendor/services.php b/vendor/services.php
index 0841ab794..12ceaf00b 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -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',
diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php
index 61b628a42..df3ec809c 100644
--- a/vendor/zoujingli/think-library/src/service/SystemService.php
+++ b/vendor/zoujingli/think-library/src/service/SystemService.php
@@ -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;
+ }
}
/**