diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index e6d26750b..d4ffa7a25 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -853,12 +853,12 @@ "source": { "type": "git", "url": "https://github.com/zoujingli/ThinkLibrary.git", - "reference": "f65e5f33f582df4575a34d1f1c058ca413fb17d6" + "reference": "b36df3ae241b81fe15f4c155fbfba5aab2431970" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f65e5f33f582df4575a34d1f1c058ca413fb17d6", - "reference": "f65e5f33f582df4575a34d1f1c058ca413fb17d6", + "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b36df3ae241b81fe15f4c155fbfba5aab2431970", + "reference": "b36df3ae241b81fe15f4c155fbfba5aab2431970", "shasum": "", "mirrors": [ { @@ -875,7 +875,7 @@ "ext-mbstring": "*", "topthink/framework": "^6.0" }, - "time": "2021-06-22T08:50:44+00:00", + "time": "2021-06-23T06:30:26+00:00", "default-branch": true, "type": "library", "extra": { diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 8a556bd17..5dafb072f 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'bec782fd37e6ce3da4682b02ccd87e42b7e292d5', + 'reference' => '435de923eecb411bc7a10fb8dab55122b87d5466', 'name' => 'zoujingli/thinkadmin', 'dev' => false, ), @@ -144,7 +144,7 @@ 'aliases' => array( 0 => '9999999-dev', ), - 'reference' => 'f65e5f33f582df4575a34d1f1c058ca413fb17d6', + 'reference' => 'b36df3ae241b81fe15f4c155fbfba5aab2431970', 'dev_requirement' => false, ), 'zoujingli/thinkadmin' => array( @@ -153,7 +153,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'bec782fd37e6ce3da4682b02ccd87e42b7e292d5', + 'reference' => '435de923eecb411bc7a10fb8dab55122b87d5466', 'dev_requirement' => false, ), 'zoujingli/wechat-developer' => array( diff --git a/vendor/services.php b/vendor/services.php index 735046046..2c7355f28 100644 --- a/vendor/services.php +++ b/vendor/services.php @@ -1,5 +1,5 @@ 'think\\admin\\Library', diff --git a/vendor/zoujingli/think-library/src/common.php b/vendor/zoujingli/think-library/src/common.php index 5104a4a3a..29e494786 100644 --- a/vendor/zoujingli/think-library/src/common.php +++ b/vendor/zoujingli/think-library/src/common.php @@ -273,7 +273,6 @@ if (!function_exists('data_save')) { * @throws DataNotFoundException * @throws DbException * @throws ModelNotFoundException - * @throws \think\admin\Exception */ function data_save($dbQuery, array $data, string $key = 'id', array $where = []) { diff --git a/vendor/zoujingli/think-library/src/service/SystemService.php b/vendor/zoujingli/think-library/src/service/SystemService.php index 2f295caa1..fc653dc0e 100644 --- a/vendor/zoujingli/think-library/src/service/SystemService.php +++ b/vendor/zoujingli/think-library/src/service/SystemService.php @@ -115,12 +115,11 @@ class SystemService extends Service * @throws DataNotFoundException * @throws DbException * @throws ModelNotFoundException - * @throws \think\admin\Exception */ public function save($query, array $data, string $key = 'id', array $map = []) { $query = is_string($query) ? $this->app->db->name($query) : ($query instanceof Model ? $query->db() : $query); - if (!$query instanceof Query) throw new \think\admin\Exception('数据库操作对象异常!'); + if (!$query instanceof Query) throw new ModelNotFoundException('数据库操作对象异常!'); [$value] = [$data[$key] ?? null, $query->master()->strict(false)->where($map)]; if (empty($map[$key])) if (is_string($value) && strpos($value, ',') !== false) { $query->whereIn($key, str2arr($value));