Commit 5e17f6e5 authored by liuyuzhen's avatar liuyuzhen

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

parents a9187d70 d627e2af
...@@ -12,7 +12,7 @@ application.dispatcher.catchException = true ...@@ -12,7 +12,7 @@ application.dispatcher.catchException = true
; Admin模块用于后台管理 ; Admin模块用于后台管理
application.modules = Index,Api,Admin application.modules = Index,Api,Admin
[productSlaveOne : common] [productone : common]
; 数据库配置 ; 数据库配置
resources.database.params.driver = "pdo_mysql" resources.database.params.driver = "pdo_mysql"
resources.database.params.hostname = "172.16.142.15" resources.database.params.hostname = "172.16.142.15"
......
[common] [common]
; 通用配置 ; 通用配置
[productSlaveOne : common] [productone : common]
; 测试环境配置 ; 测试环境配置
; ;
; ; url相关配置 ; ; url相关配置
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment