Merge branch 'master' into dev

@@ -20,5 +20,6 @@
 		<generate template="META-INF/autoconf/acp_sdk.properties" destfile="WEB-INF/classes/acp_sdk.properties" />
 		<generate template="META-INF/autoconf/redis-config.yml" destfile="WEB-INF/classes/redis-config.yml"/>
 		<generate template="META-INF/autoconf/rabbitmq.yml" destfile="WEB-INF/classes/rabbitmq.yml"/>
+		<generate template="META-INF/autoconf/databases.yml" destfile="WEB-INF/classes/databases.yml"/>
 	</script>
 </config>

@@ -58,8 +58,8 @@ producer:
         producers:
             - bean: yhProducer
 
-      - address: ${rabbit_common}
-        username: ${rabbit_common_user}
-        password: ${rabbit_common_password}
+      - address: ${rabbit_order}
+        username: ${rabbit_order_user}
+        password: ${rabbit_order_password}
         producers:
             - bean: ufoExpressInfoProducer
\ No newline at end of file