diff --git a/.gitignore b/.gitignore index 9e2130157..2daa18e37 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .svn/ Runtime/ -Uploads/ \ No newline at end of file +Uploads/ +Application/Common/env.php \ No newline at end of file diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index bc61bfa52..d52dd385a 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -262,7 +262,7 @@ 落地页图片 - +
上传图片
diff --git a/Application/Common/Conf/config.php b/Application/Common/Conf/config.php index 763d3154d..b260afc60 100644 --- a/Application/Common/Conf/config.php +++ b/Application/Common/Conf/config.php @@ -15,6 +15,8 @@ define('UC_AUTH_KEY', 'UmtW6-Z(S^8xvwDn;B:J{X7FG9z2+Np.|C#~QRY"'); //加密KEY $route = include(CONF_PATH . "route.php"); $site_route = include(CONF_PATH . "site_route.php"); $cache = include(CONF_PATH . "pay_config.php"); +$env = include(CONF_PATH . "env.php"); + if (!empty($route)) { $route = array_merge($site_route, $route); } else { @@ -47,7 +49,6 @@ if ($cache['CACHE_TYPE'] == 1) { ); } $config = array( - "LOAD_EXT_FILE" => "extend,ucenter", 'LOAD_EXT_CONFIG' => 'pay_config,seo_media_config', /* 模块相关配置 */ @@ -74,7 +75,6 @@ $config = array( /* 全局过滤配置 */ 'DEFAULT_FILTER' => '', //全局过滤函数 - //中英文切换语言包配置项 'LANG_SWITCH_ON' => true, //开启语言包功能 'LANG_AUTO_DETECT' => true, // 自动侦测语言 @@ -82,24 +82,12 @@ $config = array( 'LANG_LIST' => 'zh-cn,en-us', //必须写可允许的语言列表 'VAR_LANGUAGE' => 'l', // 默认语言切换变量 - - 'DB_TYPE' => 'mysql', // 数据库类型 - 'DB_HOST' => '127.0.0.1', // 服务器地址 - 'DB_NAME' => 'platform', // 数据库名 - 'DB_USER' => 'root', // 用户名 - 'DB_PWD' => 'root', // 密码 - 'DB_PORT' => '3306', // 端口 - 'DB_PREFIX' => 'sys_', // 数据库表前缀 - /* UC数据库配置 */ - 'DB_CONFIG2' => 'mysql://asdasd:asdasd@192.168.2.199:3306/db_h5', - 'DB_CONFIG3' => 'mysql://asdasd:asdasd@192.168.2.199:3306/db_xgyy', /* 文档模型配置 (文档模型核心配置,请勿更改) */ 'DOCUMENT_MODEL_TYPE' => array(2 => '主题', 1 => '目录', 3 => '段落'), - - //错误页面 'ERROR_MESSAGE' => '页面错误!请稍后再试~',//错误显示信息,非调试模式有效 'ERROR_PAGE' => 'public/error/404.html', // 错误定向页面 ); +$config = array_merge($config, $env); return array_merge($config, $cache_config); diff --git a/Application/Common/Conf/env.php b/Application/Common/Conf/env.php new file mode 100644 index 000000000..9364e4ffb --- /dev/null +++ b/Application/Common/Conf/env.php @@ -0,0 +1,15 @@ + 'mysql', // 数据库类型 + 'DB_HOST' => '127.0.0.1', // 服务器地址 + 'DB_NAME' => 'platform', // 数据库名 + 'DB_USER' => 'root', // 用户名 + 'DB_PWD' => 'root', // 密码 + 'DB_PORT' => '3306', // 端口 + 'DB_PREFIX' => 'sys_', // 数据库表前缀 + + /* UC数据库配置 */ + 'DB_CONFIG2' => 'mysql://asdasd:asdasd@192.168.2.199:3306/db_h5', + 'DB_CONFIG3' => 'mysql://asdasd:asdasd@192.168.2.199:3306/db_xgyy', +]; \ No newline at end of file