Merge remote-tracking branch 'origin/master'

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}

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)
+
+##### 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=

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)
+
+##### 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=

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)
+
+##### 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=

zheng-api/zheng-api-server/src/main/resources/zheng-admin-client.properties

@@ -0,0 +1 @@
+zheng.admin.version=${zheng.admin.version}

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
+zheng.upms.session.id=${zheng.upms.session.id}
+# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
+zheng.upms.session.timeout=${zheng.upms.session.timeout}
 # \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740
-sso.server.url=http://upms.zhangshuzheng.cn:1111
+zheng.upms.sso.server.url=${zheng.upms.sso.server.url}
 # \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740
-upms.successUrl=/manage/index
+zheng.upms.successUrl=${zheng.upms.successUrl}
 # \u672A\u6388\u6743\u5730\u5740
-upms.unauthorizedUrl=/403
-# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
-upms.session.timeout=1800000
+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}

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}

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)
+
+##### 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

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)
+
+##### 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

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)
+
+##### 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

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
+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}

zheng-cms/zheng-cms-admin/src/main/resources/zheng-admin-client.properties

@@ -0,0 +1 @@
+zheng.admin.version=${zheng.admin.version}

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
+##### aliyun #####
+zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy}

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
+zheng.upms.session.id=${zheng.upms.session.id}
+# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
+zheng.upms.session.timeout=${zheng.upms.session.timeout}
 # \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740
-sso.server.url=http://upms.zhangshuzheng.cn:1111
+zheng.upms.sso.server.url=${zheng.upms.sso.server.url}
 # \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740
-upms.successUrl=/manage/index
+zheng.upms.successUrl=${zheng.upms.successUrl}
 # \u672A\u6388\u6743\u5730\u5740
-upms.unauthorizedUrl=/403
-# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
-upms.session.timeout=1800000
+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}

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}

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)

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)

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)

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==
+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}

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
+profile.env=dev
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-cms/zheng-cms-rpc-service/src/main/resources/profiles/prod.properties

@@ -1,2 +1,21 @@
 app.name=zheng-cms-rpc-service
-profile.env=prod
+profile.env=prod
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-cms/zheng-cms-rpc-service/src/main/resources/profiles/test.properties

@@ -1,2 +1,21 @@
 app.name=zheng-cms-rpc-service
-profile.env=test
+profile.env=test
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-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
+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}

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);
         // 菜单

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}

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)

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)

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)

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
+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}

zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml

@@ -25,7 +25,7 @@
 	<!-- thymeleaf视图 -->
 	<bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
 		<property name="order" value="0"/>
-		<property name="prefix" value="${zheng-ui.path}"/>
+		<property name="prefix" value="${zheng.ui.path}"/>
 		<property name="suffix" value=""/>
 		<property name="templateMode" value="HTML"/>
 		<property name="cacheable" value="false"/>

zheng-common/src/main/java/com/zheng/common/base/BaseInterface.java

@@ -0,0 +1,12 @@
+package com.zheng.common.base;
+
+/**
+ * 系统接口
+ * Created by ZhangShuzheng on 2017/6/13.
+ */
+public interface BaseInterface {
+
+	// 系统初始化
+	void init();
+
+}

zheng-common/src/main/java/com/zheng/common/listener/ApplicationContextListener.java

@@ -1,6 +1,7 @@
 package com.zheng.common.listener;
 
 import com.zheng.common.annotation.BaseService;
+import com.zheng.common.base.BaseInterface;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationListener;
@@ -23,17 +24,31 @@ public class ApplicationContextListener implements ApplicationListener<ContextRe
         if(null == contextRefreshedEvent.getApplicationContext().getParent()) {
             _log.debug(">>>>> spring初始化完毕 <<<<<");
             // spring初始化完毕后，通过反射调用所有使用BaseService注解的initMapper方法
-            Map<String, Object> services = contextRefreshedEvent.getApplicationContext().getBeansWithAnnotation(BaseService.class);
-            for(Object service : services.values()) {
+            Map<String, Object> baseServices = contextRefreshedEvent.getApplicationContext().getBeansWithAnnotation(BaseService.class);
+            for(Object service : baseServices.values()) {
                 _log.debug(">>>>> {}.initMapper()", service.getClass().getName());
                 try {
                     Method initMapper = service.getClass().getMethod("initMapper");
                     initMapper.invoke(service);
                 } catch (Exception e) {
-                    _log.error("初始化service的initMapper方法异常", e);
+                    _log.error("初始化BaseService的initMapper方法异常", e);
                     e.printStackTrace();
                 }
             }
+
+            // 系统入口初始化
+            Map<String, BaseInterface> baseInterfaceBeans = contextRefreshedEvent.getApplicationContext().getBeansOfType(BaseInterface.class);
+            for(Object service : baseInterfaceBeans.values()) {
+                _log.debug(">>>>> {}.init()", service.getClass().getName());
+                try {
+                    Method init = service.getClass().getMethod("init");
+                    init.invoke(service);
+                } catch (Exception e) {
+                    _log.error("初始化BaseInterface的init方法异常", e);
+                    e.printStackTrace();
+                }
+            }
+
         }
     }
 

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);

