From 9e9860a9a6efa50bb56ba3126341132b121f07f7 Mon Sep 17 00:00:00 2001 From: shuzheng <469741414@qq.com> Date: Mon, 12 Jun 2017 20:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E5=A4=9A=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config.properties | 4 +- .../main/resources/profiles/dev.properties | 28 +++++++++++-- .../main/resources/profiles/prod.properties | 28 +++++++++++-- .../main/resources/profiles/test.properties | 28 +++++++++++-- .../resources/zheng-admin-client.properties | 1 + .../resources/zheng-upms-client.properties | 24 +++++------ .../src/main/resources/config.properties | 4 +- .../main/resources/profiles/dev.properties | 40 +++++++++++++++++-- .../main/resources/profiles/prod.properties | 40 +++++++++++++++++-- .../main/resources/profiles/test.properties | 40 +++++++++++++++++-- .../src/main/resources/redis.properties | 14 +++---- .../resources/zheng-admin-client.properties | 1 + .../resources/zheng-oss-client.properties | 4 +- .../resources/zheng-upms-client.properties | 24 +++++------ .../src/main/resources/config.properties | 3 +- .../main/resources/profiles/dev.properties | 3 +- .../main/resources/profiles/prod.properties | 3 +- .../main/resources/profiles/test.properties | 3 +- .../src/main/resources/jdbc.properties | 17 ++++---- .../main/resources/profiles/dev.properties | 21 +++++++++- .../main/resources/profiles/prod.properties | 21 +++++++++- .../main/resources/profiles/test.properties | 21 +++++++++- .../src/main/resources/redis.properties | 14 +++---- .../web/interceptor/CmsWebInterceptor.java | 2 +- .../src/main/resources/config.properties | 5 ++- .../main/resources/profiles/dev.properties | 14 ++++++- .../main/resources/profiles/prod.properties | 14 ++++++- .../main/resources/profiles/test.properties | 14 ++++++- .../src/main/resources/redis.properties | 14 +++---- .../src/main/resources/springMVC-servlet.xml | 2 +- .../com/zheng/common/util/ZhengAdminUtil.java | 2 +- .../src/main/resources/config.properties | 4 +- .../main/resources/profiles/dev.properties | 9 ++++- .../main/resources/profiles/prod.properties | 8 +++- .../main/resources/profiles/test.properties | 9 ++++- .../src/main/resources/springMVC-servlet.xml | 2 +- .../resources/zheng-oss-client.properties | 4 +- .../src/main/resources/config.properties | 3 +- .../main/resources/profiles/dev.properties | 30 +++++++++++++- .../main/resources/profiles/prod.properties | 30 +++++++++++++- .../main/resources/profiles/test.properties | 30 +++++++++++++- .../src/main/resources/redis.properties | 14 +++---- .../resources/zheng-admin-client.properties | 1 + .../resources/zheng-upms-client.properties | 24 +++++------ .../src/main/resources/config.properties | 4 +- .../main/resources/profiles/dev.properties | 9 +++-- .../main/resources/profiles/prod.properties | 9 +++-- .../main/resources/profiles/test.properties | 9 +++-- .../src/main/resources/springMVC-servlet.xml | 2 +- .../resources/zheng-oss-client.properties | 4 +- .../src/main/resources/jdbc.properties | 17 ++++---- .../main/resources/profiles/dev.properties | 21 +++++++++- .../main/resources/profiles/prod.properties | 21 +++++++++- .../main/resources/profiles/test.properties | 21 +++++++++- .../src/main/resources/redis.properties | 14 +++---- .../src/main/resources/config.properties | 21 +++++----- .../main/resources/profiles/dev.properties | 17 +++++++- .../main/resources/profiles/prod.properties | 17 +++++++- .../main/resources/profiles/test.properties | 17 +++++++- .../resources/zheng-oss-client.properties | 4 +- .../src/main/resources/jdbc.properties | 17 ++++---- .../main/resources/profiles/dev.properties | 21 +++++++++- .../main/resources/profiles/prod.properties | 21 +++++++++- .../main/resources/profiles/test.properties | 21 +++++++++- .../src/main/resources/redis.properties | 14 +++---- .../src/main/resources/config.properties | 2 +- .../main/resources/profiles/dev.properties | 2 +- .../main/resources/profiles/prod.properties | 2 +- .../main/resources/profiles/test.properties | 2 +- .../src/main/resources/springMVC-servlet.xml | 2 +- .../filter/UpmsAuthenticationFilter.java | 10 ++--- .../upms/client/shiro/realm/UpmsRealm.java | 2 +- .../resources/applicationContext-shiro.xml | 12 +++--- .../upms/common/constant/UpmsConstant.java | 2 +- .../src/main/resources/jdbc.properties | 17 ++++---- .../main/resources/profiles/dev.properties | 21 +++++++++- .../main/resources/profiles/prod.properties | 21 +++++++++- .../main/resources/profiles/test.properties | 21 +++++++++- .../src/main/resources/redis.properties | 14 +++---- .../server/interceptor/UpmsInterceptor.java | 2 +- .../src/main/resources/config.properties | 3 +- .../main/resources/profiles/dev.properties | 32 ++++++++++++++- .../main/resources/profiles/prod.properties | 30 +++++++++++++- .../main/resources/profiles/test.properties | 30 +++++++++++++- .../src/main/resources/redis.properties | 14 +++---- .../resources/zheng-admin-client.properties | 1 + .../resources/zheng-oss-client.properties | 4 +- .../resources/zheng-upms-client.properties | 20 +++++----- .../src/main/resources/jdbc.properties | 17 ++++---- 89 files changed, 937 insertions(+), 268 deletions(-) create mode 100644 zheng-api/zheng-api-server/src/main/resources/zheng-admin-client.properties create mode 100644 zheng-cms/zheng-cms-admin/src/main/resources/zheng-admin-client.properties create mode 100644 zheng-oss/zheng-oss-admin/src/main/resources/zheng-admin-client.properties create mode 100644 zheng-upms/zheng-upms-server/src/main/resources/zheng-admin-client.properties diff --git a/zheng-api/zheng-api-server/src/main/resources/config.properties b/zheng-api/zheng-api-server/src/main/resources/config.properties index bff62b1e..9fb4f007 100644 --- a/zheng-api/zheng-api-server/src/main/resources/config.properties +++ b/zheng-api/zheng-api-server/src/main/resources/config.properties @@ -1,5 +1,5 @@ app.name=${app.name} env=${profile.env} -zheng-admin.version=${zheng-admin.version} -### activeMq + +##### activeMq ##### AvtiveMQ.brokerURL=${AvtiveMQ.brokerURL} \ No newline at end of file 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 9a1f112a..08aae205 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 @@ -1,5 +1,27 @@ app.name=zheng-api-server profile.env=dev -zheng-admin.version=1.0.0 -### activeMq -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file + +##### activeMq ##### +AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-api-server +zheng.upms.appSecret= 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 20148f2d..aed9b1a0 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 @@ -1,5 +1,27 @@ app.name=zheng-api-server profile.env=prod -zheng-admin.version=1.0.0 -### activeMq -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file + +##### activeMq ##### +AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-api-server +zheng.upms.appSecret= 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 ff275f92..112cede2 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 @@ -1,5 +1,27 @@ app.name=zheng-api-server profile.env=test -zheng-admin.version=1.0.0 -### activeMq -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file + +##### activeMq ##### +AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-api-server +zheng.upms.appSecret= diff --git a/zheng-api/zheng-api-server/src/main/resources/zheng-admin-client.properties b/zheng-api/zheng-api-server/src/main/resources/zheng-admin-client.properties new file mode 100644 index 00000000..d57f1d40 --- /dev/null +++ b/zheng-api/zheng-api-server/src/main/resources/zheng-admin-client.properties @@ -0,0 +1 @@ +zheng.admin.version=${zheng.admin.version} \ No newline at end of file diff --git a/zheng-api/zheng-api-server/src/main/resources/zheng-upms-client.properties b/zheng-api/zheng-api-server/src/main/resources/zheng-upms-client.properties index 87ddc4dc..418b5838 100644 --- a/zheng-api/zheng-api-server/src/main/resources/zheng-upms-client.properties +++ b/zheng-api/zheng-api-server/src/main/resources/zheng-upms-client.properties @@ -1,17 +1,17 @@ # \u7EC8\u7AEF\u7C7B\u578B -upms.type=client +zheng.upms.type=${zheng.upms.type} # \u7EC8\u7AEFsession\u540D\u79F0 -upms.session.id=zheng-upms-client-session-id -# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 -sso.server.url=http://upms.zhangshuzheng.cn:1111 -# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 -upms.successUrl=/manage/index -# \u672A\u6388\u6743\u5730\u5740 -upms.unauthorizedUrl=/403 +zheng.upms.session.id=${zheng.upms.session.id} # \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 -upms.session.timeout=1800000 +zheng.upms.session.timeout=${zheng.upms.session.timeout} +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=${zheng.upms.sso.server.url} +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=${zheng.upms.successUrl} +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=${zheng.upms.unauthorizedUrl} # \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 -upms.rememberMe.timeout=2592000 +zheng.upms.rememberMe.timeout=${zheng.upms.rememberMe.timeout} # \u5B50\u7CFB\u7EDF -appID=zheng-api-server -appSecret= +zheng.upms.appID=${zheng.upms.appID} +zheng.upms.appSecret=${zheng.upms.appSecret} diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties index bff62b1e..9fb4f007 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties @@ -1,5 +1,5 @@ app.name=${app.name} env=${profile.env} -zheng-admin.version=${zheng-admin.version} -### activeMq + +##### activeMq ##### AvtiveMQ.brokerURL=${AvtiveMQ.brokerURL} \ No newline at end of file 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 762ec6f1..84c0f1a0 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 @@ -1,5 +1,39 @@ app.name=zheng-cms-admin profile.env=dev -zheng-admin.version=1.0.0 -### activeMq -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### activeMq ##### +AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-cms-admin +zheng.upms.appSecret= + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file 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 9abd612e..5f0000bd 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 @@ -1,5 +1,39 @@ app.name=zheng-cms-admin profile.env=prod -zheng-admin.version=1.0.0 -### activeMq -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### activeMq ##### +AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-cms-admin +zheng.upms.appSecret= + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file 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 ad4f4b81..de874695 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 @@ -1,5 +1,39 @@ app.name=zheng-cms-admin profile.env=test -zheng-admin.version=1.0.0 -### activeMq -AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### activeMq ##### +AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-cms-admin +zheng.upms.appSecret= + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/redis.properties b/zheng-cms/zheng-cms-admin/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/redis.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/zheng-admin-client.properties b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-admin-client.properties new file mode 100644 index 00000000..d57f1d40 --- /dev/null +++ b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-admin-client.properties @@ -0,0 +1 @@ +zheng.admin.version=${zheng.admin.version} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties index 572713f1..c354dcec 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-oss-client.properties @@ -1,2 +1,2 @@ -### aliyun ### -aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file +##### aliyun ##### +zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/zheng-upms-client.properties b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-upms-client.properties index ee263cd0..418b5838 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/zheng-upms-client.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/zheng-upms-client.properties @@ -1,17 +1,17 @@ # \u7EC8\u7AEF\u7C7B\u578B -upms.type=client +zheng.upms.type=${zheng.upms.type} # \u7EC8\u7AEFsession\u540D\u79F0 -upms.session.id=zheng-upms-client-session-id -# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 -sso.server.url=http://upms.zhangshuzheng.cn:1111 -# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 -upms.successUrl=/manage/index -# \u672A\u6388\u6743\u5730\u5740 -upms.unauthorizedUrl=/403 +zheng.upms.session.id=${zheng.upms.session.id} # \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 -upms.session.timeout=1800000 +zheng.upms.session.timeout=${zheng.upms.session.timeout} +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=${zheng.upms.sso.server.url} +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=${zheng.upms.successUrl} +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=${zheng.upms.unauthorizedUrl} # \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 -upms.rememberMe.timeout=2592000 +zheng.upms.rememberMe.timeout=${zheng.upms.rememberMe.timeout} # \u5B50\u7CFB\u7EDF -appID=zheng-cms-admin -appSecret= +zheng.upms.appID=${zheng.upms.appID} +zheng.upms.appSecret=${zheng.upms.appSecret} diff --git a/zheng-cms/zheng-cms-job/src/main/resources/config.properties b/zheng-cms/zheng-cms-job/src/main/resources/config.properties index 91104ccb..9fb4f007 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-job/src/main/resources/config.properties @@ -1,4 +1,5 @@ app.name=${app.name} env=${profile.env} -### activeMq + +##### activeMq ##### AvtiveMQ.brokerURL=${AvtiveMQ.brokerURL} \ No newline at end of file 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 1592fb36..43234546 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 @@ -1,4 +1,5 @@ app.name=zheng-cms-job profile.env=dev -### activeMq + +##### activeMq ##### AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1: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 cffa54a5..1bda9195 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 @@ -1,4 +1,5 @@ app.name=zheng-cms-job profile.env=prod -### activeMq + +##### activeMq ##### AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1: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 0ae6db10..a66e5305 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 @@ -1,4 +1,5 @@ app.name=zheng-cms-job profile.env=test -### activeMq + +##### activeMq ##### AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file 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 1f750b32..58e9209c 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,9 +1,8 @@ -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== \ No newline at end of file +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 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 ae0f7af2..f4ebb8d6 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 @@ -1,2 +1,21 @@ app.name=zheng-cms-rpc-service -profile.env=dev \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 fc701ab9..00d6af8d 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 @@ -1,2 +1,21 @@ app.name=zheng-cms-rpc-service -profile.env=prod \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 4bc64ce8..79a93894 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 @@ -1,2 +1,21 @@ app.name=zheng-cms-rpc-service -profile.env=test \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/redis.properties b/zheng-cms/zheng-cms-rpc-service/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/redis.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/interceptor/CmsWebInterceptor.java b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/interceptor/CmsWebInterceptor.java index fd6bf38e..7173d4a5 100644 --- a/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/interceptor/CmsWebInterceptor.java +++ b/zheng-cms/zheng-cms-web/src/main/java/com/zheng/cms/web/interceptor/CmsWebInterceptor.java @@ -33,7 +33,7 @@ public class CmsWebInterceptor extends HandlerInterceptorAdapter { } // zheng-ui静态资源配置信息 String appName = PropertiesFileUtil.getInstance().get("app.name"); - String uiPath = PropertiesFileUtil.getInstance().get("zheng-ui.path"); + String uiPath = PropertiesFileUtil.getInstance().get("zheng.ui.path"); request.setAttribute("appName", appName); request.setAttribute("uiPath", uiPath); // 菜单 diff --git a/zheng-cms/zheng-cms-web/src/main/resources/config.properties b/zheng-cms/zheng-cms-web/src/main/resources/config.properties index bc9e9d3d..5b5bbbac 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-web/src/main/resources/config.properties @@ -1,5 +1,6 @@ app.name=${app.name} env=${profile.env} -zheng-ui.path=${zheng-ui.path} -### activeMq +zheng.ui.path=${zheng.ui.path} + +##### activeMq ##### AvtiveMQ.brokerURL=${AvtiveMQ.brokerURL} \ No newline at end of file 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 13998f57..713dec81 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 @@ -1,5 +1,15 @@ app.name=zheng-cms-web profile.env=dev -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ -### activeMq +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +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 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 bdd605f4..5390a823 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 @@ -1,5 +1,15 @@ app.name=zheng-cms-web profile.env=prod -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ -### activeMq +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +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 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 972fc390..16f7332e 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 @@ -1,5 +1,15 @@ app.name=zheng-cms-web profile.env=test -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ -### activeMq +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +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 diff --git a/zheng-cms/zheng-cms-web/src/main/resources/redis.properties b/zheng-cms/zheng-cms-web/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/redis.properties +++ b/zheng-cms/zheng-cms-web/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml b/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml index 8e5eb703..3b0167a1 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml +++ b/zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml @@ -25,7 +25,7 @@ - + diff --git a/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java b/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java index d659e4cc..de088130 100644 --- a/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java +++ b/zheng-common/src/main/java/com/zheng/common/util/ZhengAdminUtil.java @@ -23,7 +23,7 @@ public class ZhengAdminUtil implements InitializingBean, ServletContextAware { @Override public void setServletContext(ServletContext servletContext) { _log.info("===== 开始解压zheng-admin ====="); - String version = PropertiesFileUtil.getInstance().get("zheng-admin.version"); + String version = PropertiesFileUtil.getInstance("zheng-admin-client").get("zheng.admin.version"); _log.info("zheng-admin.jar 版本: {}", version); String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-admin-" + version + ".jar"); _log.info("zheng-admin.jar 包路径: {}", jarPath); diff --git a/zheng-demo/zheng-demo-web/src/main/resources/config.properties b/zheng-demo/zheng-demo-web/src/main/resources/config.properties index e345629c..19566dc1 100644 --- a/zheng-demo/zheng-demo-web/src/main/resources/config.properties +++ b/zheng-demo/zheng-demo-web/src/main/resources/config.properties @@ -1,4 +1,4 @@ app.name=${app.name} env=${profile.env} -zheng-admin.version=${zheng-admin.version} -zheng-ui.path=${zheng-ui.path} \ No newline at end of file +zheng.admin.version=${zheng.admin.version} +zheng.ui.path=${zheng.ui.path} \ No newline at end of file diff --git a/zheng-demo/zheng-demo-web/src/main/resources/profiles/dev.properties b/zheng-demo/zheng-demo-web/src/main/resources/profiles/dev.properties index 2796dd14..769e66cb 100644 --- a/zheng-demo/zheng-demo-web/src/main/resources/profiles/dev.properties +++ b/zheng-demo/zheng-demo-web/src/main/resources/profiles/dev.properties @@ -1,4 +1,9 @@ app.name=zheng-demo profile.env=dev -zheng-admin.version=1.0.0 -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-demo/zheng-demo-web/src/main/resources/profiles/prod.properties b/zheng-demo/zheng-demo-web/src/main/resources/profiles/prod.properties index e1ce1bcd..ca3536fd 100644 --- a/zheng-demo/zheng-demo-web/src/main/resources/profiles/prod.properties +++ b/zheng-demo/zheng-demo-web/src/main/resources/profiles/prod.properties @@ -1,3 +1,9 @@ app.name=zheng-demo profile.env=prod -zheng-admin.version=1.0.0 \ No newline at end of file +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-demo/zheng-demo-web/src/main/resources/profiles/test.properties b/zheng-demo/zheng-demo-web/src/main/resources/profiles/test.properties index 41372cea..28362e9c 100644 --- a/zheng-demo/zheng-demo-web/src/main/resources/profiles/test.properties +++ b/zheng-demo/zheng-demo-web/src/main/resources/profiles/test.properties @@ -1,4 +1,9 @@ app.name=zheng-demo profile.env=test -zheng-admin.version=1.0.0 -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-demo/zheng-demo-web/src/main/resources/springMVC-servlet.xml b/zheng-demo/zheng-demo-web/src/main/resources/springMVC-servlet.xml index 5fb60bc6..dd612c8a 100644 --- a/zheng-demo/zheng-demo-web/src/main/resources/springMVC-servlet.xml +++ b/zheng-demo/zheng-demo-web/src/main/resources/springMVC-servlet.xml @@ -20,7 +20,7 @@ - + diff --git a/zheng-demo/zheng-demo-web/src/main/resources/zheng-oss-client.properties b/zheng-demo/zheng-demo-web/src/main/resources/zheng-oss-client.properties index 572713f1..c354dcec 100644 --- a/zheng-demo/zheng-demo-web/src/main/resources/zheng-oss-client.properties +++ b/zheng-demo/zheng-demo-web/src/main/resources/zheng-oss-client.properties @@ -1,2 +1,2 @@ -### aliyun ### -aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file +##### aliyun ##### +zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy} \ No newline at end of file diff --git a/zheng-oss/zheng-oss-admin/src/main/resources/config.properties b/zheng-oss/zheng-oss-admin/src/main/resources/config.properties index c807283e..e4a835d3 100644 --- a/zheng-oss/zheng-oss-admin/src/main/resources/config.properties +++ b/zheng-oss/zheng-oss-admin/src/main/resources/config.properties @@ -1,3 +1,2 @@ app.name=${app.name} -env=${profile.env} -zheng-admin.version=${zheng-admin.version} \ No newline at end of file +env=${profile.env} \ No newline at end of file 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 61bb1254..f0e8c27f 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 @@ -1,3 +1,31 @@ app.name=zheng-oss-admin profile.env=dev -zheng-admin.version=1.0.0 \ No newline at end of file +zheng.admin.version=1.0.0 + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-oss-admin +zheng.upms.appSecret= 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 10a5058c..50c091a4 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 @@ -1,3 +1,31 @@ app.name=zheng-oss-admin profile.env=prod -zheng-admin.version=1.0.0 \ No newline at end of file +zheng.admin.version=1.0.0 + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-oss-admin +zheng.upms.appSecret= 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 c7b3314b..9c3be7cf 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 @@ -1,3 +1,31 @@ app.name=zheng-oss-admin profile.env=test -zheng-admin.version=1.0.0 \ No newline at end of file +zheng.admin.version=1.0.0 + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=client +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-client-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 +# \u5B50\u7CFB\u7EDF +zheng.upms.appID=zheng-oss-admin +zheng.upms.appSecret= diff --git a/zheng-oss/zheng-oss-admin/src/main/resources/redis.properties b/zheng-oss/zheng-oss-admin/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-oss/zheng-oss-admin/src/main/resources/redis.properties +++ b/zheng-oss/zheng-oss-admin/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-oss/zheng-oss-admin/src/main/resources/zheng-admin-client.properties b/zheng-oss/zheng-oss-admin/src/main/resources/zheng-admin-client.properties new file mode 100644 index 00000000..d57f1d40 --- /dev/null +++ b/zheng-oss/zheng-oss-admin/src/main/resources/zheng-admin-client.properties @@ -0,0 +1 @@ +zheng.admin.version=${zheng.admin.version} \ No newline at end of file diff --git a/zheng-oss/zheng-oss-admin/src/main/resources/zheng-upms-client.properties b/zheng-oss/zheng-oss-admin/src/main/resources/zheng-upms-client.properties index c7e2a78c..418b5838 100644 --- a/zheng-oss/zheng-oss-admin/src/main/resources/zheng-upms-client.properties +++ b/zheng-oss/zheng-oss-admin/src/main/resources/zheng-upms-client.properties @@ -1,17 +1,17 @@ # \u7EC8\u7AEF\u7C7B\u578B -upms.type=client +zheng.upms.type=${zheng.upms.type} # \u7EC8\u7AEFsession\u540D\u79F0 -upms.session.id=zheng-upms-client-session-id -# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 -sso.server.url=http://upms.zhangshuzheng.cn:1111 -# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 -upms.successUrl=/manage/index -# \u672A\u6388\u6743\u5730\u5740 -upms.unauthorizedUrl=/403 +zheng.upms.session.id=${zheng.upms.session.id} # \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 -upms.session.timeout=1800000 +zheng.upms.session.timeout=${zheng.upms.session.timeout} +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=${zheng.upms.sso.server.url} +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=${zheng.upms.successUrl} +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=${zheng.upms.unauthorizedUrl} # \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 -upms.rememberMe.timeout=2592000 +zheng.upms.rememberMe.timeout=${zheng.upms.rememberMe.timeout} # \u5B50\u7CFB\u7EDF -appID=zheng-oss-admin -appSecret= +zheng.upms.appID=${zheng.upms.appID} +zheng.upms.appSecret=${zheng.upms.appSecret} diff --git a/zheng-oss/zheng-oss-web/src/main/resources/config.properties b/zheng-oss/zheng-oss-web/src/main/resources/config.properties index 07158dc9..be860ccb 100644 --- a/zheng-oss/zheng-oss-web/src/main/resources/config.properties +++ b/zheng-oss/zheng-oss-web/src/main/resources/config.properties @@ -1,8 +1,8 @@ env=${profile.env} app.name=${app.name} -zheng-ui.path=${zheng-ui.path} +zheng.ui.path=${zheng.ui.path} -### aliyun oss ### +##### aliyun oss ##### aliyun.oss.endpoint=${aliyun.oss.endpoint} aliyun.oss.endpoint.internal=${aliyun.oss.endpoint.internal} aliyun.oss.accessKeyId=${aliyun.oss.accessKeyId} diff --git a/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties b/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties index 6ce4703b..0df640a4 100644 --- a/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties +++ b/zheng-oss/zheng-oss-web/src/main/resources/profiles/dev.properties @@ -1,8 +1,8 @@ profile.env=dev app.name=zheng-oss-web -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ -### aliyun oss ### +##### aliyun oss ##### aliyun.oss.endpoint=oss-cn-shanghai.aliyuncs.com aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com aliyun.oss.accessKeyId= @@ -10,4 +10,7 @@ aliyun.oss.accessKeySecret= aliyun.oss.bucketName=shuzheng aliyun.oss.policy.expire=300 aliyun.oss.maxSize=10 -aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback \ No newline at end of file +aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-oss/zheng-oss-web/src/main/resources/profiles/prod.properties b/zheng-oss/zheng-oss-web/src/main/resources/profiles/prod.properties index 324a2c4e..d749b07a 100644 --- a/zheng-oss/zheng-oss-web/src/main/resources/profiles/prod.properties +++ b/zheng-oss/zheng-oss-web/src/main/resources/profiles/prod.properties @@ -1,8 +1,8 @@ profile.env=prod app.name=zheng-oss-web -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ -### aliyun oss ### +##### aliyun oss ##### aliyun.oss.endpoint=oss-cn-shanghai.aliyuncs.com aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com aliyun.oss.accessKeyId= @@ -10,4 +10,7 @@ aliyun.oss.accessKeySecret= aliyun.oss.bucketName=shuzheng_prod aliyun.oss.policy.expire=300 aliyun.oss.maxSize=10 -aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback \ No newline at end of file +aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-oss/zheng-oss-web/src/main/resources/profiles/test.properties b/zheng-oss/zheng-oss-web/src/main/resources/profiles/test.properties index cd952ba4..d45977f0 100644 --- a/zheng-oss/zheng-oss-web/src/main/resources/profiles/test.properties +++ b/zheng-oss/zheng-oss-web/src/main/resources/profiles/test.properties @@ -1,8 +1,8 @@ profile.env=test app.name=zheng-oss-web -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ -### aliyun oss ### +##### aliyun oss ##### aliyun.oss.endpoint=oss-cn-shanghai.aliyuncs.com aliyun.oss.endpoint.internal=oss-cn-shanghai-internal.aliyuncs.com aliyun.oss.accessKeyId= @@ -10,4 +10,7 @@ aliyun.oss.accessKeySecret= aliyun.oss.bucketName=shuzheng_test aliyun.oss.policy.expire=300 aliyun.oss.maxSize=10 -aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback \ No newline at end of file +aliyun.oss.callback=http://shuzheng.tunnel.qydev.com/aliyun/oss/callback + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-oss/zheng-oss-web/src/main/resources/springMVC-servlet.xml b/zheng-oss/zheng-oss-web/src/main/resources/springMVC-servlet.xml index 8c180998..f008184e 100644 --- a/zheng-oss/zheng-oss-web/src/main/resources/springMVC-servlet.xml +++ b/zheng-oss/zheng-oss-web/src/main/resources/springMVC-servlet.xml @@ -16,7 +16,7 @@ - + diff --git a/zheng-oss/zheng-oss-web/src/main/resources/zheng-oss-client.properties b/zheng-oss/zheng-oss-web/src/main/resources/zheng-oss-client.properties index 572713f1..c354dcec 100644 --- a/zheng-oss/zheng-oss-web/src/main/resources/zheng-oss-client.properties +++ b/zheng-oss/zheng-oss-web/src/main/resources/zheng-oss-client.properties @@ -1,2 +1,2 @@ -### aliyun ### -aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file +##### aliyun ##### +zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy} \ No newline at end of file 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 1f750b32..58e9209c 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,9 +1,8 @@ -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== \ No newline at end of file +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 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 12c86376..dabf4015 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 @@ -1,2 +1,21 @@ app.name=zheng-pay-rpc-service -profile.env=dev \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 6657935a..c66291eb 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 @@ -1,2 +1,21 @@ app.name=zheng-pay-rpc-service -profile.env=prod \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 c8afe836..08a3f8fa 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 @@ -1,2 +1,21 @@ app.name=zheng-pay-rpc-service -profile.env=test \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file diff --git a/zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties b/zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties +++ b/zheng-pay/zheng-pay-rpc-service/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-pay/zheng-pay-web/src/main/resources/config.properties b/zheng-pay/zheng-pay-web/src/main/resources/config.properties index dc3b0c56..c6b70176 100644 --- a/zheng-pay/zheng-pay-web/src/main/resources/config.properties +++ b/zheng-pay/zheng-pay-web/src/main/resources/config.properties @@ -1,12 +1,13 @@ env=${profile.env} -alipay.appid= -alipay.gateway=https://openapi.alipaydev.com/gateway.do -alipay.rsa.private_key= -alipay.rsa.public_key= -alipay.alipay_public_key= -alipay.format=json -alipay.charset=UTF-8 -alipay.sign_type=RSA2 -alipay.returnUrl=http://pay.zhangshuzheng.cn/alipay/returnUrl -alipay.notifyUrl=http://pay.zhangshuzheng.cn/alipay/notifyUrl +##### alipay ##### +alipay.appid=${alipay.appid} +alipay.gateway=${alipay.gateway} +alipay.rsa.private_key=${alipay.rsa.private_key} +alipay.rsa.public_key=${alipay.rsa.public_key} +alipay.alipay_public_key=${alipay.alipay_public_key} +alipay.format=${alipay.format} +alipay.charset=${alipay.charset} +alipay.sign_type=${alipay.sign_type} +alipay.returnUrl=${alipay.returnUrl} +alipay.notifyUrl=${alipay.notifyUrl} diff --git a/zheng-pay/zheng-pay-web/src/main/resources/profiles/dev.properties b/zheng-pay/zheng-pay-web/src/main/resources/profiles/dev.properties index baede636..98caa595 100644 --- a/zheng-pay/zheng-pay-web/src/main/resources/profiles/dev.properties +++ b/zheng-pay/zheng-pay-web/src/main/resources/profiles/dev.properties @@ -1 +1,16 @@ -profile.env=dev \ No newline at end of file +profile.env=dev + +##### alipay ##### +alipay.appid= +alipay.gateway=https://openapi.alipaydev.com/gateway.do +alipay.rsa.private_key= +alipay.rsa.public_key= +alipay.alipay_public_key= +alipay.format=json +alipay.charset=UTF-8 +alipay.sign_type=RSA2 +alipay.returnUrl=http://pay.zhangshuzheng.cn/alipay/returnUrl +alipay.notifyUrl=http://pay.zhangshuzheng.cn/alipay/notifyUrl + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-pay/zheng-pay-web/src/main/resources/profiles/prod.properties b/zheng-pay/zheng-pay-web/src/main/resources/profiles/prod.properties index bb7a8fdf..846b9f86 100644 --- a/zheng-pay/zheng-pay-web/src/main/resources/profiles/prod.properties +++ b/zheng-pay/zheng-pay-web/src/main/resources/profiles/prod.properties @@ -1 +1,16 @@ -profile.env=prod \ No newline at end of file +profile.env=prod + +##### alipay ##### +alipay.appid= +alipay.gateway=https://openapi.alipaydev.com/gateway.do +alipay.rsa.private_key= +alipay.rsa.public_key= +alipay.alipay_public_key= +alipay.format=json +alipay.charset=UTF-8 +alipay.sign_type=RSA2 +alipay.returnUrl=http://pay.zhangshuzheng.cn/alipay/returnUrl +alipay.notifyUrl=http://pay.zhangshuzheng.cn/alipay/notifyUrl + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-pay/zheng-pay-web/src/main/resources/profiles/test.properties b/zheng-pay/zheng-pay-web/src/main/resources/profiles/test.properties index 4ff006f4..5023e8ae 100644 --- a/zheng-pay/zheng-pay-web/src/main/resources/profiles/test.properties +++ b/zheng-pay/zheng-pay-web/src/main/resources/profiles/test.properties @@ -1 +1,16 @@ -profile.env=test \ No newline at end of file +profile.env=test + +##### alipay ##### +alipay.appid= +alipay.gateway=https://openapi.alipaydev.com/gateway.do +alipay.rsa.private_key= +alipay.rsa.public_key= +alipay.alipay_public_key= +alipay.format=json +alipay.charset=UTF-8 +alipay.sign_type=RSA2 +alipay.returnUrl=http://pay.zhangshuzheng.cn/alipay/returnUrl +alipay.notifyUrl=http://pay.zhangshuzheng.cn/alipay/notifyUrl + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties b/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties index 572713f1..c354dcec 100644 --- a/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties +++ b/zheng-pay/zheng-pay-web/src/main/resources/zheng-oss-client.properties @@ -1,2 +1,2 @@ -### aliyun ### -aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file +##### aliyun ##### +zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy} \ No newline at end of file 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 1f750b32..58e9209c 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,9 +1,8 @@ -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== \ No newline at end of file +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 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 128a8564..44bc6f4b 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 @@ -1,2 +1,21 @@ app.name=zheng-ucenter-rpc-service -profile.env=dev \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 c4e339c4..afb804e8 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 @@ -1,2 +1,21 @@ app.name=zheng-ucenter-rpc-service -profile.env=prod \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 f03687fc..4ec1c396 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 @@ -1,2 +1,21 @@ app.name=zheng-ucenter-rpc-service -profile.env=test \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/redis.properties b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/redis.properties +++ b/zheng-ucenter/zheng-ucenter-rpc-service/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties index a82d15f4..19ffe57a 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/config.properties @@ -1,3 +1,3 @@ env=${profile.env} app.name=${app.name} -zheng-ui.path=${zheng-ui.path} \ No newline at end of file +zheng.ui.path=${zheng.ui.path} \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties index 4abf894a..d6f60480 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/dev.properties @@ -1,3 +1,3 @@ profile.env=dev app.name=zheng-ucenter-web -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties index d5b99c68..2e2f8eb9 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/prod.properties @@ -1,3 +1,3 @@ profile.env=prod app.name=zheng-ucenter-web -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties index 901d739f..0f687c33 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/profiles/test.properties @@ -1,3 +1,3 @@ profile.env=test app.name=zheng-ucenter-web -zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file +zheng.ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file diff --git a/zheng-ucenter/zheng-ucenter-web/src/main/resources/springMVC-servlet.xml b/zheng-ucenter/zheng-ucenter-web/src/main/resources/springMVC-servlet.xml index 32a90d3b..7491e7fe 100644 --- a/zheng-ucenter/zheng-ucenter-web/src/main/resources/springMVC-servlet.xml +++ b/zheng-ucenter/zheng-ucenter-web/src/main/resources/springMVC-servlet.xml @@ -16,7 +16,7 @@ - + diff --git a/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/filter/UpmsAuthenticationFilter.java b/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/filter/UpmsAuthenticationFilter.java index d4f843ed..85d90e8c 100644 --- a/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/filter/UpmsAuthenticationFilter.java +++ b/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/filter/UpmsAuthenticationFilter.java @@ -57,7 +57,7 @@ public class UpmsAuthenticationFilter extends AuthenticationFilter { Subject subject = getSubject(request, response); Session session = subject.getSession(); // 判断请求类型 - String upmsType = PropertiesFileUtil.getInstance("zheng-upms-client").get("upms.type"); + String upmsType = PropertiesFileUtil.getInstance("zheng-upms-client").get("zheng.upms.type"); session.setAttribute(UpmsConstant.UPMS_TYPE, upmsType); if ("client".equals(upmsType)) { return validateClient(request, response); @@ -70,14 +70,14 @@ public class UpmsAuthenticationFilter extends AuthenticationFilter { @Override protected boolean onAccessDenied(ServletRequest request, ServletResponse response) throws Exception { - StringBuffer sso_server_url = new StringBuffer(PropertiesFileUtil.getInstance("zheng-upms-client").get("sso.server.url")); + StringBuffer sso_server_url = new StringBuffer(PropertiesFileUtil.getInstance("zheng-upms-client").get("zheng.upms.sso.server.url")); // server需要登录 - String upmsType = PropertiesFileUtil.getInstance("zheng-upms-client").get("upms.type"); + String upmsType = PropertiesFileUtil.getInstance("zheng-upms-client").get("zheng.upms.type"); if ("server".equals(upmsType)) { WebUtils.toHttp(response).sendRedirect(sso_server_url.append("/sso/login").toString()); return false; } - sso_server_url.append("/sso/index").append("?").append("appid").append("=").append(PropertiesFileUtil.getInstance("zheng-upms-client").get("appID")); + sso_server_url.append("/sso/index").append("?").append("appid").append("=").append(PropertiesFileUtil.getInstance("zheng-upms-client").get("zheng.upms.appID")); // 回跳地址 HttpServletRequest httpServletRequest = WebUtils.toHttp(request); StringBuffer backurl = httpServletRequest.getRequestURL(); @@ -126,7 +126,7 @@ public class UpmsAuthenticationFilter extends AuthenticationFilter { if (StringUtils.isNotBlank(code)) { // HttpPost去校验code try { - StringBuffer sso_server_url = new StringBuffer(PropertiesFileUtil.getInstance("zheng-upms-client").get("sso.server.url")); + StringBuffer sso_server_url = new StringBuffer(PropertiesFileUtil.getInstance("zheng-upms-client").get("zheng.upms.sso.server.url")); HttpClient httpclient = new DefaultHttpClient(); HttpPost httpPost = new HttpPost(sso_server_url.toString() + "/sso/code"); diff --git a/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/realm/UpmsRealm.java b/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/realm/UpmsRealm.java index c14c059b..7c2bd162 100644 --- a/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/realm/UpmsRealm.java +++ b/zheng-upms/zheng-upms-client/src/main/java/com/zheng/upms/client/shiro/realm/UpmsRealm.java @@ -76,7 +76,7 @@ public class UpmsRealm extends AuthorizingRealm { String username = (String) authenticationToken.getPrincipal(); String password = new String((char[]) authenticationToken.getCredentials()); // client无密认证 - String upmsType = PropertiesFileUtil.getInstance("zheng-upms-client").get("upms.type"); + String upmsType = PropertiesFileUtil.getInstance("zheng-upms-client").get("zheng.upms.type"); if ("client".equals(upmsType)) { return new SimpleAuthenticationInfo(username, password, getName()); } diff --git a/zheng-upms/zheng-upms-client/src/main/resources/applicationContext-shiro.xml b/zheng-upms/zheng-upms-client/src/main/resources/applicationContext-shiro.xml index 04c58807..9e164cf3 100644 --- a/zheng-upms/zheng-upms-client/src/main/resources/applicationContext-shiro.xml +++ b/zheng-upms/zheng-upms-client/src/main/resources/applicationContext-shiro.xml @@ -12,9 +12,9 @@ - - - + + + @@ -53,7 +53,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/zheng-upms/zheng-upms-common/src/main/java/com/zheng/upms/common/constant/UpmsConstant.java b/zheng-upms/zheng-upms-common/src/main/java/com/zheng/upms/common/constant/UpmsConstant.java index 15e50ef4..e664a10b 100644 --- a/zheng-upms/zheng-upms-common/src/main/java/com/zheng/upms/common/constant/UpmsConstant.java +++ b/zheng-upms/zheng-upms-common/src/main/java/com/zheng/upms/common/constant/UpmsConstant.java @@ -8,6 +8,6 @@ import com.zheng.common.base.BaseConstants; */ public class UpmsConstant extends BaseConstants { - public static final String UPMS_TYPE = "upms.type"; + public static final String UPMS_TYPE = "zheng.upms.type"; } 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 1f750b32..58e9209c 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,9 +1,8 @@ -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== \ No newline at end of file +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 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 ffc6552f..068118e4 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 @@ -1,2 +1,21 @@ app.name=zheng-upms-rpc-service -profile.env=dev \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 d72b396b..2aaeb35c 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 @@ -1,2 +1,21 @@ app.name=zheng-upms-rpc-service -profile.env=prod \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file 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 8702721f..4e5a50f6 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 @@ -1,2 +1,21 @@ app.name=zheng-upms-rpc-service -profile.env=test \ No newline at end of file +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== + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 \ No newline at end of file diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/redis.properties b/zheng-upms/zheng-upms-rpc-service/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/redis.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/interceptor/UpmsInterceptor.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/interceptor/UpmsInterceptor.java index 20675457..0720fce3 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/interceptor/UpmsInterceptor.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/interceptor/UpmsInterceptor.java @@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse; public class UpmsInterceptor extends HandlerInterceptorAdapter { private static Logger _log = LoggerFactory.getLogger(UpmsInterceptor.class); - private static final String ZHENG_OSS_ALIYUN_OSS_POLICY = PropertiesFileUtil.getInstance("zheng-oss-client").get("aliyun.oss.policy"); + private static final String ZHENG_OSS_ALIYUN_OSS_POLICY = PropertiesFileUtil.getInstance("zheng-oss-client").get("zheng.oss.aliyun.oss.policy"); @Autowired UpmsApiService upmsApiService; diff --git a/zheng-upms/zheng-upms-server/src/main/resources/config.properties b/zheng-upms/zheng-upms-server/src/main/resources/config.properties index c807283e..e4a835d3 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/config.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/config.properties @@ -1,3 +1,2 @@ app.name=${app.name} -env=${profile.env} -zheng-admin.version=${zheng-admin.version} \ No newline at end of file +env=${profile.env} \ No newline at end of file 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 11408f03..16865487 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 @@ -1,3 +1,33 @@ app.name=zheng-upms-server profile.env=dev -zheng-admin.version=1.0.0 \ No newline at end of file + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### zheng-admin ##### +zheng.admin.version=1.0.0 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +zheng.upms.type=server +# \u7EC8\u7AEFsession\u540D\u79F0 +zheng.upms.session.id=zheng-upms-server-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +zheng.upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +zheng.upms.rememberMe.timeout=2592000 + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file 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 475f633e..44156659 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 @@ -1,3 +1,31 @@ app.name=zheng-upms-server profile.env=prod -zheng-admin.version=1.0.0 \ No newline at end of file +zheng.admin.version=1.0.0 + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +upms.type=server +# \u7EC8\u7AEFsession\u540D\u79F0 +upms.session.id=zheng-upms-server-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +upms.rememberMe.timeout=2592000 + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file 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 eb20c1cb..123276b8 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 @@ -1,3 +1,31 @@ app.name=zheng-upms-server profile.env=test -zheng-admin.version=1.0.0 \ No newline at end of file +zheng.admin.version=1.0.0 + +##### redis ##### +master.redis.ip=127.0.0.1 +master.redis.port=6379 +master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== +master.redis.max_active=500 +master.redis.max_idle=5 +master.redis.max_wait=10000 +master.redis.timeout=10000 + +##### zheng-upms ##### +# \u7EC8\u7AEF\u7C7B\u578B +upms.type=server +# \u7EC8\u7AEFsession\u540D\u79F0 +upms.session.id=zheng-upms-server-session-id +# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 +upms.session.timeout=1800000 +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +upms.sso.server.url=http://upms.zhangshuzheng.cn:1111 +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +upms.successUrl=/manage/index +# \u672A\u6388\u6743\u5730\u5740 +upms.unauthorizedUrl=/403 +# \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 +upms.rememberMe.timeout=2592000 + +##### zheng-oss ##### +zheng.oss.aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/redis.properties b/zheng-upms/zheng-upms-server/src/main/resources/redis.properties index 2dad97d0..64a79b35 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/redis.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/redis.properties @@ -1,7 +1,7 @@ -master.redis.ip=127.0.0.1 -master.redis.port=6379 -master.redis.password=FNFl9F2O2Skb8yoKM0jhHA== -master.redis.max_active=500 -master.redis.max_idle=5 -master.redis.max_wait=10000 -master.redis.timeout=10000 \ No newline at end of file +master.redis.ip=${master.redis.ip} +master.redis.port=${master.redis.port} +master.redis.password=${master.redis.password} +master.redis.max_active=${master.redis.max_active} +master.redis.max_idle=${master.redis.max_idle} +master.redis.max_wait=${master.redis.max_wait} +master.redis.timeout=${master.redis.timeout} \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/zheng-admin-client.properties b/zheng-upms/zheng-upms-server/src/main/resources/zheng-admin-client.properties new file mode 100644 index 00000000..d57f1d40 --- /dev/null +++ b/zheng-upms/zheng-upms-server/src/main/resources/zheng-admin-client.properties @@ -0,0 +1 @@ +zheng.admin.version=${zheng.admin.version} \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties b/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties index 572713f1..c354dcec 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/zheng-oss-client.properties @@ -1,2 +1,2 @@ -### aliyun ### -aliyun.oss.policy=http://oss.zhangshuzheng.cn:7771/aliyun/oss/policy \ No newline at end of file +##### aliyun ##### +zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy} \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/zheng-upms-client.properties b/zheng-upms/zheng-upms-server/src/main/resources/zheng-upms-client.properties index 5c354a7e..378113a3 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/zheng-upms-client.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/zheng-upms-client.properties @@ -1,14 +1,14 @@ # \u7EC8\u7AEF\u7C7B\u578B -upms.type=server +zheng.upms.type=${zheng.upms.type} # \u7EC8\u7AEFsession\u540D\u79F0 -upms.session.id=zheng-upms-server-session-id -# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 -sso.server.url=http://upms.zhangshuzheng.cn:1111 -# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 -upms.successUrl=/manage/index -# \u672A\u6388\u6743\u5730\u5740 -upms.unauthorizedUrl=/403 +zheng.upms.session.id=${zheng.upms.session.id} # \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09 -upms.session.timeout=1800000 +zheng.upms.session.timeout=${zheng.upms.session.timeout} +# \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740 +zheng.upms.sso.server.url=${zheng.upms.sso.server.url} +# \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740 +zheng.upms.successUrl=${zheng.upms.successUrl} +# \u672A\u6388\u6743\u5730\u5740 +zheng.upms.unauthorizedUrl=${zheng.upms.unauthorizedUrl} # \u8BB0\u4F4F\u5BC6\u7801\u65F6\u957F30\u5929 -upms.rememberMe.timeout=2592000 +zheng.upms.rememberMe.timeout=${zheng.upms.rememberMe.timeout} 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 1f750b32..58e9209c 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,9 +1,8 @@ -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== \ No newline at end of file +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