Commit 81d0fc7c7eb4a2f85c3387a31aef1c03839ea005
1 parent
9eb9369051
Exists in
master
and in
1 other branch
增加配置
Showing 4 changed files with 20 additions and 12 deletions
platform-job-index/src/main/webapp/WEB-INF/web.xml
View file @
81d0fc7
| ... | ... | @@ -18,7 +18,10 @@ |
| 18 | 18 | classpath*:/spring/applicationContext.xml |
| 19 | 19 | </param-value> |
| 20 | 20 | </context-param> |
| 21 | - | |
| 21 | + <context-param> | |
| 22 | + <param-name>webAppRootKey</param-name> | |
| 23 | + <param-value>webapp.job.index</param-value> | |
| 24 | + </context-param> | |
| 22 | 25 | <session-config> |
| 23 | 26 | <session-timeout>60</session-timeout> |
| 24 | 27 | </session-config> |
platform-operate-api/src/main/resources/database.properties
View file @
81d0fc7
| ... | ... | @@ -2,9 +2,9 @@ |
| 2 | 2 | #mongo.db.port=27017 |
| 3 | 3 | #mongo.db.dbname=platform |
| 4 | 4 | |
| 5 | -mongo.db.host=192.168.5.223 | |
| 6 | -mongo.db.port=27017 | |
| 7 | -mongo.db.dbname=platform | |
| 5 | +mongo.db.host=${mongo.db.host} | |
| 6 | +mongo.db.port=${mongo.db.port} | |
| 7 | +mongo.db.dbname=${mongo.db.dbname} | |
| 8 | 8 | mongo.db.username=root |
| 9 | 9 | mongo.db.password=root |
| 10 | 10 | |
| 11 | 11 | |
| ... | ... | @@ -27,15 +27,15 @@ |
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | maindata.driver=com.mysql.jdbc.Driver |
| 30 | -maindata.jdbcurl=jdbc:mysql://192.168.5.250:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 | |
| 31 | -maindata.username=platform | |
| 32 | -maindata.password=platform123 | |
| 30 | +maindata.jdbcurl=${mysql.jdbcurl} | |
| 31 | +maindata.username=${mysql.db.name} | |
| 32 | +maindata.password=${mysql.db.password} | |
| 33 | 33 | |
| 34 | 34 | maindata.maxpoolsize=5 |
| 35 | 35 | maindata.initialpoolsize=2 |
| 36 | 36 | maindata.minpoolsize=2 |
| 37 | 37 | |
| 38 | -redis.servers=192.168.5.250:6379:mommybaby123 | |
| 38 | +redis.servers=${redis.servers} | |
| 39 | 39 | |
| 40 | 40 | token.prefix=member |
| 41 | 41 |
platform-operate-api/src/main/webapp/WEB-INF/web.xml
View file @
81d0fc7
| ... | ... | @@ -27,6 +27,10 @@ |
| 27 | 27 | <param-value>classpath:log4j_config.xml</param-value> |
| 28 | 28 | </context-param> |
| 29 | 29 | <context-param> |
| 30 | + <param-name>webAppRootKey</param-name> | |
| 31 | + <param-value>webapp.operate</param-value> | |
| 32 | + </context-param> | |
| 33 | + <context-param> | |
| 30 | 34 | <param-name>log4jRefreshInterval</param-name> |
| 31 | 35 | <param-value>60000</param-value> |
| 32 | 36 | </context-param> |
platform-resource/resources/config-test.properties
View file @
81d0fc7
| 1 | 1 | mongo.db.host=localhost |
| 2 | -mongo.db.port=27017 | |
| 3 | -mongo.db.dbname=dev_mongo | |
| 2 | +mongo.db.port=10001 | |
| 3 | +mongo.db.dbname=platform | |
| 4 | 4 | |
| 5 | 5 | |
| 6 | 6 | mysql.db.name=test |
| 7 | 7 | mysql.db.password=test |
| 8 | 8 | mysql.driver=com.mysql.jdbc.Driver |
| 9 | -mysql.jdbcurl=jdbc:mysql://192.168.5.250:3306/mommybaby?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 | |
| 9 | +mysql.jdbcurl=jdbc:mysql://localhost:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8 | |
| 10 | 10 | |
| 11 | 11 | mysql.maxpoolsize=5 |
| 12 | 12 | mysql.initialpoolsize=2 |
| 13 | 13 | mysql.minpoolsize=2 |
| 14 | +redis.servers=localhost:6379 |