mirror of
https://gitee.com/zoujingli/ThinkAdmin.git
synced 2025-04-05 19:41:44 +08:00
ComposerUpdate
This commit is contained in:
邹景立
parent
746cc5d2b4
commit
3815bca3b5
@ -21,7 +21,7 @@ return [
|
||||
// 存储连接
|
||||
'store' => null,
|
||||
// 过期时间
|
||||
'expire' => 1800,
|
||||
'expire' => 7200,
|
||||
// 文件前缀
|
||||
'prefix' => '',
|
||||
];
|
||||
20
vendor/composer/installed.json
vendored
20
vendor/composer/installed.json
vendored
@ -656,17 +656,17 @@
|
||||
},
|
||||
{
|
||||
"name": "topthink/think-orm",
|
||||
"version": "v2.0.35",
|
||||
"version_normalized": "2.0.35.0",
|
||||
"version": "v2.0.36",
|
||||
"version_normalized": "2.0.36.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/top-think/think-orm.git",
|
||||
"reference": "f0bba0b15610d4015655ff6f07ea3d639212076f"
|
||||
"reference": "f48dc09050f25029d41a66bfc9c3c403e4f82024"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/top-think/think-orm/zipball/f0bba0b15610d4015655ff6f07ea3d639212076f",
|
||||
"reference": "f0bba0b15610d4015655ff6f07ea3d639212076f",
|
||||
"url": "https://api.github.com/repos/top-think/think-orm/zipball/f48dc09050f25029d41a66bfc9c3c403e4f82024",
|
||||
"reference": "f48dc09050f25029d41a66bfc9c3c403e4f82024",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -682,7 +682,7 @@
|
||||
"psr/simple-cache": "^1.0",
|
||||
"topthink/think-helper": "^3.1"
|
||||
},
|
||||
"time": "2021-01-06T12:55:12+00:00",
|
||||
"time": "2021-01-12T09:08:52+00:00",
|
||||
"type": "library",
|
||||
"installation-source": "dist",
|
||||
"autoload": {
|
||||
@ -857,12 +857,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/zoujingli/ThinkLibrary.git",
|
||||
"reference": "97c42fca7d4cb972391a2d40d0fabfc942592a98"
|
||||
"reference": "e85fb1701ebad407a3155d0758a84dc01d440679"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/97c42fca7d4cb972391a2d40d0fabfc942592a98",
|
||||
"reference": "97c42fca7d4cb972391a2d40d0fabfc942592a98",
|
||||
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/e85fb1701ebad407a3155d0758a84dc01d440679",
|
||||
"reference": "e85fb1701ebad407a3155d0758a84dc01d440679",
|
||||
"shasum": "",
|
||||
"mirrors": [
|
||||
{
|
||||
@ -879,7 +879,7 @@
|
||||
"ext-mbstring": "*",
|
||||
"topthink/framework": "^6.0"
|
||||
},
|
||||
"time": "2021-01-04T02:58:44+00:00",
|
||||
"time": "2021-01-16T09:36:55+00:00",
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"think": {
|
||||
|
||||
2
vendor/services.php
vendored
2
vendor/services.php
vendored
@ -1,5 +1,5 @@
|
||||
<?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);
|
||||
return array (
|
||||
0 => 'think\\admin\\Library',
|
||||
|
||||
8
vendor/topthink/think-orm/src/Model.php
vendored
8
vendor/topthink/think-orm/src/Model.php
vendored
@ -611,7 +611,7 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->writeDataType($data);
|
||||
$data = $this->writeDataType($data);
|
||||
|
||||
if ($this->autoWriteTimestamp && $this->updateTime) {
|
||||
// 自动写入更新时间
|
||||
@ -686,19 +686,19 @@ abstract class Model implements JsonSerializable, ArrayAccess, Arrayable, Jsonab
|
||||
}
|
||||
|
||||
$this->checkData();
|
||||
$this->writeDataType($this->data);
|
||||
$data = $this->writeDataType($this->data);
|
||||
|
||||
// 检查允许字段
|
||||
$allowFields = $this->checkAllowFields();
|
||||
|
||||
$db = $this->db();
|
||||
|
||||
$db->transaction(function () use ($sequence, $allowFields, $db) {
|
||||
$db->transaction(function () use ($data, $sequence, $allowFields, $db) {
|
||||
$result = $db->strict(false)
|
||||
->field($allowFields)
|
||||
->replace($this->replace)
|
||||
->sequence($sequence)
|
||||
->insert($this->data, true);
|
||||
->insert($data, true);
|
||||
|
||||
// 获取自动增长主键
|
||||
if ($result) {
|
||||
|
||||
@ -529,9 +529,9 @@ trait Attribute
|
||||
* 写入数据类型处理
|
||||
* @access protected
|
||||
* @param array $data 数据
|
||||
* @return void
|
||||
* @return array
|
||||
*/
|
||||
protected function writeDataType(array &$data): void
|
||||
protected function writeDataType(array $data): array
|
||||
{
|
||||
foreach ($data as $name => &$value) {
|
||||
if (isset($this->type[$name])) {
|
||||
@ -542,6 +542,8 @@ trait Attribute
|
||||
$value = $this->autoWriteTimestamp();
|
||||
}
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -100,8 +100,8 @@ class Library extends Service
|
||||
if (($origin = $request->header('origin', '*')) !== '*') {
|
||||
$header['Access-Control-Allow-Origin'] = $origin;
|
||||
$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-Expose-Headers'] = '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'] = 'Api-Type,Api-Token,User-Form-Token,User-Token,Token';
|
||||
$header['Access-Control-Allow-Credentials'] = 'true';
|
||||
}
|
||||
// 访问模式及访问权限检查
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user