mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进命令行模式下自动完成的时间写入问题

Browse Source
This commit is contained in:
thinkphp
2017-04-21 21:46:02 +08:00
parent 77dbb1315b
commit 37b74f674e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -380,12 +380,12 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
case 'datetime': case 'datetime':
case 'date': case 'date':
$format = !empty($param) ? $param : $this->dateFormat; $format = !empty($param) ? $param : $this->dateFormat;
$value = $this->formatDateTime($_SERVER['REQUEST_TIME'], $format); $value = $this->formatDateTime(time(), $format);
break; break;
case 'timestamp': case 'timestamp':
case 'integer': case 'integer':
default: default:
$value = $_SERVER['REQUEST_TIME']; $value = time();
break; break;
} }
} elseif (is_string($this->autoWriteTimestamp) && in_array(strtolower($this->autoWriteTimestamp), [ } elseif (is_string($this->autoWriteTimestamp) && in_array(strtolower($this->autoWriteTimestamp), [
@@ -394,9 +394,9 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
'timestamp', 'timestamp',
]) ])
) { ) {
$value = $this->formatDateTime($_SERVER['REQUEST_TIME'], $this->dateFormat); $value = $this->formatDateTime(time(), $this->dateFormat);
} else { } else {
$value = $this->formatDateTime($_SERVER['REQUEST_TIME'], $this->dateFormat, true); $value = $this->formatDateTime(time(), $this->dateFormat, true);
} }
return $value; return $value;
} }