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:
邹景立 2021-06-23 14:35:13 +08:00
parent 435de923ee
commit 04d0cd8563
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/composer/installed.json vendored
View File

@ -853,12 +853,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "f65e5f33f582df4575a34d1f1c058ca413fb17d6" "reference": "b36df3ae241b81fe15f4c155fbfba5aab2431970"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/f65e5f33f582df4575a34d1f1c058ca413fb17d6", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/b36df3ae241b81fe15f4c155fbfba5aab2431970",
"reference": "f65e5f33f582df4575a34d1f1c058ca413fb17d6", "reference": "b36df3ae241b81fe15f4c155fbfba5aab2431970",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -875,7 +875,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2021-06-22T08:50:44+00:00", "time": "2021-06-23T06:30:26+00:00",
"default-branch": true, "default-branch": true,
"type": "library", "type": "library",
"extra": { "extra": {

6
vendor/composer/installed.php vendored
View File

@ -5,7 +5,7 @@
'type' => 'project', 'type' => 'project',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
'reference' => 'bec782fd37e6ce3da4682b02ccd87e42b7e292d5', 'reference' => '435de923eecb411bc7a10fb8dab55122b87d5466',
'name' => 'zoujingli/thinkadmin', 'name' => 'zoujingli/thinkadmin',
'dev' => false, 'dev' => false,
), ),
@ -144,7 +144,7 @@
'aliases' => array( 'aliases' => array(
0 => '9999999-dev', 0 => '9999999-dev',
), ),
'reference' => 'f65e5f33f582df4575a34d1f1c058ca413fb17d6', 'reference' => 'b36df3ae241b81fe15f4c155fbfba5aab2431970',
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'zoujingli/thinkadmin' => array( 'zoujingli/thinkadmin' => array(
@ -153,7 +153,7 @@
'type' => 'project', 'type' => 'project',
'install_path' => __DIR__ . '/../../', 'install_path' => __DIR__ . '/../../',
'aliases' => array(), 'aliases' => array(),
'reference' => 'bec782fd37e6ce3da4682b02ccd87e42b7e292d5', 'reference' => '435de923eecb411bc7a10fb8dab55122b87d5466',
'dev_requirement' => false, 'dev_requirement' => false,
), ),
'zoujingli/wechat-developer' => array( 'zoujingli/wechat-developer' => array(

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2021-06-22 16:51:18 // This file is automatically generated at:2021-06-23 14:34:11
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

1
vendor/zoujingli/think-library/src/common.php vendored
View File

@ -273,7 +273,6 @@ if (!function_exists('data_save')) {
* @throws DataNotFoundException * @throws DataNotFoundException
* @throws DbException * @throws DbException
* @throws ModelNotFoundException * @throws ModelNotFoundException
* @throws \think\admin\Exception
*/ */
function data_save($dbQuery, array $data, string $key = 'id', array $where = []) function data_save($dbQuery, array $data, string $key = 'id', array $where = [])
{ {

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

@ -115,12 +115,11 @@ class SystemService extends Service
* @throws DataNotFoundException * @throws DataNotFoundException
* @throws DbException * @throws DbException
* @throws ModelNotFoundException * @throws ModelNotFoundException
* @throws \think\admin\Exception
*/ */
public function save($query, array $data, string $key = 'id', array $map = []) 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); $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)]; [$value] = [$data[$key] ?? null, $query->master()->strict(false)->where($map)];
if (empty($map[$key])) if (is_string($value) && strpos($value, ',') !== false) { if (empty($map[$key])) if (is_string($value) && strpos($value, ',') !== false) {
$query->whereIn($key, str2arr($value)); $query->whereIn($key, str2arr($value));