Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into lyz

5e17f6e5 · liuyuzhen · a9187d70 · d627e2af · 5e17f6e5 · 5e17f6e5
Commit 5e17f6e5 authored Sep 19, 2018 by liuyuzhen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

application.ini conf/application.ini +1 -1

url.ini conf/url.ini +1 -1

No files found.
--- a/conf/application.ini
+++ b/conf/application.ini
@@ -12,7 +12,7 @@ application.dispatcher.catchException = true
 ; Admin模块用于后台管理
 application.modules = Index,Api,Admin

-[productSlaveOne : common]
+[productone : common]
 ; 数据库配置
 resources.database.params.driver   = "pdo_mysql"
 resources.database.params.hostname = "172.16.142.15"

--- a/conf/url.ini
+++ b/conf/url.ini
 [common]
 ;  通用配置
-[productSlaveOne : common]
+[productone : common]
 ; 测试环境配置
 ;
 ; ; url相关配置