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-03-08 14:48:58 +08:00
parent 1e0864d0ed
commit aefb13f5ef
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vendor/composer/installed.json vendored
View File

@ -656,17 +656,17 @@
}, },
{ {
"name": "topthink/think-orm", "name": "topthink/think-orm",
"version": "v2.0.38", "version": "v2.0.39",
"version_normalized": "2.0.38.0", "version_normalized": "2.0.39.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/top-think/think-orm.git", "url": "https://github.com/top-think/think-orm.git",
"reference": "48e01bd25fdd51afee95343a4381fabc5a9cb764" "reference": "39a9d0a0e52d9b8bad9d98484d8484cdf5b683a7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-orm/zipball/48e01bd25fdd51afee95343a4381fabc5a9cb764", "url": "https://api.github.com/repos/top-think/think-orm/zipball/39a9d0a0e52d9b8bad9d98484d8484cdf5b683a7",
"reference": "48e01bd25fdd51afee95343a4381fabc5a9cb764", "reference": "39a9d0a0e52d9b8bad9d98484d8484cdf5b683a7",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -686,7 +686,7 @@
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7|^8|^9.5" "phpunit/phpunit": "^7|^8|^9.5"
}, },
"time": "2021-02-24T00:54:36+00:00", "time": "2021-02-26T10:20:00+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -863,12 +863,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "a273990298618e97fb7a03082f7a032ba0ad548c" "reference": "c05b7fc33aeb089452e98cd70645148124ff8dff"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a273990298618e97fb7a03082f7a032ba0ad548c", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c05b7fc33aeb089452e98cd70645148124ff8dff",
"reference": "a273990298618e97fb7a03082f7a032ba0ad548c", "reference": "c05b7fc33aeb089452e98cd70645148124ff8dff",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -885,7 +885,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2021-03-01T02:53:44+00:00", "time": "2021-03-01T07:21:42+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2021-03-01 13:14:30 // This file is automatically generated at:2021-03-08 14:48:39
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

5
vendor/topthink/think-orm/src/Model.php vendored
View File

@ -967,7 +967,10 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab
*/ */
public function __unset(string $name): void public function __unset(string $name): void
{ {
unset($this->data[$name], $this->relation[$name]); unset($this->data[$name],
$this->get[$name],
$this->set[$name],
$this->relation[$name]);
} }
// ArrayAccess // ArrayAccess

5
vendor/topthink/think-orm/src/db/Builder.php vendored
View File

@ -15,7 +15,6 @@ namespace think\db;
use Closure; use Closure;
use PDO; use PDO;
use think\db\exception\DbException as Exception; use think\db\exception\DbException as Exception;
use function count;
/** /**
* Db Builder * Db Builder
@ -758,7 +757,7 @@ abstract class Builder
} else { } else {
$value = array_unique(is_array($value) ? $value : explode(',', $value)); $value = array_unique(is_array($value) ? $value : explode(',', $value));
if (count($value) === 0) { if (count($value) === 0) {
return '0 = 1'; return 'IN' == $exp ? '0 = 1' : '1 = 1';
} }
$array = []; $array = [];
@ -770,7 +769,7 @@ abstract class Builder
if (count($array) == 1) { if (count($array) == 1) {
return $key . ('IN' == $exp ? ' = ' : ' <> ') . $array[0]; return $key . ('IN' == $exp ? ' = ' : ' <> ') . $array[0];
} else { } else {
$value = implode(',', $array); $value = implode(',', $array);
} }
} }

6
vendor/topthink/think-orm/src/model/concern/Attribute.php vendored
View File

@ -268,7 +268,9 @@ trait Attribute
return $this->origin; return $this->origin;
} }
return array_key_exists($name, $this->origin) ? $this->origin[$name] : null; $fieldName = $this->getRealFieldName($name);
return array_key_exists($fieldName, $this->origin) ? $this->origin[$fieldName] : null;
} }
/** /**
@ -332,6 +334,7 @@ trait Attribute
$name = $this->getRealFieldName($name); $name = $this->getRealFieldName($name);
$this->data[$name] = $value; $this->data[$name] = $value;
unset($this->get[$name]);
} }
/** /**
@ -380,6 +383,7 @@ trait Attribute
// 设置数据对象属性 // 设置数据对象属性
$this->data[$name] = $value; $this->data[$name] = $value;
unset($this->get[$name]);
} }
/** /**

2
vendor/zoujingli/think-library/src/command/Queue.php vendored
View File

@ -97,7 +97,7 @@ class Queue extends Command
$host = $this->input->getOption('host') ?: '127.0.0.1'; $host = $this->input->getOption('host') ?: '127.0.0.1';
$root = $this->app->getRootPath() . 'public' . DIRECTORY_SEPARATOR; $root = $this->app->getRootPath() . 'public' . DIRECTORY_SEPARATOR;
$command = "php -S {$host}:{$port} -t {$root} {$root}router.php"; $command = "php -S {$host}:{$port} -t {$root} {$root}router.php";
$this->output->comment("># {$command}"); $this->output->comment(">$ {$command}");
if (count($result = $this->process->query($command)) > 0) { if (count($result = $this->process->query($command)) > 0) {
if ($this->process->iswin()) $this->process->exec("start http://{$host}:{$port}"); if ($this->process->iswin()) $this->process->exec("start http://{$host}:{$port}");
$this->output->writeln("># WebServer process already exist for pid {$result[0]['pid']}"); $this->output->writeln("># WebServer process already exist for pid {$result[0]['pid']}");