Skip to content

Commit

Permalink
optimise
Browse files Browse the repository at this point in the history
  • Loading branch information
javahongxi committed Jan 18, 2019
1 parent 75ae2ff commit 3d193b2
Show file tree
Hide file tree
Showing 10 changed files with 162 additions and 33 deletions.
4 changes: 0 additions & 4 deletions whatsmars-earth/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@
<module>whatsmars-earth-common</module>
</modules>

<properties>
<rootdir>${basedir}</rootdir>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
Expand Down
13 changes: 0 additions & 13 deletions whatsmars-earth/profile/production.properties

This file was deleted.

6 changes: 3 additions & 3 deletions whatsmars-earth/whatsmars-earth-support-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -113,23 +113,23 @@
</activation>
<build>
<filters>
<filter>../profile/development.properties</filter>
<filter>profile/development.properties</filter>
</filters>
</build>
</profile>
<profile>
<id>test</id>
<build>
<filters>
<filter>../profile/test.properties</filter>
<filter>profile/test.properties</filter>
</filters>
</build>
</profile>
<profile>
<id>production</id>
<build>
<filters>
<filter>../profile/production.properties</filter>
<filter>profile/production.properties</filter>
</filters>
</build>
</profile>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@ whatsmars.jdbc.mysql.url=jdbc:mysql://db.hongxi.org:3306/test
whatsmars.jdbc.mysql.username=root
whatsmars.jdbc.mysql.password=n36bxXMnHina

##��̨����ϵͳcookie
whatsmars.admin.cookie.security.key=H32ClbJteGTjbZSL
whatsmars.admin.cookie.key=_admin_
whatsmars.admin.cookie.domain=127.0.0.1
whatsmars.admin.host.name=127.0.0.1:8080

##��ҵ����
whatsmars.quartz.cluster.mysql.url=jdbc:mysql://0.0.0.0:3306/quartz
whatsmars.quartz.cluster.mysql.username=root
whatsmars.quartz.cluster.mysql.password=xxxxxxx

##activemq
whatsmars.activemq.broker.url=tcp://0.0.0.0:61616
##����
whatsmars.activemq.queue.withdraw=_whatsmars_MQ_WITHDRAW.QUEUE

##authenticationDatabase
Expand All @@ -36,7 +32,6 @@ whatsmars.mongodb.common.username=toutiao
whatsmars.mongodb.common.password=toutiao.im
whatsmars.mongodb.common.addresses=0.0.0.0:27017

##�����ʼ�
whatsmars.service.email.host.name=smtp.qq.com
whatsmars.service.email.smtp.port=25
whatsmars.service.email.username=toutiao
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
whatsmars.log4j.logger.path=/data/logs
whatsmars.log4j.logger.level=debug

whatsmars.jdbc.mysql.url=jdbc:mysql://db.hongxi.org:3306/test
whatsmars.jdbc.mysql.username=root
whatsmars.jdbc.mysql.password=n36bxXMnHina

whatsmars.admin.cookie.security.key=H32ClbJteGTjbZSL
whatsmars.admin.cookie.key=_admin_
whatsmars.admin.cookie.domain=127.0.0.1
whatsmars.admin.host.name=127.0.0.1:8080

whatsmars.quartz.cluster.mysql.url=jdbc:mysql://0.0.0.0:3306/quartz
whatsmars.quartz.cluster.mysql.username=root
whatsmars.quartz.cluster.mysql.password=xxxxxxx

whatsmars.activemq.broker.url=tcp://0.0.0.0:61616
whatsmars.activemq.queue.withdraw=_whatsmars_MQ_WITHDRAW.QUEUE

##authenticationDatabase
whatsmars.mongodb.admin.dbname=admin

##gridfs
whatsmars.mongodb.filesystem.dbname=whatsmars-fs
whatsmars.mongodb.filesystem.username=toutiao
whatsmars.mongodb.filesystem.password=toutiao.im
whatsmars.mongodb.filesystem.addresses=0.0.0.0:27017

##common
whatsmars.mongodb.common.dbname=whatsmars-common
whatsmars.mongodb.common.username=toutiao
whatsmars.mongodb.common.password=toutiao.im
whatsmars.mongodb.common.addresses=0.0.0.0:27017

