Commit 05ec052b authored by testshenbd's avatar testshenbd

applicationConflict

parents 678f0c3c 31880801
...@@ -12,6 +12,11 @@ application.dispatcher.catchException = true ...@@ -12,6 +12,11 @@ application.dispatcher.catchException = true
; Admin模块用于后台管理 ; Admin模块用于后台管理
application.modules = Index,Api,Admin,Client application.modules = Index,Api,Admin,Client
redis.redisPublishName='redisPublish';
[productone : common] [productone : common]
; 数据库配置 ; 数据库配置
resources.database.params.driver = "pdo_mysql" resources.database.params.driver = "pdo_mysql"
...@@ -536,4 +541,4 @@ elastic.master.scheme="http"; ...@@ -536,4 +541,4 @@ elastic.master.scheme="http";
;resources.database.params.hostname = "127.0.0.1" ;resources.database.params.hostname = "127.0.0.1"
;resources.database.params.database = "database" ;resources.database.params.database = "database"
;resources.database.params.username = "username" ;resources.database.params.username = "username"
;resources.database.params.password = "password" ;resources.database.params.password = "password"
\ No newline at end of file
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