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
2015-12-08 10:56:47 +08:00
parent 0c6a768456
commit 788aeb686c
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
convention.php
View File

@@ -56,7 +56,6 @@ return [
'show_error_msg' => false, 'show_error_msg' => false,
//默认输出类型 //默认输出类型
'default_return_type' => 'html', 'default_return_type' => 'html',
'common_module' => '',
'log' => [ 'log' => [
'type' => 'File', 'type' => 'File',
@@ -120,6 +119,6 @@ return [
//日志强制记录到配置的client_id //日志强制记录到配置的client_id
'force_client_id' => '', 'force_client_id' => '',
//限制允许读取日志的client_id //限制允许读取日志的client_id
'allow_client_ids'=>array() 'allow_client_ids' => array(),
] ],
]; ];

2
library/think/app.php
View File

@@ -58,7 +58,7 @@ class App
} }
//判断，如果启动SocketLog调试， 进行SocketLog配置 //判断，如果启动SocketLog调试， 进行SocketLog配置
if ($config['slog']['enable']) { if ($config['slog']['enable']) {
slog::config($config['slog']); \org\Slog::config($config['slog']);
} }
// 应用URL调度 // 应用URL调度

3
library/think/db/driver.php
View File

@@ -17,7 +17,6 @@ use think\Debug;
use think\Exception; use think\Exception;
use think\Lang; use think\Lang;
use think\Log; use think\Log;
use think\Slog;
abstract class Driver abstract class Driver
{ {
@@ -1165,7 +1164,7 @@ abstract class Driver
$slog_config = Config::get('slog'); $slog_config = Config::get('slog');
if ($slog_config['enable'] && $start) { if ($slog_config['enable'] && $start) {
slog::sql($this->queryStr,$this->_linkID); \org\Slog::sql($this->queryStr, $this->_linkID);
} }
} }