From 8872878e9cf5463673dd107c325963da3f243d30 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Tue, 20 Jan 2015 09:21:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=BA=9B=E4=B8=8D?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Mode/common.php | 32 +++++++++++++++++------- alias.php | 40 ------------------------------ convention.php | 65 ------------------------------------------------- 3 files changed, 23 insertions(+), 114 deletions(-) delete mode 100644 alias.php delete mode 100644 convention.php diff --git a/Mode/common.php b/Mode/common.php index 6a2e6213..ca8c148e 100644 --- a/Mode/common.php +++ b/Mode/common.php @@ -75,15 +75,29 @@ return [ // 别名定义 'alias' => [ - 'Think\Log' => CORE_PATH . 'Log'.EXT, - 'Think\Log\Driver\File' => CORE_PATH . 'Log/Driver/File'.EXT, - 'Think\Exception' => CORE_PATH . 'Exception'.EXT, - 'Think\Model' => CORE_PATH . 'Model'.EXT, - 'Think\Db' => CORE_PATH . 'Db'.EXT, - 'Think\Template' => CORE_PATH . 'Template'.EXT, - 'Think\Cache' => CORE_PATH . 'Cache'.EXT, - 'Think\Cache\Driver\File' => CORE_PATH . 'Cache/Driver/File'.EXT, - 'Think\Storage' => CORE_PATH . 'Storage'.EXT, + 'Think\App' => CORE_PATH . 'App.php', + 'Think\Log' => CORE_PATH . 'Log.php', + 'Think\Log\Driver\File' => CORE_PATH . 'Log/Driver/File.php', + 'Think\Config' => CORE_PATH . 'Config.php', + 'Think\Route' => CORE_PATH . 'Route.php', + 'Think\Exception' => CORE_PATH . 'Exception.php', + 'Think\Model' => CORE_PATH . 'Model.php', + 'Think\Db' => CORE_PATH . 'Db.php', + 'Think\Db\Driver' => CORE_PATH . 'Db/Driver.php', + 'Think\Template' => CORE_PATH . 'Template.php', + 'Think\Error' => CORE_PATH . 'Error.php', + 'Think\Cache' => CORE_PATH . 'Cache.php', + 'Think\Cache\Driver\File' => CORE_PATH . 'Cache/Driver/File.php', + 'Think\Hook' => CORE_PATH . 'Hook.php', + 'Think\Session' => CORE_PATH . 'Session.php', + 'Think\Cookie' => CORE_PATH . 'Cookie.php', + 'Think\Controller' => CORE_PATH . 'Controller.php', + 'Think\View' => CORE_PATH . 'View.php', + 'Think\Url' => CORE_PATH . 'Url.php', + 'Think\Debug' => CORE_PATH . 'Debug.php', + 'Think\Input' => CORE_PATH . 'Input.php', + 'Think\Parser' => CORE_PATH . 'Parser.php', + 'Think\Lang' => CORE_PATH . 'Lang.php', ], 'init' => [], diff --git a/alias.php b/alias.php deleted file mode 100644 index 6231baed..00000000 --- a/alias.php +++ /dev/null @@ -1,40 +0,0 @@ - -// +---------------------------------------------------------------------- - -// 系统类库映射定义 -return [ - 'Think\App' => CORE_PATH . 'App.php', - 'Think\Log' => CORE_PATH . 'Log.php', - 'Think\Log\Driver\File' => CORE_PATH . 'Log/Driver/File.php', - 'Think\Config' => CORE_PATH . 'Config.php', - 'Think\Route' => CORE_PATH . 'Route.php', - 'Think\Exception' => CORE_PATH . 'Exception.php', - 'Think\Model' => CORE_PATH . 'Model.php', - 'Think\Db' => CORE_PATH . 'Db.php', - 'Think\Db\Driver' => CORE_PATH . 'Db/Driver.php', - 'Think\Template' => CORE_PATH . 'Template.php', - 'Think\Error' => CORE_PATH . 'Error.php', - 'Think\Cache' => CORE_PATH . 'Cache.php', - 'Think\Cache\Driver\File' => CORE_PATH . 'Cache/Driver/File.php', - 'Think\Hook' => CORE_PATH . 'Hook.php', - 'Think\Session' => CORE_PATH . 'Session.php', - 'Think\Cookie' => CORE_PATH . 'Cookie.php', - 'Think\Controller' => CORE_PATH . 'Controller.php', - 'Think\View' => CORE_PATH . 'View.php', - 'Think\Url' => CORE_PATH . 'Url.php', - 'Think\Verify' => CORE_PATH . 'Verify.php', - 'Think\Debug' => CORE_PATH . 'Debug.php', - 'Think\Input' => CORE_PATH . 'Input.php', - 'Think\Parser' => CORE_PATH . 'Parser.php', - 'Think\Lang' => CORE_PATH . 'Lang.php', - 'Think\Filter' => CORE_PATH . 'Filter.php', - 'Think\Oauth' => CORE_PATH . 'Oauth.php', -]; diff --git a/convention.php b/convention.php deleted file mode 100644 index 640cc040..00000000 --- a/convention.php +++ /dev/null @@ -1,65 +0,0 @@ - -// +---------------------------------------------------------------------- - -// 惯例配置文件 -return [ - 'app_debug' => true, // 调试模式 - 'app_status' => 'debug',// 调试模式状态 - 'var_module' => 'm', // 模块变量名 - 'var_controller' => 'c', // 控制器变量名 - 'var_action' => 'a', // 操作变量名 - 'var_pathinfo' => 's', // PATHINFO变量名 用于兼容模式 - 'pathinfo_fetch' => 'ORIG_PATH_INFO,REDIRECT_PATH_INFO,REDIRECT_URL', - 'pathinfo_depr' => '/', // pathinfo分隔符 - 'require_module' => true, // 是否显示模块 - 'default_module' => 'index', // 默认模块名 - 'require_controller' => true, // 是否显示控制器 - 'default_controller' => 'index', // 默认控制器名 - 'default_action' => 'index', // 默认操作名 - 'action_suffix' => '', // 操作方法后缀 - 'url_model' => 1, // URL模式 - 'base_url' => $_SERVER["SCRIPT_NAME"], // 基础URL路径 - 'url_html_suffix' => '.html', - 'url_params_bind' => false, // url变量绑定 - 'exception_tmpl' => THINK_PATH.'Tpl/think_exception.tpl',// 异常页面的模板文件 - 'error_tmpl' => THINK_PATH.'Tpl/dispatch_jump.tpl', // 默认错误跳转对应的模板文件 - 'success_tmpl' => THINK_PATH.'Tpl/dispatch_jump.tpl', // 默认成功跳转对应的模板文件 - 'default_ajax_return' => 'JSON', // 默认AJAX 数据返回格式,可选JSON XML ... - 'default_jsonp_handler' => 'jsonpReturn', // 默认JSONP格式返回的处理方法 - 'var_jsonp_handler' => 'callback', - 'template_engine' => 'think', - - 'common_module' => 'Common', - - /* 错误设置 */ - 'error_message' => '页面错误！请稍后再试～',//错误显示信息,非调试模式有效 - 'error_page' => '', // 错误定向页面 - 'show_error_msg' => false, // 显示错误信息 - - /* 数据库设置 */ - 'database' => [ - 'type' => 'mysql', // 数据库类型 - 'dsn' => '', // - 'hostname' => 'localhost', // 服务器地址 - 'database' => '', // 数据库名 - 'username' => 'root', // 用户名 - 'password' => '', // 密码 - 'hostport' => '', // 端口 - 'params' => [], // 数据库连接参数 - 'charset' => 'utf8', // 数据库编码默认采用utf8 - 'prefix' => '', // 数据库表前缀 - 'debug' => false, // 数据库调试模式 - 'deploy' => 0, // 数据库部署方式:0 集中式(单一服务器),1 分布式(主从服务器) - 'rw_separate' => false, // 数据库读写是否分离 主从式有效 - 'master_num' => 1, // 读写分离后 主服务器数量 - 'slave_no' => '', // 指定从服务器序号 - ], -];