zheng-common/src/main/resources/applicationContext.xml

@@ -14,6 +14,11 @@
 	<!-- 装载service -->
 	<context:component-scan base-package="**.service" />
 
+	<!-- 装载自定义bean -->
+	<context:component-scan base-package="**.*" use-default-filters="false">
+		<context:include-filter type="assignable" expression="com.zheng.common.base.BaseInterface"></context:include-filter>
+	</context:component-scan>
+
 	<!-- 启动时初始化Spring上下文环境工具类 -->
 	<bean id="springContextUtil" class="com.zheng.common.util.SpringContextUtil"></bean>
 

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}
+zheng.admin.version=${zheng.admin.version}
+zheng.ui.path=${zheng.ui.path}

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/
+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

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
+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

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/
+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

zheng-demo/zheng-demo-web/src/main/resources/springMVC-servlet.xml

@@ -20,7 +20,7 @@
     <!-- thymeleaf视图 -->
     <bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
         <property name="order" value="0"/>
-        <property name="prefix" value="${zheng-ui.path}"/>
+        <property name="prefix" value="${zheng.ui.path}"/>
         <property name="suffix" value=""/>
         <property name="templateMode" value="HTML"/>
         <property name="cacheable" value="false"/>

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
+##### aliyun #####
+zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy}

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}
+env=${profile.env}

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
+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=

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
+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=

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
+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=

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
+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}

zheng-oss/zheng-oss-admin/src/main/resources/zheng-admin-client.properties

@@ -0,0 +1 @@
+zheng.admin.version=${zheng.admin.version}

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
+zheng.upms.session.id=${zheng.upms.session.id}
+# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
+zheng.upms.session.timeout=${zheng.upms.session.timeout}
 # \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740
-sso.server.url=http://upms.zhangshuzheng.cn:1111
+zheng.upms.sso.server.url=${zheng.upms.sso.server.url}
 # \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740
-upms.successUrl=/manage/index
+zheng.upms.successUrl=${zheng.upms.successUrl}
 # \u672A\u6388\u6743\u5730\u5740
-upms.unauthorizedUrl=/403
-# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
-upms.session.timeout=1800000
+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}

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}

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
+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

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
+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

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
+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

zheng-oss/zheng-oss-web/src/main/resources/springMVC-servlet.xml

@@ -16,7 +16,7 @@
 	<!-- thymeleaf视图 -->
 	<bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
 		<property name="order" value="0"/>
-		<property name="prefix" value="${zheng-ui.path}"/>
+		<property name="prefix" value="${zheng.ui.path}"/>
 		<property name="suffix" value=""/>
 		<property name="templateMode" value="HTML"/>
 		<property name="cacheable" value="false"/>

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
+##### aliyun #####
+zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy}

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==
+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}

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
+profile.env=dev
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-pay/zheng-pay-rpc-service/src/main/resources/profiles/prod.properties

@@ -1,2 +1,21 @@
 app.name=zheng-pay-rpc-service
-profile.env=prod
+profile.env=prod
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-pay/zheng-pay-rpc-service/src/main/resources/profiles/test.properties

@@ -1,2 +1,21 @@
 app.name=zheng-pay-rpc-service
-profile.env=test
+profile.env=test
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-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
+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}

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}

zheng-pay/zheng-pay-web/src/main/resources/profiles/dev.properties

@@ -1 +1,16 @@
-profile.env=dev
+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

zheng-pay/zheng-pay-web/src/main/resources/profiles/prod.properties

@@ -1 +1,16 @@
-profile.env=prod
+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

zheng-pay/zheng-pay-web/src/main/resources/profiles/test.properties

@@ -1 +1,16 @@
-profile.env=test
+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

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
+##### aliyun #####
+zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy}

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==
+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}

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
+profile.env=dev
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/prod.properties

@@ -1,2 +1,21 @@
 app.name=zheng-ucenter-rpc-service
-profile.env=prod
+profile.env=prod
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-ucenter/zheng-ucenter-rpc-service/src/main/resources/profiles/test.properties

@@ -1,2 +1,21 @@
 app.name=zheng-ucenter-rpc-service
-profile.env=test
+profile.env=test
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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-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
+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}

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}
+zheng.ui.path=${zheng.ui.path}

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/
+zheng.ui.path=http://ui.zhangshuzheng.cn:1000/

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/
+zheng.ui.path=http://ui.zhangshuzheng.cn:1000/

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/
+zheng.ui.path=http://ui.zhangshuzheng.cn:1000/

zheng-ucenter/zheng-ucenter-web/src/main/resources/springMVC-servlet.xml

@@ -16,7 +16,7 @@
 	<!-- thymeleaf视图 -->
 	<bean id="templateResolver" class="org.thymeleaf.spring4.templateresolver.SpringResourceTemplateResolver">
 		<property name="order" value="0"/>
-		<property name="prefix" value="${zheng-ui.path}"/>
+		<property name="prefix" value="${zheng.ui.path}"/>
 		<property name="suffix" value=""/>
 		<property name="templateMode" value="HTML"/>
 		<property name="cacheable" value="false"/>

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");
 

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());
         }

