Commit dec2724b authored by wwccw0591's avatar wwccw0591

Merge branch 'master_dev'

parents 8e14ca0a 803edee3
...@@ -28,7 +28,7 @@ resources.database.slave.params.driver = "pdo_mysql" ...@@ -28,7 +28,7 @@ resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "127.0.0.1" resources.database.slave.params.hostname = "127.0.0.1"
resources.database.slave.params.port = 3306 resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs" resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "qmcsreader" resources.database.slave.params.username = "root"
resources.database.slave.params.password = "!@#$%12345werty" resources.database.slave.params.password = "!@#$%12345werty"
resources.database.slave.params.charset = "UTF8" resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8" resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
...@@ -75,7 +75,7 @@ resources.database.slave.params.driver = "pdo_mysql" ...@@ -75,7 +75,7 @@ resources.database.slave.params.driver = "pdo_mysql"
resources.database.slave.params.hostname = "172.16.142.13" resources.database.slave.params.hostname = "172.16.142.13"
resources.database.slave.params.port = 3306 resources.database.slave.params.port = 3306
resources.database.slave.params.database = "qmcs" resources.database.slave.params.database = "qmcs"
resources.database.slave.params.username = "qmcsreader" resources.database.slave.params.username = "root"
resources.database.slave.params.password = "!@#$%12345werty" resources.database.slave.params.password = "!@#$%12345werty"
resources.database.slave.params.charset = "UTF8" resources.database.slave.params.charset = "UTF8"
resources.database.slave.params.driver_options.1002 = "SET NAMES utf8" resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
......
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