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-01-16 22:39:45 +08:00
parent 746cc5d2b4
commit 3815bca3b5
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/session.php
View File

@ -21,7 +21,7 @@ return [
// 存储连接 // 存储连接
'store' => null, 'store' => null,
// 过期时间 // 过期时间
'expire' => 1800, 'expire' => 7200,
// 文件前缀 // 文件前缀
'prefix' => '', 'prefix' => '',
]; ];

20
vendor/composer/installed.json vendored
View File

@ -656,17 +656,17 @@
}, },
{ {
"name": "topthink/think-orm", "name": "topthink/think-orm",
"version": "v2.0.35", "version": "v2.0.36",
"version_normalized": "2.0.35.0", "version_normalized": "2.0.36.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": "f0bba0b15610d4015655ff6f07ea3d639212076f" "reference": "f48dc09050f25029d41a66bfc9c3c403e4f82024"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/top-think/think-orm/zipball/f0bba0b15610d4015655ff6f07ea3d639212076f", "url": "https://api.github.com/repos/top-think/think-orm/zipball/f48dc09050f25029d41a66bfc9c3c403e4f82024",
"reference": "f0bba0b15610d4015655ff6f07ea3d639212076f", "reference": "f48dc09050f25029d41a66bfc9c3c403e4f82024",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -682,7 +682,7 @@
"psr/simple-cache": "^1.0", "psr/simple-cache": "^1.0",
"topthink/think-helper": "^3.1" "topthink/think-helper": "^3.1"
}, },
"time": "2021-01-06T12:55:12+00:00", "time": "2021-01-12T09:08:52+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -857,12 +857,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "97c42fca7d4cb972391a2d40d0fabfc942592a98" "reference": "e85fb1701ebad407a3155d0758a84dc01d440679"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/97c42fca7d4cb972391a2d40d0fabfc942592a98", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e85fb1701ebad407a3155d0758a84dc01d440679",
"reference": "97c42fca7d4cb972391a2d40d0fabfc942592a98", "reference": "e85fb1701ebad407a3155d0758a84dc01d440679",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -879,7 +879,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2021-01-04T02:58:44+00:00", "time": "2021-01-16T09:36:55+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-01-12 14:24:15 // This file is automatically generated at:2021-01-16 22:39:13
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

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

@ -611,7 +611,7 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab
return true; return true;
} }
$this->writeDataType($data); $data = $this->writeDataType($data);
if ($this->autoWriteTimestamp && $this->updateTime) { if ($this->autoWriteTimestamp && $this->updateTime) {
// 自动写入更新时间 // 自动写入更新时间
@ -686,19 +686,19 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab
} }
$this->checkData(); $this->checkData();
$this->writeDataType($this->data); $data = $this->writeDataType($this->data);
// 检查允许字段 // 检查允许字段
$allowFields = $this->checkAllowFields(); $allowFields = $this->checkAllowFields();
$db = $this->db(); $db = $this->db();
$db->transaction(function () use ($sequence, $allowFields, $db) { $db->transaction(function () use ($data, $sequence, $allowFields, $db) {
$result = $db->strict(false) $result = $db->strict(false)
->field($allowFields) ->field($allowFields)
->replace($this->replace) ->replace($this->replace)
->sequence($sequence) ->sequence($sequence)
->insert($this->data, true); ->insert($data, true);
// 获取自动增长主键 // 获取自动增长主键
if ($result) { if ($result) {

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

@ -529,9 +529,9 @@ trait Attribute
* 写入数据类型处理 * 写入数据类型处理
* @access protected * @access protected
* @param array $data 数据 * @param array $data 数据
* @return void * @return array
*/ */
protected function writeDataType(array &$data): void protected function writeDataType(array $data): array
{ {
foreach ($data as $name => &$value) { foreach ($data as $name => &$value) {
if (isset($this->type[$name])) { if (isset($this->type[$name])) {
@ -542,6 +542,8 @@ trait Attribute
$value = $this->autoWriteTimestamp(); $value = $this->autoWriteTimestamp();
} }
} }
return $data;
} }
/** /**

4
vendor/zoujingli/think-library/src/Library.php vendored
View File

@ -100,8 +100,8 @@ class Library extends Service
if (($origin = $request->header('origin', '*')) !== '*') { if (($origin = $request->header('origin', '*')) !== '*') {
$header['Access-Control-Allow-Origin'] = $origin; $header['Access-Control-Allow-Origin'] = $origin;
$header['Access-Control-Allow-Methods'] = 'GET,PUT,POST,PATCH,DELETE'; $header['Access-Control-Allow-Methods'] = 'GET,PUT,POST,PATCH,DELETE';
$header['Access-Control-Allow-Headers'] = 'Authorization,Content-Type,If-Match,If-Modified-Since,If-None-Match,If-Unmodified-Since,X-Requested-With,User-Form-Token,User-Token,Token'; $header['Access-Control-Allow-Headers'] = 'Authorization,Content-Type,If-Match,If-Modified-Since,If-None-Match,If-Unmodified-Since,X-Requested-With,Api-Type,Api-Token,User-Form-Token,User-Token,Token';
$header['Access-Control-Expose-Headers'] = 'User-Form-Token,User-Token,Token'; $header['Access-Control-Expose-Headers'] = 'Api-Type,Api-Token,User-Form-Token,User-Token,Token';
$header['Access-Control-Allow-Credentials'] = 'true'; $header['Access-Control-Allow-Credentials'] = 'true';
} }
// 访问模式及访问权限检查 // 访问模式及访问权限检查