From dd89c86ea88aea18f5417c581994278151f74e63 Mon Sep 17 00:00:00 2001 From: shuzheng <469741414@qq.com> Date: Tue, 13 Jun 2017 14:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Djdbc=E5=A4=9A=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/jdbc.properties | 16 ++++++++-------- .../src/main/resources/profiles/dev.properties | 16 ++++++++-------- .../src/main/resources/profiles/prod.properties | 16 ++++++++-------- .../src/main/resources/profiles/test.properties | 16 ++++++++-------- .../src/main/resources/jdbc.properties | 16 ++++++++-------- .../src/main/resources/profiles/dev.properties | 16 ++++++++-------- .../src/main/resources/profiles/prod.properties | 16 ++++++++-------- .../src/main/resources/profiles/test.properties | 16 ++++++++-------- .../src/main/resources/jdbc.properties | 16 ++++++++-------- .../src/main/resources/profiles/dev.properties | 16 ++++++++-------- .../src/main/resources/profiles/prod.properties | 16 ++++++++-------- .../src/main/resources/profiles/test.properties | 16 ++++++++-------- .../src/main/resources/jdbc.properties | 16 ++++++++-------- .../src/main/resources/profiles/dev.properties | 16 ++++++++-------- .../src/main/resources/profiles/prod.properties | 16 ++++++++-------- .../src/main/resources/profiles/test.properties | 16 ++++++++-------- .../src/main/resources/jdbc.properties | 16 ++++++++-------- 17 files changed, 136 insertions(+), 136 deletions(-) diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/jdbc.properties b/zheng-cms/zheng-cms-rpc-service/src/main/resources/jdbc.properties index 58e9209c..8fb25d19 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/jdbc.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/jdbc.properties @@ -1,8 +1,8 @@ -master.jdbc.driver=${master.jdbc.driver} -master.jdbc.url=${master.jdbc.url} -master.jdbc.username=${master.jdbc.username} -master.jdbc.password=${master.jdbc.password} -slave.jdbc.driver=${slave.jdbc.driver} -slave.jdbc.url=${slave.jdbc.url} -slave.jdbc.username=${slave.jdbc.username} -slave.jdbc.password=${slave.jdbc.password} \ No newline at end of file +master.jdbc.driver=${datasource.master.jdbc.driver} +master.jdbc.url=${datasource.master.jdbc.url} +master.jdbc.username=${datasource.master.jdbc.username} +master.jdbc.password=${datasource.master.jdbc.password} +slave.jdbc.driver=${datasource.slave.jdbc.driver} +slave.jdbc.url=${datasource.slave.jdbc.url} +slave.jdbc.username=${datasource.slave.jdbc.username} +slave.jdbc.password=${datasource.slave.jdbc.password} \ No newline at end of file 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 f4ebb8d6..082a90a8 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 @@ -2,14 +2,14 @@ app.name=zheng-cms-rpc-service profile.env=dev ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 00d6af8d..6b42bc81 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 @@ -2,14 +2,14 @@ app.name=zheng-cms-rpc-service profile.env=prod ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 79a93894..8dd489bc 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 @@ -2,14 +2,14 @@ app.name=zheng-cms-rpc-service profile.env=test ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties index 58e9209c..8fb25d19 100644 --- a/zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/jdbc.properties @@ -1,8 +1,8 @@ -master.jdbc.driver=${master.jdbc.driver} -master.jdbc.url=${master.jdbc.url} -master.jdbc.username=${master.jdbc.username} -master.jdbc.password=${master.jdbc.password} -slave.jdbc.driver=${slave.jdbc.driver} -slave.jdbc.url=${slave.jdbc.url} -slave.jdbc.username=${slave.jdbc.username} -slave.jdbc.password=${slave.jdbc.password} \ No newline at end of file +master.jdbc.driver=${datasource.master.jdbc.driver} +master.jdbc.url=${datasource.master.jdbc.url} +master.jdbc.username=${datasource.master.jdbc.username} +master.jdbc.password=${datasource.master.jdbc.password} +slave.jdbc.driver=${datasource.slave.jdbc.driver} +slave.jdbc.url=${datasource.slave.jdbc.url} +slave.jdbc.username=${datasource.slave.jdbc.username} +slave.jdbc.password=${datasource.slave.jdbc.password} \ No newline at end of file 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 dabf4015..8ed52a37 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 @@ -2,14 +2,14 @@ app.name=zheng-pay-rpc-service profile.env=dev ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 c66291eb..74553323 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 @@ -2,14 +2,14 @@ app.name=zheng-pay-rpc-service profile.env=prod ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 08a3f8fa..acafc4b9 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 @@ -2,14 +2,14 @@ app.name=zheng-pay-rpc-service profile.env=test ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 diff --git a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/jdbc.properties b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/jdbc.properties index 58e9209c..8fb25d19 100644 --- a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/jdbc.properties +++ b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/jdbc.properties @@ -1,8 +1,8 @@ -master.jdbc.driver=${master.jdbc.driver} -master.jdbc.url=${master.jdbc.url} -master.jdbc.username=${master.jdbc.username} -master.jdbc.password=${master.jdbc.password} -slave.jdbc.driver=${slave.jdbc.driver} -slave.jdbc.url=${slave.jdbc.url} -slave.jdbc.username=${slave.jdbc.username} -slave.jdbc.password=${slave.jdbc.password} \ No newline at end of file +master.jdbc.driver=${datasource.master.jdbc.driver} +master.jdbc.url=${datasource.master.jdbc.url} +master.jdbc.username=${datasource.master.jdbc.username} +master.jdbc.password=${datasource.master.jdbc.password} +slave.jdbc.driver=${datasource.slave.jdbc.driver} +slave.jdbc.url=${datasource.slave.jdbc.url} +slave.jdbc.username=${datasource.slave.jdbc.username} +slave.jdbc.password=${datasource.slave.jdbc.password} \ No newline at end of file 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 44bc6f4b..07740c63 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 @@ -2,14 +2,14 @@ app.name=zheng-ucenter-rpc-service profile.env=dev ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 afb804e8..806699e1 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 @@ -2,14 +2,14 @@ app.name=zheng-ucenter-rpc-service profile.env=prod ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 4ec1c396..19bfdc66 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 @@ -2,14 +2,14 @@ app.name=zheng-ucenter-rpc-service profile.env=test ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/jdbc.properties b/zheng-upms/zheng-upms-rpc-service/src/main/resources/jdbc.properties index 58e9209c..8fb25d19 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/jdbc.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/jdbc.properties @@ -1,8 +1,8 @@ -master.jdbc.driver=${master.jdbc.driver} -master.jdbc.url=${master.jdbc.url} -master.jdbc.username=${master.jdbc.username} -master.jdbc.password=${master.jdbc.password} -slave.jdbc.driver=${slave.jdbc.driver} -slave.jdbc.url=${slave.jdbc.url} -slave.jdbc.username=${slave.jdbc.username} -slave.jdbc.password=${slave.jdbc.password} \ No newline at end of file +master.jdbc.driver=${datasource.master.jdbc.driver} +master.jdbc.url=${datasource.master.jdbc.url} +master.jdbc.username=${datasource.master.jdbc.username} +master.jdbc.password=${datasource.master.jdbc.password} +slave.jdbc.driver=${datasource.slave.jdbc.driver} +slave.jdbc.url=${datasource.slave.jdbc.url} +slave.jdbc.username=${datasource.slave.jdbc.username} +slave.jdbc.password=${datasource.slave.jdbc.password} \ No newline at end of file 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 068118e4..6d1c5eba 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 @@ -2,14 +2,14 @@ app.name=zheng-upms-rpc-service profile.env=dev ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 2aaeb35c..0321b191 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 @@ -2,14 +2,14 @@ app.name=zheng-upms-rpc-service profile.env=prod ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 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 4e5a50f6..387938dd 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 @@ -2,14 +2,14 @@ app.name=zheng-upms-rpc-service profile.env=test ##### jdbc ##### -master.jdbc.driver=com.mysql.jdbc.Driver -master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -master.jdbc.username=root -master.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== -slave.jdbc.driver=com.mysql.jdbc.Driver -slave.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true -slave.jdbc.username=root -slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== +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.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.username=root +datasource.slave.jdbc.password=rWd3Hb+AzNg3IXF1b5vD+g== ##### redis ##### master.redis.ip=127.0.0.1 diff --git a/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/jdbc.properties b/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/jdbc.properties index 58e9209c..8fb25d19 100644 --- a/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/jdbc.properties +++ b/zheng-wechat/zheng-wechat-mp/zheng-wechat-mp-dao/src/main/resources/jdbc.properties @@ -1,8 +1,8 @@ -master.jdbc.driver=${master.jdbc.driver} -master.jdbc.url=${master.jdbc.url} -master.jdbc.username=${master.jdbc.username} -master.jdbc.password=${master.jdbc.password} -slave.jdbc.driver=${slave.jdbc.driver} -slave.jdbc.url=${slave.jdbc.url} -slave.jdbc.username=${slave.jdbc.username} -slave.jdbc.password=${slave.jdbc.password} \ No newline at end of file +master.jdbc.driver=${datasource.master.jdbc.driver} +master.jdbc.url=${datasource.master.jdbc.url} +master.jdbc.username=${datasource.master.jdbc.username} +master.jdbc.password=${datasource.master.jdbc.password} +slave.jdbc.driver=${datasource.slave.jdbc.driver} +slave.jdbc.url=${datasource.slave.jdbc.url} +slave.jdbc.username=${datasource.slave.jdbc.username} +slave.jdbc.password=${datasource.slave.jdbc.password} \ No newline at end of file