zheng-upms/zheng-upms-client/src/main/resources/applicationContext-shiro.xml

@@ -12,9 +12,9 @@
     <!-- Shiro的Web过滤器 -->
     <bean id="shiroFilter" class="org.apache.shiro.spring.web.ShiroFilterFactoryBean">
         <property name="securityManager" ref="securityManager"/>
-        <property name="loginUrl" value="${sso.server.url}"/>
-        <property name="successUrl" value="${upms.successUrl}"/>
-        <property name="unauthorizedUrl" value="${upms.unauthorizedUrl}"/>
+        <property name="loginUrl" value="${zheng.upms.sso.server.url}"/>
+        <property name="successUrl" value="${zheng.upms.successUrl}"/>
+        <property name="unauthorizedUrl" value="${zheng.upms.unauthorizedUrl}"/>
         <property name="filters">
             <util:map>
                 <entry key="authc" value-ref="upmsAuthenticationFilter"/>
@@ -53,7 +53,7 @@
     <!-- 会话管理器 -->
     <bean id="sessionManager" class="org.apache.shiro.web.session.mgt.DefaultWebSessionManager">
         <!-- 全局session超时时间 -->
-        <property name="globalSessionTimeout" value="${upms.session.timeout}"/>
+        <property name="globalSessionTimeout" value="${zheng.upms.session.timeout}"/>
         <!-- sessionDAO -->
         <property name="sessionDAO" ref="sessionDAO"/>
         <property name="sessionIdCookieEnabled" value="true"/>
@@ -75,7 +75,7 @@
         <!-- 设置Cookie的过期时间，秒为单位，默认-1表示关闭浏览器时过期Cookie -->
         <property name="maxAge" value="-1"/>
         <!-- Cookie名称 -->
-        <property name="name" value="${upms.session.id}"/>
+        <property name="name" value="${zheng.upms.session.id}"/>
     </bean>
 
     <!-- 会话监听器 -->
@@ -97,7 +97,7 @@
         <!-- 不会暴露给客户端 -->
         <property name="httpOnly" value="true"/>
         <!-- 记住我cookie生效时间 -->
-        <property name="maxAge" value="${upms.rememberMe.timeout}"/>
+        <property name="maxAge" value="${zheng.upms.rememberMe.timeout}"/>
     </bean>
 
     <!-- 设置SecurityUtils，相当于调用SecurityUtils.setSecurityManager(securityManager) -->

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";
 
 }

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==
+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}

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
+profile.env=dev
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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/zheng-upms-rpc-service/src/main/resources/profiles/prod.properties

@@ -1,2 +1,21 @@
 app.name=zheng-upms-rpc-service
-profile.env=prod
+profile.env=prod
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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/zheng-upms-rpc-service/src/main/resources/profiles/test.properties

@@ -1,2 +1,21 @@
 app.name=zheng-upms-rpc-service
-profile.env=test
+profile.env=test
+
+##### jdbc #####
+datasource.master.jdbc.driver=com.mysql.jdbc.Driver
+datasource.master.jdbc.url=jdbc\:mysql\://127.0.0.1\:3306/zheng?useUnicode\=true&characterEncoding\=utf-8&autoReconnect\=true
+datasource.master.jdbc.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
+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/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
+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}

zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/Initialize.java

@@ -0,0 +1,20 @@
+package com.zheng.upms.server;
+
+import com.zheng.common.base.BaseInterface;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 系统接口
+ * Created by ZhangShuzheng on 2017/6/13.
+ */
+public class Initialize implements BaseInterface {
+
+	private static Logger _log = LoggerFactory.getLogger(Initialize.class);
+
+	@Override
+	public void init() {
+		_log.info(">>>>> 系统初始化");
+	}
+
+}

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;

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}
+env=${profile.env}

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
+
+##### 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

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
+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

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
+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

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
+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}

zheng-upms/zheng-upms-server/src/main/resources/zheng-admin-client.properties

@@ -0,0 +1 @@
+zheng.admin.version=${zheng.admin.version}

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
+##### aliyun #####
+zheng.oss.aliyun.oss.policy=${zheng.oss.aliyun.oss.policy}

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
+zheng.upms.session.id=${zheng.upms.session.id}
+# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
+zheng.upms.session.timeout=${zheng.upms.session.timeout}
 # \u5355\u70B9\u767B\u5F55\u8BA4\u8BC1\u4E2D\u5FC3\u5730\u5740
-sso.server.url=http://upms.zhangshuzheng.cn:1111
+zheng.upms.sso.server.url=${zheng.upms.sso.server.url}
 # \u767B\u5F55\u6210\u529F\u56DE\u8C03\u5730\u5740
-upms.successUrl=/manage/index
+zheng.upms.successUrl=${zheng.upms.successUrl}
 # \u672A\u6388\u6743\u5730\u5740
-upms.unauthorizedUrl=/403
-# \u4F1A\u8BDD\u65F6\u957F,\u534A\u5C0F\u65F6\uFF08\u5355\u4F4D\u6BEB\u79D2\uFF09
-upms.session.timeout=1800000
+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}

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==
+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}