diff --git a/whatsmars-earth/pom.xml b/whatsmars-earth/pom.xml index fe26daa2..93ae7672 100644 --- a/whatsmars-earth/pom.xml +++ b/whatsmars-earth/pom.xml @@ -25,10 +25,6 @@ whatsmars-earth-common - - ${basedir} - - diff --git a/whatsmars-earth/profile/production.properties b/whatsmars-earth/profile/production.properties deleted file mode 100644 index bf32dd9a..00000000 --- a/whatsmars-earth/profile/production.properties +++ /dev/null @@ -1,13 +0,0 @@ -whatsmars.jdbc.mysql.url=jdbc:mysql://db.hongxi.org:3306/test -whatsmars.jdbc.mysql.username=root -whatsmars.jdbc.mysql.password=n36bxXMnHina - -##��ҵ���� -bjxizhan.quartz.cluster.mysql.url=jdbc:mysql://255.254.253.252:3306/quartz -bjxizhan.quartz.cluster.mysql.username=root -bjxizhan.quartz.cluster.mysql.password=xxxxxxx - -##activemq -bjxizhan.activemq.broker.url=tcp://255.254.253.252:61616 -##���� -bjxizhan.activemq.queue.withdraw=_bjxizhan_MQ_WITHDRAW.QUEUE \ No newline at end of file diff --git a/whatsmars-earth/whatsmars-earth-support-web/pom.xml b/whatsmars-earth/whatsmars-earth-support-web/pom.xml index 919ed7cd..6cae4d67 100644 --- a/whatsmars-earth/whatsmars-earth-support-web/pom.xml +++ b/whatsmars-earth/whatsmars-earth-support-web/pom.xml @@ -113,7 +113,7 @@ - ../profile/development.properties + profile/development.properties @@ -121,7 +121,7 @@ test - ../profile/test.properties + profile/test.properties @@ -129,7 +129,7 @@ production - ../profile/production.properties + profile/production.properties diff --git a/whatsmars-earth/profile/development.properties b/whatsmars-earth/whatsmars-earth-support-web/profile/development.properties similarity index 92% rename from whatsmars-earth/profile/development.properties rename to whatsmars-earth/whatsmars-earth-support-web/profile/development.properties index 4c13c476..bd08e063 100644 --- a/whatsmars-earth/profile/development.properties +++ b/whatsmars-earth/whatsmars-earth-support-web/profile/development.properties @@ -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 @@ -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 diff --git a/whatsmars-earth/whatsmars-earth-support-web/profile/production.properties b/whatsmars-earth/whatsmars-earth-support-web/profile/production.properties new file mode 100644 index 00000000..bd08e063 --- /dev/null +++ b/whatsmars-earth/whatsmars-earth-support-web/profile/production.properties @@ -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=service@toutiao.im \ No newline at end of file diff --git a/whatsmars-earth/profile/test.properties b/whatsmars-earth/whatsmars-earth-support-web/profile/test.properties similarity index 92% rename from whatsmars-earth/profile/test.properties rename to whatsmars-earth/whatsmars-earth-support-web/profile/test.properties index 4c13c476..bd08e063 100644 --- a/whatsmars-earth/profile/test.properties +++ b/whatsmars-earth/whatsmars-earth-support-web/profile/test.properties @@ -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 @@ -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 diff --git a/whatsmars-earth/whatsmars-earth-web/pom.xml b/whatsmars-earth/whatsmars-earth-web/pom.xml index 3d82a43c..a7e5a528 100644 --- a/whatsmars-earth/whatsmars-earth-web/pom.xml +++ b/whatsmars-earth/whatsmars-earth-web/pom.xml @@ -109,7 +109,7 @@ - ../profile/development.properties + profile/development.properties @@ -117,7 +117,7 @@ test - ../profile/test.properties + profile/test.properties @@ -125,7 +125,7 @@ production - ../profile/production.properties + profile/production.properties diff --git a/whatsmars-earth/whatsmars-earth-web/profile/development.properties b/whatsmars-earth/whatsmars-earth-web/profile/development.properties new file mode 100644 index 00000000..bd08e063 --- /dev/null +++ b/whatsmars-earth/whatsmars-earth-web/profile/development.properties @@ -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=service@toutiao.im \ No newline at end of file diff --git a/whatsmars-earth/whatsmars-earth-web/profile/production.properties b/whatsmars-earth/whatsmars-earth-web/profile/production.properties new file mode 100644 index 00000000..bd08e063 --- /dev/null +++ b/whatsmars-earth/whatsmars-earth-web/profile/production.properties @@ -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=service@toutiao.im \ No newline at end of file diff --git a/whatsmars-earth/whatsmars-earth-web/profile/test.properties b/whatsmars-earth/whatsmars-earth-web/profile/test.properties new file mode 100644 index 00000000..bd08e063 --- /dev/null +++ b/whatsmars-earth/whatsmars-earth-web/profile/test.properties @@ -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=service@toutiao.im \ No newline at end of file