whatsmars.service.email.host.name=smtp.qq.com
whatsmars.service.email.smtp.port=25
whatsmars.service.email.username=toutiao
whatsmars.service.email.password=toutiao
whatsmars.service.email.from.address=[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,16 @@ whatsmars.jdbc.mysql.url=jdbc:mysql://db.hongxi.org:3306/test
whatsmars.jdbc.mysql.username=root
whatsmars.jdbc.mysql.password=n36bxXMnHina

##��̨����ϵͳcookie
whatsmars.admin.cookie.security.key=H32ClbJteGTjbZSL
whatsmars.admin.cookie.key=_admin_
whatsmars.admin.cookie.domain=127.0.0.1
whatsmars.admin.host.name=127.0.0.1:8080

##��ҵ����
whatsmars.quartz.cluster.mysql.url=jdbc:mysql://0.0.0.0:3306/quartz
whatsmars.quartz.cluster.mysql.username=root
whatsmars.quartz.cluster.mysql.password=xxxxxxx

##activemq
whatsmars.activemq.broker.url=tcp://0.0.0.0:61616
##����
whatsmars.activemq.queue.withdraw=_whatsmars_MQ_WITHDRAW.QUEUE

##authenticationDatabase
Expand All @@ -36,7 +32,6 @@ whatsmars.mongodb.common.username=toutiao
whatsmars.mongodb.common.password=toutiao.im
whatsmars.mongodb.common.addresses=0.0.0.0:27017

##�����ʼ�
whatsmars.service.email.host.name=smtp.qq.com
whatsmars.service.email.smtp.port=25
whatsmars.service.email.username=toutiao
Expand Down
6 changes: 3 additions & 3 deletions whatsmars-earth/whatsmars-earth-web/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,23 +109,23 @@
</activation>
<build>
<filters>
<filter>../profile/development.properties</filter>
<filter>profile/development.properties</filter>
</filters>
</build>
</profile>
<profile>
<id>test</id>
<build>
<filters>
<filter>../profile/test.properties</filter>
<filter>profile/test.properties</filter>
</filters>
</build>
</profile>
<profile>
<id>production</id>
<build>
<filters>
<filter>../profile/production.properties</filter>
<filter>profile/production.properties</filter>
</filters>
</build>
</profile>
Expand Down
39 changes: 39 additions & 0 deletions whatsmars-earth/whatsmars-earth-web/profile/development.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
whatsmars.log4j.logger.path=/data/logs
whatsmars.log4j.logger.level=debug

whatsmars.jdbc.mysql.url=jdbc:mysql://db.hongxi.org:3306/test
whatsmars.jdbc.mysql.username=root
whatsmars.jdbc.mysql.password=n36bxXMnHina

whatsmars.admin.cookie.security.key=H32ClbJteGTjbZSL
whatsmars.admin.cookie.key=_admin_
whatsmars.admin.cookie.domain=127.0.0.1
whatsmars.admin.host.name=127.0.0.1:8080

whatsmars.quartz.cluster.mysql.url=jdbc:mysql://0.0.0.0:3306/quartz
whatsmars.quartz.cluster.mysql.username=root
whatsmars.quartz.cluster.mysql.password=xxxxxxx

whatsmars.activemq.broker.url=tcp://0.0.0.0:61616
whatsmars.activemq.queue.withdraw=_whatsmars_MQ_WITHDRAW.QUEUE

##authenticationDatabase
whatsmars.mongodb.admin.dbname=admin

##gridfs
whatsmars.mongodb.filesystem.dbname=whatsmars-fs
whatsmars.mongodb.filesystem.username=toutiao
whatsmars.mongodb.filesystem.password=toutiao.im
whatsmars.mongodb.filesystem.addresses=0.0.0.0:27017

##common
whatsmars.mongodb.common.dbname=whatsmars-common
whatsmars.mongodb.common.username=toutiao
whatsmars.mongodb.common.password=toutiao.im
whatsmars.mongodb.common.addresses=0.0.0.0:27017

whatsmars.service.email.host.name=smtp.qq.com
whatsmars.service.email.smtp.port=25
whatsmars.service.email.username=toutiao
whatsmars.service.email.password=toutiao
whatsmars.service.email.from.address=[email protected]
39 changes: 39 additions & 0 deletions whatsmars-earth/whatsmars-earth-web/profile/production.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
whatsmars.log4j.logger.path=/data/logs
whatsmars.log4j.logger.level=debug

whatsmars.jdbc.mysql.url=jdbc:mysql://db.hongxi.org:3306/test
whatsmars.jdbc.mysql.username=root
whatsmars.jdbc.mysql.password=n36bxXMnHina

whatsmars.admin.cookie.security.key=H32ClbJteGTjbZSL
whatsmars.admin.cookie.key=_admin_
whatsmars.admin.cookie.domain=127.0.0.1
whatsmars.admin.host.name=127.0.0.1:8080

whatsmars.quartz.cluster.mysql.url=jdbc:mysql://0.0.0.0:3306/quartz
whatsmars.quartz.cluster.mysql.username=root
whatsmars.quartz.cluster.mysql.password=xxxxxxx

whatsmars.activemq.broker.url=tcp://0.0.0.0:61616
whatsmars.activemq.queue.withdraw=_whatsmars_MQ_WITHDRAW.QUEUE

##authenticationDatabase
whatsmars.mongodb.admin.dbname=admin

##gridfs
whatsmars.mongodb.filesystem.dbname=whatsmars-fs
whatsmars.mongodb.filesystem.username=toutiao
whatsmars.mongodb.filesystem.password=toutiao.im
whatsmars.mongodb.filesystem.addresses=0.0.0.0:27017

##common
whatsmars.mongodb.common.dbname=whatsmars-common
whatsmars.mongodb.common.username=toutiao
whatsmars.mongodb.common.password=toutiao.im
whatsmars.mongodb.common.addresses=0.0.0.0:27017

whatsmars.service.email.host.name=smtp.qq.com
whatsmars.service.email.smtp.port=25
whatsmars.service.email.username=toutiao
whatsmars.service.email.password=toutiao
whatsmars.service.email.from.address=[email protected]
39 changes: 39 additions & 0 deletions whatsmars-earth/whatsmars-earth-web/profile/test.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
whatsmars.log4j.logger.path=/data/logs
whatsmars.log4j.logger.level=debug

whatsmars.jdbc.mysql.url=jdbc:mysql://db.hongxi.org:3306/test
whatsmars.jdbc.mysql.username=root
whatsmars.jdbc.mysql.password=n36bxXMnHina

whatsmars.admin.cookie.security.key=H32ClbJteGTjbZSL
whatsmars.admin.cookie.key=_admin_
whatsmars.admin.cookie.domain=127.0.0.1
whatsmars.admin.host.name=127.0.0.1:8080

whatsmars.quartz.cluster.mysql.url=jdbc:mysql://0.0.0.0:3306/quartz
whatsmars.quartz.cluster.mysql.username=root
whatsmars.quartz.cluster.mysql.password=xxxxxxx

whatsmars.activemq.broker.url=tcp://0.0.0.0:61616
whatsmars.activemq.queue.withdraw=_whatsmars_MQ_WITHDRAW.QUEUE

##authenticationDatabase
whatsmars.mongodb.admin.dbname=admin

##gridfs
whatsmars.mongodb.filesystem.dbname=whatsmars-fs
whatsmars.mongodb.filesystem.username=toutiao
whatsmars.mongodb.filesystem.password=toutiao.im
whatsmars.mongodb.filesystem.addresses=0.0.0.0:27017

##common
whatsmars.mongodb.common.dbname=whatsmars-common
whatsmars.mongodb.common.username=toutiao
whatsmars.mongodb.common.password=toutiao.im
whatsmars.mongodb.common.addresses=0.0.0.0:27017

whatsmars.service.email.host.name=smtp.qq.com
whatsmars.service.email.smtp.port=25
whatsmars.service.email.username=toutiao
whatsmars.service.email.password=toutiao
whatsmars.service.email.from.address=[email protected]

0 comments on commit 3d193b2

Please sign in to comment.