diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/config.properties b/zheng-api/zheng-api-rpc-service/src/main/resources/config.properties index ac1847b2..e4a835d3 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/config.properties +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/config.properties @@ -1 +1,2 @@ +app.name=${app.name} env=${profile.env} \ No newline at end of file diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/dev.properties b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/dev.properties index baede636..75a3a8d3 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/dev.properties +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/dev.properties @@ -1 +1,2 @@ +app.name=zheng-api-rpc-service profile.env=dev \ No newline at end of file diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/pre.properties b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/pre.properties index fa7ee049..ec83cd0f 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/pre.properties +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/pre.properties @@ -1 +1,2 @@ +app.name=zheng-api-rpc-service profile.env=pre \ No newline at end of file diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/prod.properties b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/prod.properties index bb7a8fdf..68b69fe7 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/prod.properties +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/prod.properties @@ -1 +1,2 @@ +app.name=zheng-api-rpc-service profile.env=prod \ No newline at end of file diff --git a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/test.properties b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/test.properties index 4ff006f4..8b251819 100644 --- a/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/test.properties +++ b/zheng-api/zheng-api-rpc-service/src/main/resources/profiles/test.properties @@ -1 +1,2 @@ +app.name=zheng-api-rpc-service profile.env=test \ No newline at end of file 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 d2404f13..2eafa11f 100644 --- a/zheng-api/zheng-api-server/src/main/resources/config.properties +++ b/zheng-api/zheng-api-server/src/main/resources/config.properties @@ -1,3 +1,4 @@ +app.name=${app.name} env=${profile.env} zheng-ui.version=${zheng-ui.version} ### activeMq 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 7f3b2bdd..d67202af 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,3 +1,4 @@ +app.name=zheng-api-server profile.env=dev zheng-ui.version=1.0.0 ### activeMq diff --git a/zheng-api/zheng-api-server/src/main/resources/profiles/pre.properties b/zheng-api/zheng-api-server/src/main/resources/profiles/pre.properties index eadbd8f1..e3cba2db 100644 --- a/zheng-api/zheng-api-server/src/main/resources/profiles/pre.properties +++ b/zheng-api/zheng-api-server/src/main/resources/profiles/pre.properties @@ -1,3 +1,4 @@ +app.name=zheng-api-server profile.env=pre zheng-ui.version=1.0.0 ### activeMq 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 5a28d305..2c234185 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,3 +1,4 @@ +app.name=zheng-api-server profile.env=prod zheng-ui.version=1.0.0 ### activeMq 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 cd220125..d911c0bf 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,3 +1,4 @@ +app.name=zheng-api-server profile.env=test zheng-ui.version=1.0.0 ### activeMq 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 6bf262a1..47924190 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties @@ -1,3 +1,4 @@ +app.name=${app.name} env=${profile.env} zheng-ui.version=${zheng-ui.version} zheng-ui.path=${zheng-ui.path} 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 b9967565..aa7c5806 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,3 +1,4 @@ +app.name=zheng-cms-admin profile.env=dev zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties index e6c02a17..88eefcc4 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/profiles/pre.properties @@ -1,3 +1,4 @@ +app.name=zheng-cms-admin profile.env=pre zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ 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 3316e0b6..352c0980 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,3 +1,4 @@ +app.name=zheng-cms-admin profile.env=prod zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ 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 07fac2d2..87822e53 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,3 +1,4 @@ +app.name=zheng-cms-admin profile.env=test zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ 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 ac1847b2..91104ccb 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-job/src/main/resources/config.properties @@ -1 +1,4 @@ -env=${profile.env} \ No newline at end of file +app.name=${app.name} +env=${profile.env} +### 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 a66e9ee5..1592fb36 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,3 +1,4 @@ +app.name=zheng-cms-job profile.env=dev ### activeMq AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-cms/zheng-cms-job/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-job/src/main/resources/profiles/pre.properties index c57e9fd6..11387434 100644 --- a/zheng-cms/zheng-cms-job/src/main/resources/profiles/pre.properties +++ b/zheng-cms/zheng-cms-job/src/main/resources/profiles/pre.properties @@ -1,3 +1,4 @@ +app.name=zheng-cms-job profile.env=pre ### 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 8ba8b905..cffa54a5 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,3 +1,4 @@ +app.name=zheng-cms-job profile.env=prod ### activeMq AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file 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 874ace69..0ae6db10 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,3 +1,4 @@ +app.name=zheng-cms-job profile.env=test ### activeMq AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0) \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/config.properties b/zheng-cms/zheng-cms-rpc-service/src/main/resources/config.properties index ac1847b2..e4a835d3 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/config.properties @@ -1 +1,2 @@ +app.name=${app.name} env=${profile.env} \ 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 baede636..ae0f7af2 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 +1,2 @@ +app.name=zheng-cms-rpc-service profile.env=dev \ No newline at end of file diff --git a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/pre.properties index fa7ee049..d073040d 100644 --- a/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/pre.properties +++ b/zheng-cms/zheng-cms-rpc-service/src/main/resources/profiles/pre.properties @@ -1 +1,2 @@ +app.name=zheng-cms-rpc-service profile.env=pre \ 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 bb7a8fdf..fc701ab9 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 +1,2 @@ +app.name=zheng-cms-rpc-service profile.env=prod \ 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 4ff006f4..4bc64ce8 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 +1,2 @@ +app.name=zheng-cms-rpc-service profile.env=test \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/resources/config.properties b/zheng-cms/zheng-cms-search/src/main/resources/config.properties index ac1847b2..e4a835d3 100644 --- a/zheng-cms/zheng-cms-search/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-search/src/main/resources/config.properties @@ -1 +1,2 @@ +app.name=${app.name} env=${profile.env} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/resources/profiles/dev.properties b/zheng-cms/zheng-cms-search/src/main/resources/profiles/dev.properties index baede636..96b36427 100644 --- a/zheng-cms/zheng-cms-search/src/main/resources/profiles/dev.properties +++ b/zheng-cms/zheng-cms-search/src/main/resources/profiles/dev.properties @@ -1 +1,2 @@ +app.name=zheng-cms-search profile.env=dev \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-search/src/main/resources/profiles/pre.properties index fa7ee049..bda068e0 100644 --- a/zheng-cms/zheng-cms-search/src/main/resources/profiles/pre.properties +++ b/zheng-cms/zheng-cms-search/src/main/resources/profiles/pre.properties @@ -1 +1,2 @@ +app.name=zheng-cms-search profile.env=pre \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/resources/profiles/prod.properties b/zheng-cms/zheng-cms-search/src/main/resources/profiles/prod.properties index bb7a8fdf..0e6fa1b0 100644 --- a/zheng-cms/zheng-cms-search/src/main/resources/profiles/prod.properties +++ b/zheng-cms/zheng-cms-search/src/main/resources/profiles/prod.properties @@ -1 +1,2 @@ +app.name=zheng-cms-search profile.env=prod \ No newline at end of file diff --git a/zheng-cms/zheng-cms-search/src/main/resources/profiles/test.properties b/zheng-cms/zheng-cms-search/src/main/resources/profiles/test.properties index 4ff006f4..714fbce4 100644 --- a/zheng-cms/zheng-cms-search/src/main/resources/profiles/test.properties +++ b/zheng-cms/zheng-cms-search/src/main/resources/profiles/test.properties @@ -1 +1,2 @@ +app.name=zheng-cms-search profile.env=test \ No newline at end of file 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 cf68f756..bc9e9d3d 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-web/src/main/resources/config.properties @@ -1,3 +1,5 @@ +app.name=${app.name} env=${profile.env} zheng-ui.path=${zheng-ui.path} -ehcache.name=zheng-cms-ehcache \ No newline at end of file +### 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 a4e00f02..13998f57 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,3 +1,4 @@ +app.name=zheng-cms-web profile.env=dev zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ ### activeMq diff --git a/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties b/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties index d5a8dbf6..e6283b78 100644 --- a/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties +++ b/zheng-cms/zheng-cms-web/src/main/resources/profiles/pre.properties @@ -1,3 +1,4 @@ +app.name=zheng-cms-web profile.env=pre zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ ### activeMq 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 437c9aa6..bdd605f4 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,3 +1,4 @@ +app.name=zheng-cms-web profile.env=prod zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ ### activeMq 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 1dda2481..972fc390 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,3 +1,4 @@ +app.name=zheng-cms-web profile.env=test zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ ### activeMq diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/config.properties b/zheng-upms/zheng-upms-rpc-service/src/main/resources/config.properties index ac1847b2..e4a835d3 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/config.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/config.properties @@ -1 +1,2 @@ +app.name=${app.name} env=${profile.env} \ 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 baede636..ffc6552f 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 +1,2 @@ +app.name=zheng-upms-rpc-service profile.env=dev \ No newline at end of file diff --git a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/pre.properties b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/pre.properties index fa7ee049..205d3dfa 100644 --- a/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/pre.properties +++ b/zheng-upms/zheng-upms-rpc-service/src/main/resources/profiles/pre.properties @@ -1 +1,2 @@ +app.name=zheng-upms-rpc-service profile.env=pre \ 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 bb7a8fdf..d72b396b 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 +1,2 @@ +app.name=zheng-upms-rpc-service profile.env=prod \ 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 4ff006f4..8702721f 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 +1,2 @@ +app.name=zheng-upms-rpc-service profile.env=test \ No newline at end of file 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 4e2c5242..0999c16a 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,4 @@ +app.name=${app.name} env=${profile.env} zheng-ui.path=${zheng-ui.path} zheng-ui.version=${zheng-ui.version} \ 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 bfe5b9b1..f4ebfeba 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,4 @@ +app.name=zheng-upms-server profile.env=dev zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file diff --git a/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties b/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties index f88ed98f..162bc09d 100644 --- a/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties +++ b/zheng-upms/zheng-upms-server/src/main/resources/profiles/pre.properties @@ -1,3 +1,4 @@ +app.name=zheng-upms-server profile.env=pre zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ 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 419e8761..98bb5c19 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,4 @@ +app.name=zheng-upms-server profile.env=prod zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ 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 bee06b27..da308ca5 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,4 @@ +app.name=zheng-upms-server profile.env=test zheng-ui.version=1.0.0 zheng-ui.path=http://ui.zhangshuzheng.cn:1000/ \ No newline at end of file