From 945aa46d8ac4eba41bddc8a05300c2b03cd89f40 Mon Sep 17 00:00:00 2001 From: ye shuqiu Date: Sun, 25 Jun 2017 16:44:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E4=B8=AA=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E4=BB=8E127.0.0.1=E6=94=B9=E4=B8=BAdbserver=EF=BC=8Crdserver?= =?UTF-8?q?=EF=BC=8Czkserver=EF=BC=8Cmqserver?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++++ .../META-INF/spring/applicationContext-dubbo-consumer.xml | 2 +- .../META-INF/spring/applicationContext-dubbo-provider.xml | 2 +- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../src/main/resources/profiles/dev.properties | 2 +- .../src/main/resources/profiles/prod.properties | 2 +- .../src/main/resources/profiles/test.properties | 2 +- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../src/main/resources/profiles/dev.properties | 4 ++-- .../src/main/resources/profiles/prod.properties | 4 ++-- .../src/main/resources/profiles/test.properties | 4 ++-- .../zheng-cms-dao/src/main/resources/generator.properties | 2 +- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../src/main/resources/profiles/dev.properties | 2 +- .../src/main/resources/profiles/prod.properties | 2 +- .../src/main/resources/profiles/test.properties | 2 +- .../src/main/assembly/conf/dubbo.properties | 2 +- .../META-INF/spring/applicationContext-dubbo-provider.xml | 2 +- .../src/main/resources/profiles/dev.properties | 6 +++--- .../src/main/resources/profiles/prod.properties | 6 +++--- .../src/main/resources/profiles/test.properties | 6 +++--- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../src/main/resources/profiles/dev.properties | 4 ++-- .../src/main/resources/profiles/prod.properties | 4 ++-- .../src/main/resources/profiles/test.properties | 4 ++-- .../src/main/assembly/conf/dubbo.properties | 2 +- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../src/main/resources/profiles/dev.properties | 2 +- .../src/main/resources/profiles/prod.properties | 2 +- .../src/main/resources/profiles/test.properties | 2 +- .../zheng-pay-dao/src/main/resources/generator.properties | 2 +- .../src/main/assembly/conf/dubbo.properties | 2 +- .../META-INF/spring/applicationContext-dubbo-provider.xml | 2 +- .../src/main/resources/profiles/dev.properties | 6 +++--- .../src/main/resources/profiles/prod.properties | 6 +++--- .../src/main/resources/profiles/test.properties | 6 +++--- .../src/main/resources/generator.properties | 2 +- .../src/main/assembly/conf/dubbo.properties | 2 +- .../META-INF/spring/applicationContext-dubbo-provider.xml | 2 +- .../src/main/resources/profiles/dev.properties | 6 +++--- .../src/main/resources/profiles/prod.properties | 6 +++--- .../src/main/resources/profiles/test.properties | 6 +++--- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../zheng-upms-dao/src/main/resources/generator.properties | 2 +- .../src/main/assembly/conf/dubbo.properties | 2 +- .../META-INF/spring/applicationContext-dubbo-provider.xml | 2 +- .../src/main/resources/profiles/dev.properties | 6 +++--- .../src/main/resources/profiles/prod.properties | 6 +++--- .../src/main/resources/profiles/test.properties | 6 +++--- .../main/resources/applicationContext-dubbo-consumer.xml | 2 +- .../src/main/resources/profiles/dev.properties | 2 +- .../src/main/resources/profiles/prod.properties | 2 +- .../src/main/resources/profiles/test.properties | 2 +- .../zheng-wechat-mp-dao/src/main/resources/redis.properties | 2 +- 55 files changed, 88 insertions(+), 84 deletions(-) diff --git a/README.md b/README.md index 00578b55..8c791482 100644 --- a/README.md +++ b/README.md @@ -212,6 +212,10 @@ Spring+SpringMVC+Mybatis框架集成公共模块，包括公共配置、MybatisG - 127.0.0.1 api.zhangshuzheng.cn - 127.0.0.1 oss.zhangshuzheng.cn +- 127.0.0.1   zkserver +- 127.0.0.1   rdserver +- 127.0.0.1   dbserver +- 127.0.0.1   mqserver ### 编译流程 maven编译安装zheng/pom.xml文件即可 diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-consumer.xml b/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-consumer.xml index 2a482df4..f734158b 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-consumer.xml +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-consumer.xml @@ -7,7 +7,7 @@ http://code.alibabatech.com/schema/dubbo http://code.alibabatech.com/schema/dubbo/dubbo.xsd "> - + diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml b/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml index 57c72733..63582dab 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-api/zheng-api-server/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-api/zheng-api-server/src/main/resources/applicationContext-dubbo-consumer.xml index 0f001457..b719a22c 100644 --- a/zheng-api/zheng-api-server/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-api/zheng-api-server/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-api/zheng-api-server/src/main/resources/profiles/dev.properties b/zheng-api/zheng-api-server/src/main/resources/profiles/dev.properties index 08aae205..dabce273 100644 --- a/zheng-api/zheng-api-server/src/main/resources/profiles/dev.properties +++ b/zheng-api/zheng-api-server/src/main/resources/profiles/dev.properties @@ -2,7 +2,7 @@ app.name=zheng-api-server profile.env=dev ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) ##### zheng-admin ##### zheng.admin.version=1.0.0 diff --git a/zheng-api/zheng-api-server/src/main/resources/profiles/prod.properties b/zheng-api/zheng-api-server/src/main/resources/profiles/prod.properties index aed9b1a0..c2f11b96 100644 --- a/zheng-api/zheng-api-server/src/main/resources/profiles/prod.properties +++ b/zheng-api/zheng-api-server/src/main/resources/profiles/prod.properties @@ -2,7 +2,7 @@ app.name=zheng-api-server profile.env=prod ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) ##### zheng-admin ##### zheng.admin.version=1.0.0 diff --git a/zheng-api/zheng-api-server/src/main/resources/profiles/test.properties b/zheng-api/zheng-api-server/src/main/resources/profiles/test.properties index 112cede2..2b752609 100644 --- a/zheng-api/zheng-api-server/src/main/resources/profiles/test.properties +++ b/zheng-api/zheng-api-server/src/main/resources/profiles/test.properties @@ -2,7 +2,7 @@ app.name=zheng-api-server profile.env=test ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) ##### zheng-admin ##### zheng.admin.version=1.0.0 diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml index 272685f1..448fae64 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties index 84c0f1a0..bba86ada 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties @@ -2,7 +2,7 @@ app.name=zheng-cms-admin profile.env=dev ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 @@ -11,7 +11,7 @@ master.redis.max_wait=10000 master.redis.timeout=10000 ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) ##### zheng-admin ##### zheng.admin.version=1.0.0 diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties index 5f0000bd..d403c93c 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties @@ -2,7 +2,7 @@ app.name=zheng-cms-admin profile.env=prod ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 @@ -11,7 +11,7 @@ master.redis.max_wait=10000 master.redis.timeout=10000 ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) ##### zheng-admin ##### zheng.admin.version=1.0.0 diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties index de874695..64505dc7 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties @@ -2,7 +2,7 @@ app.name=zheng-cms-admin profile.env=test ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 @@ -11,7 +11,7 @@ master.redis.max_wait=10000 master.redis.timeout=10000 ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) ##### zheng-admin ##### zheng.admin.version=1.0.0 diff --git a/zheng-cms/zheng-cms-dao/src/main/resources/generator.properties b/zheng-cms/zheng-cms-dao/src/main/resources/generator.properties index 2f171bc4..33284660 100644 --- a/zheng-cms/zheng-cms-dao/src/main/resources/generator.properties +++ b/zheng-cms/zheng-cms-dao/src/main/resources/generator.properties @@ -1,4 +1,4 @@ generator.jdbc.driver=com.mysql.jdbc.Driver -generator.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +generator.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true generator.jdbc.username=root generator.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== \ No newline at end of file diff --git a/zheng-cms/zheng-cms-job/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-cms/zheng-cms-job/src/main/resources/applicationContext-dubbo-consumer.xml index bbf61d07..e7405117 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-cms/zheng-cms-job/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-cms/zheng-cms-job/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-job/src/main/resources/profiles/dev.properties index 43234546..c58b03e3 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/profiles/dev.properties +++ b/zheng-cms/zheng-cms-job/src/main/resources/profiles/dev.properties @@ -2,4 +2,4 @@ app.name=zheng-cms-job profile.env=dev ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-cms/zheng-cms-job/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-job/src/main/resources/profiles/prod.properties index 1bda9195..269f779d 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/profiles/prod.properties +++ b/zheng-cms/zheng-cms-job/src/main/resources/profiles/prod.properties @@ -2,4 +2,4 @@ app.name=zheng-cms-job profile.env=prod ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-cms/zheng-cms-job/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-job/src/main/resources/profiles/test.properties index a66e5305..3c33be9c 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/profiles/test.properties +++ b/zheng-cms/zheng-cms-job/src/main/resources/profiles/test.properties @@ -2,4 +2,4 @@ app.name=zheng-cms-job profile.env=test ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/assembly/conf/dubbo.properties b/zheng-cms/zheng-cms-rpc-service/src/main/assembly/conf/dubbo.properties index 6553b51c..cbb71ff8 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/assembly/conf/dubbo.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/assembly/conf/dubbo.properties @@ -1,3 +1,3 @@ #dubbo.application.name=zheng-cms-rpc-service -#dubbo.registry.address=zookeeper://127.0.0.1:2181 +#dubbo.registry.address=zookeeper://zkserver:2181 #dubbo.protocol.port=20882 \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml b/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml index 989f2d37..f1bd6007 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/dev.properties index 082a90a8..65240b1f 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/dev.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/dev.properties @@ -3,16 +3,16 @@ profile.env=dev ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/prod.properties index 6b42bc81..51fc9aa0 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/prod.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/prod.properties @@ -3,16 +3,16 @@ profile.env=prod ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/test.properties index 8dd489bc..6610ecbd 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/test.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/test.properties @@ -3,16 +3,16 @@ profile.env=test ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-cms/zheng-cms-search/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-cms/zheng-cms-search/src/main/resources/applicationContext-dubbo-consumer.xml index 247bf96b..72d4a108 100644 --- a/zheng-cms/zheng-cms-search/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-cms/zheng-cms-search/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml index 55274a60..d9e9ee2e 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-cms/zheng-cms-web/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties index 713dec81..40e9fec4 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties +++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/dev.properties @@ -3,7 +3,7 @@ profile.env=dev zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 @@ -12,4 +12,4 @@ master.redis.max_wait=10000 master.redis.timeout=10000 ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties index 5390a823..8c0262d1 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties +++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/prod.properties @@ -3,7 +3,7 @@ profile.env=prod zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 @@ -12,4 +12,4 @@ master.redis.max_wait=10000 master.redis.timeout=10000 ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties index 16f7332e..30c0f359 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties +++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/test.properties @@ -3,7 +3,7 @@ profile.env=test zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 @@ -12,4 +12,4 @@ master.redis.max_wait=10000 master.redis.timeout=10000 ##### activeMq ##### -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file +AvtiveMQ.brokerURL=failover:(tcp://mqserver:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-demo/zheng-demo-rpc-service/src/main/assembly/conf/dubbo.properties b/zheng-demo/zheng-demo-rpc-service/src/main/assembly/conf/dubbo.properties index 34d80af5..b8984b0c 100644 --- a/zheng-demo/zheng-demo-rpc-service/src/main/assembly/conf/dubbo.properties +++ b/zheng-demo/zheng-demo-rpc-service/src/main/assembly/conf/dubbo.properties @@ -1,3 +1,3 @@ #dubbo.application.name=zheng-pay-rpc-service -#dubbo.registry.address=zookeeper://127.0.0.1:2181 +#dubbo.registry.address=zookeeper://zkserver:2181 #dubbo.protocol.port=20883 \ No newline at end of file diff --git a/zheng-demo/zheng-demo-web/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-demo/zheng-demo-web/src/main/resources/applicationContext-dubbo-consumer.xml index f70dce3d..3026d38a 100644 --- a/zheng-demo/zheng-demo-web/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-demo/zheng-demo-web/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-oss/zheng-oss-admin/src/main/resources/profiles/dev.properties b/zheng-oss/zheng-oss-admin/src/main/resources/profiles/dev.properties index f0e8c27f..c5eb7929 100644 --- a/zheng-oss/zheng-oss-admin/src/main/resources/profiles/dev.properties +++ b/zheng-oss/zheng-oss-admin/src/main/resources/profiles/dev.properties @@ -3,7 +3,7 @@ profile.env=dev zheng.admin.version=1.0.0 ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-oss/zheng-oss-admin/src/main/resources/profiles/prod.properties b/zheng-oss/zheng-oss-admin/src/main/resources/profiles/prod.properties index 50c091a4..08c412ec 100644 --- a/zheng-oss/zheng-oss-admin/src/main/resources/profiles/prod.properties +++ b/zheng-oss/zheng-oss-admin/src/main/resources/profiles/prod.properties @@ -3,7 +3,7 @@ profile.env=prod zheng.admin.version=1.0.0 ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-oss/zheng-oss-admin/src/main/resources/profiles/test.properties b/zheng-oss/zheng-oss-admin/src/main/resources/profiles/test.properties index 9c3be7cf..86717265 100644 --- a/zheng-oss/zheng-oss-admin/src/main/resources/profiles/test.properties +++ b/zheng-oss/zheng-oss-admin/src/main/resources/profiles/test.properties @@ -3,7 +3,7 @@ profile.env=test zheng.admin.version=1.0.0 ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-pay/zheng-pay-dao/src/main/resources/generator.properties b/zheng-pay/zheng-pay-dao/src/main/resources/generator.properties index 2f171bc4..33284660 100644 --- a/zheng-pay/zheng-pay-dao/src/main/resources/generator.properties +++ b/zheng-pay/zheng-pay-dao/src/main/resources/generator.properties @@ -1,4 +1,4 @@ generator.jdbc.driver=com.mysql.jdbc.Driver -generator.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +generator.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true generator.jdbc.username=root generator.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/assembly/conf/dubbo.properties b/zheng-pay/zheng-pay-rpc-service/src/main/assembly/conf/dubbo.properties index 34d80af5..b8984b0c 100644 --- a/zheng-pay/zheng-pay-rpc-service/src/main/assembly/conf/dubbo.properties +++ b/zheng-pay/zheng-pay-rpc-service/src/main/assembly/conf/dubbo.properties @@ -1,3 +1,3 @@ #dubbo.application.name=zheng-pay-rpc-service -#dubbo.registry.address=zookeeper://127.0.0.1:2181 +#dubbo.registry.address=zookeeper://zkserver:2181 #dubbo.protocol.port=20883 \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml b/zheng-pay/zheng-pay-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml index 6d82c63c..b44fb21a 100644 --- a/zheng-pay/zheng-pay-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties index 8ed52a37..a915221e 100644 --- a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/dev.properties @@ -3,16 +3,16 @@ profile.env=dev ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties index 74553323..4f9b509d 100644 --- a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties @@ -3,16 +3,16 @@ profile.env=prod ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties index acafc4b9..33342e32 100644 --- a/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties @@ -3,16 +3,16 @@ profile.env=test ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-ucenter/zheng-ucenter-dao/src/main/resources/generator.properties b/zheng-ucenter/zheng-ucenter-dao/src/main/resources/generator.properties index 2f171bc4..33284660 100644 --- a/zheng-ucenter/zheng-ucenter-dao/src/main/resources/generator.properties +++ b/zheng-ucenter/zheng-ucenter-dao/src/main/resources/generator.properties @@ -1,4 +1,4 @@ generator.jdbc.driver=com.mysql.jdbc.Driver -generator.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +generator.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true generator.jdbc.username=root generator.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/assembly/conf/dubbo.properties b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/assembly/conf/dubbo.properties index 7c6ed723..b3a2f30a 100644 --- a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/assembly/conf/dubbo.properties +++ b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/assembly/conf/dubbo.properties @@ -1,3 +1,3 @@ #dubbo.application.name=zheng-ucenter-rpc-service -#dubbo.registry.address=zookeeper://127.0.0.1:2181 +#dubbo.registry.address=zookeeper://zkserver:2181 #dubbo.protocol.port=20884 \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml index 9b6d4ea2..06a23779 100644 --- a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml +++ b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/dev.properties b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/dev.properties index 07740c63..438460ad 100644 --- a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/dev.properties +++ b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/dev.properties @@ -3,16 +3,16 @@ profile.env=dev ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/prod.properties b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/prod.properties index 806699e1..579c0b61 100644 --- a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/prod.properties +++ b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/prod.properties @@ -3,16 +3,16 @@ profile.env=prod ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/test.properties b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/test.properties index 19bfdc66..5fd86eca 100644 --- a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/test.properties +++ b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/test.properties @@ -3,16 +3,16 @@ profile.env=test ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-ucenter/zheng-ucenter-web/src/main/resources/applicationContext-dubbo-consumer.xml index 2b6b0d14..f9a53668 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-upms/zheng-upms-dao/src/main/resources/generator.properties b/zheng-upms/zheng-upms-dao/src/main/resources/generator.properties index 2f171bc4..33284660 100644 --- a/zheng-upms/zheng-upms-dao/src/main/resources/generator.properties +++ b/zheng-upms/zheng-upms-dao/src/main/resources/generator.properties @@ -1,4 +1,4 @@ generator.jdbc.driver=com.mysql.jdbc.Driver -generator.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +generator.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true generator.jdbc.username=root generator.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== \ No newline at end of file diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/assembly/conf/dubbo.properties b/zheng-upms/zheng-upms-rpc-service/src/main/assembly/conf/dubbo.properties index c26ef3a7..0b4761ef 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/assembly/conf/dubbo.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/assembly/conf/dubbo.properties @@ -1,3 +1,3 @@ #dubbo.application.name=zheng-upms-rpc-service -#dubbo.registry.address=zookeeper://127.0.0.1:2181 +#dubbo.registry.address=zookeeper://zkserver:2181 #dubbo.protocol.port=20881 \ No newline at end of file diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml b/zheng-upms/zheng-upms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml index 7a993bbf..a94d6d36 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/META-INF/spring/applicationContext-dubbo-provider.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/dev.properties b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/dev.properties index 6d1c5eba..e3e7079e 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/dev.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/dev.properties @@ -3,16 +3,16 @@ profile.env=dev ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/prod.properties b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/prod.properties index 0321b191..b95f8763 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/prod.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/prod.properties @@ -3,16 +3,16 @@ profile.env=prod ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/test.properties b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/test.properties index 387938dd..ebe4a269 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/test.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/test.properties @@ -3,16 +3,16 @@ profile.env=test ##### jdbc ##### datasource.master.jdbc.driver=com.mysql.jdbc.Driver -datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.master.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.master.jdbc.username=root datasource.master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== datasource.slave.jdbc.driver=com.mysql.jdbc.Driver -datasource.slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true +datasource.slave.jdbc.url=jdbc\:mysql\://dbserver\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true datasource.slave.jdbc.username=root datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-dubbo-consumer.xml index e209e349..a5b7ee3a 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-upms/zheng-upms-server/src/main/resources/applicationContext-dubbo-consumer.xml @@ -9,7 +9,7 @@ - + diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties index ee1fecab..2393eac4 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/dev.properties @@ -2,7 +2,7 @@ app.name=zheng-upms-server profile.env=dev ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties index e303a1de..c48be091 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/prod.properties @@ -2,7 +2,7 @@ app.name=zheng-upms-server profile.env=prod ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties index d53452f3..a604450c 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/test.properties @@ -2,7 +2,7 @@ app.name=zheng-upms-server profile.env=test ##### redis ##### -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500 diff --git a/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/redis.properties b/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/redis.properties index 2dad97d0..377a89a1 100644 --- a/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/redis.properties +++ b/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/redis.properties @@ -1,4 +1,4 @@ -master.redis.ip=127.0.0.1 +master.redis.ip=rdserver master.redis.port=6379 master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== master.redis.max_active=500