fix(View): Fix cost time miss in render

Rhilip · Mar 10, 2019 · 9cd155b · 9cd155b
1 parent eb9c905
commit 9cd155b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/apps/views/layout/base.php b/apps/views/layout/base.php
@@ -87,7 +87,7 @@
  <p class="copyright">
  <a href="/" target="_self"><?= app()->config->get('base.site_name') ?></a> 2019-2020 Powered by <a href="https://github.com/Rhilip/RidPT">RidPT</a>
  </p>
- <p class="create-info">[ Page created in <b>{{ cost_time|number_format(5) }}</b> sec with <b><?= count(app()->pdo->getExecuteData()) ?></b> db queries, <b><?= array_sum(app()->redis->getCalledData())?></b> calls of Redis ]</p>
+ <p class="create-info">[ Page created in <b><?= number_format(microtime(true) - app()->request->start_at, 6) ?></b> sec with <b><?= count(app()->pdo->getExecuteData()) ?></b> db queries, <b><?= array_sum(app()->redis->getCalledData())?></b> calls of Redis ]</p>
  </div>
  </div>
 </footer>

diff --git a/framework/Http/Application.php b/framework/Http/Application.php
@@ -241,17 +241,17 @@ public function end($content = '')
  }
 
  /**
- * @return mixed
+ * @return \Swoole\Http\Server
  */
  public function getServ()
  {
  return $this->_serv;
  }
 
  /**
- * @param mixed $serv
+ * @param \Swoole\Http\Server $serv
  */
- public function setServ($serv): void
+ public function setServ(\Swoole\Http\Server $serv): void
  {
  $this->_serv = $serv;
  }

diff --git a/framework/Http/Controller.php b/framework/Http/Controller.php
@@ -12,16 +12,8 @@ class Controller extends BaseObject
 
  protected $start_time;
 
- public function onInitialize()
- {
- $this->start_time = microtime(true);
- }
-
  public function render($name, $data = [])
  {
- $data['cost_time'] = microtime(true) - $this->start_time;
- if (env('APP_DEBUG'))
- $data['css_tag'] = time();
  return (new View())->render($name, $data);
  }
 }
diff --git a/framework/Http/Request.php b/framework/Http/Request.php
@@ -11,11 +11,14 @@ class Request extends BaseRequest
  // 请求对象
  protected $_requester;
 
+ public $start_at;
+
  // 设置请求对象
  public function setRequester($requester)
  {
  $this->_requester = $requester;
  // 重置数据
+ $this->start_at = microtime(true);
  $this->setRoute([]);
  $this->_get = isset($requester->get) ? $requester->get : [];
  $this->_post = isset($requester->post) ? $requester->post : [];