From 45e593ec0846307758452c62b20412c8d41fb2ca Mon Sep 17 00:00:00 2001 From: thinkphp Date: Sun, 3 Apr 2016 20:01:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E5=90=9E=E5=90=90=E7=8E=87?= =?UTF-8?q?=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/Build.php | 2 +- library/think/db/driver/Mysql.php | 2 +- library/think/log/driver/File.php | 2 +- library/think/log/driver/Sae.php | 2 +- library/think/log/driver/Socket.php | 2 +- library/think/log/driver/Trace.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/think/Build.php b/library/think/Build.php index e0982561..389ce1ca 100644 --- a/library/think/Build.php +++ b/library/think/Build.php @@ -13,7 +13,7 @@ namespace think; class Build { // 根据传入的build资料创建目录和文件 - public static function run($build = []) + public static function run(array $build = []) { // 锁定 $lockfile = APP_PATH . 'build.lock'; diff --git a/library/think/db/driver/Mysql.php b/library/think/db/driver/Mysql.php index 1c48278c..a9891df6 100644 --- a/library/think/db/driver/Mysql.php +++ b/library/think/db/driver/Mysql.php @@ -103,7 +103,7 @@ class Mysql extends Driver list($field, $name) = explode($key, '$.'); $key = 'jsn_extract(' . $field . ', \'$.\'.' . $name . ')'; } - if (!preg_match('/[,\'\"\*\(\)`.\s]/', $key)) { + if ($key && !preg_match('/[,\'\"\*\(\)`.\s]/', $key)) { $key = '`' . $key . '`'; } return $key; diff --git a/library/think/log/driver/File.php b/library/think/log/driver/File.php index d4242f29..b3fa9c42 100644 --- a/library/think/log/driver/File.php +++ b/library/think/log/driver/File.php @@ -54,7 +54,7 @@ class File $current_uri = "cmd:" . implode(' ', $_SERVER['argv']); } $runtime = microtime(true) - START_TIME; - $reqs = number_format(1 / $runtime, 2); + $reqs = number_format(1 / number_format($runtime, 8), 2); $runtime = number_format($runtime, 6); $time_str = " [运行时间：{$runtime}s] [吞吐率：{$reqs}req/s]"; $memory_use = number_format((memory_get_usage() - START_MEM) / 1024, 2); diff --git a/library/think/log/driver/Sae.php b/library/think/log/driver/Sae.php index 95f5f650..7f3c3349 100644 --- a/library/think/log/driver/Sae.php +++ b/library/think/log/driver/Sae.php @@ -42,7 +42,7 @@ class Sae $current_uri = "cmd:" . implode(' ', $_SERVER['argv']); } $runtime = microtime(true) - START_TIME; - $reqs = number_format(1 / $runtime, 2); + $reqs = number_format(1 / number_format($runtime, 8), 2); $runtime = number_format($runtime, 6); $time_str = " [运行时间：{$runtime}s] [吞吐率：{$reqs}req/s]"; $memory_use = number_format((memory_get_usage() - START_MEM) / 1024, 2); diff --git a/library/think/log/driver/Socket.php b/library/think/log/driver/Socket.php index 23d6f6cf..6a5e87f7 100644 --- a/library/think/log/driver/Socket.php +++ b/library/think/log/driver/Socket.php @@ -60,7 +60,7 @@ class Socket return false; } $runtime = microtime(true) - START_TIME; - $reqs = number_format(1 / $runtime, 2); + $reqs = number_format(1 / number_format($runtime, 8), 2); $runtime = number_format($runtime, 6); $time_str = " [运行时间：{$runtime}s][吞吐率：{$reqs}req/s]"; $memory_use = number_format((memory_get_usage() - START_MEM) / 1024, 2); diff --git a/library/think/log/driver/Trace.php b/library/think/log/driver/Trace.php index 03401bc8..d40f1071 100644 --- a/library/think/log/driver/Trace.php +++ b/library/think/log/driver/Trace.php @@ -44,7 +44,7 @@ class Trace } // 获取基本信息 $runtime = microtime(true) - START_TIME; - $reqs = number_format(1 / $runtime, 2); + $reqs = number_format(1 / number_format($runtime, 8), 2); $runtime = number_format($runtime, 6); $mem = number_format((memory_get_usage() - START_MEM) / 1024, 2);