diff --git a/convention.php b/convention.php index 6592c427..fc4583a4 100644 --- a/convention.php +++ b/convention.php @@ -56,7 +56,6 @@ return [ 'show_error_msg' => false, //默认输出类型 'default_return_type' => 'html', - 'common_module' => '', 'log' => [ 'type' => 'File', @@ -110,16 +109,16 @@ return [ 'slave_no' => '', ], /* SocketLog 调试 */ - 'slog'=> [ - 'enable'=>false, //是否记录日志的开关 - 'host'=>'localhost', + 'slog' => [ + 'enable' => false, //是否记录日志的开关 + 'host' => 'localhost', //是否显示利于优化的参数,如果允许时间,消耗内存等 - 'optimize'=>true, - 'show_included_files'=>true, - 'error_handler'=>true, + 'optimize' => true, + 'show_included_files' => true, + 'error_handler' => true, //日志强制记录到配置的client_id - 'force_client_id'=>'', + 'force_client_id' => '', //限制允许读取日志的client_id - 'allow_client_ids'=>array() - ] + 'allow_client_ids' => array(), + ], ]; diff --git a/library/think/app.php b/library/think/app.php index b0a528a4..59f42239 100644 --- a/library/think/app.php +++ b/library/think/app.php @@ -57,8 +57,8 @@ class App Session::init($config['session']); } //判断,如果启动SocketLog调试, 进行SocketLog配置 - if($config['slog']['enable']) { - slog::config($config['slog']); + if ($config['slog']['enable']) { + \org\Slog::config($config['slog']); } // 应用URL调度 diff --git a/library/think/db/driver.php b/library/think/db/driver.php index 5a3a1c27..3c307e1c 100644 --- a/library/think/db/driver.php +++ b/library/think/db/driver.php @@ -17,7 +17,6 @@ use think\Debug; use think\Exception; use think\Lang; use think\Log; -use think\Slog; abstract class Driver { @@ -743,7 +742,7 @@ abstract class Driver protected function parseOrder($order) { $array = []; - if(is_array($order)) { + if (is_array($order)) { foreach ($order as $key => $val) { if (is_numeric($key)) { if (false === strpos($val, '(')) { @@ -1163,9 +1162,9 @@ abstract class Driver } } - $slog_config=Config::get('slog'); - if($slog_config['enable'] && $start) { - slog::sql($this->queryStr,$this->_linkID); + $slog_config = Config::get('slog'); + if ($slog_config['enable'] && $start) { + \org\Slog::sql($this->queryStr, $this->_linkID); } }