Merge branch 'master' of gitabc.xyqb.com:QA/config_repository

Conflicts:
	java/du-jiang-yan.properties

java/cash-loan-flow.properties

@@ -13,10 +13,10 @@ cashloanflow.redis.master.port=${REDIS_SERVICE_PORT}
 
 
 ######### rabbitmq ##########
-loanorder.rabbitmq.connection.host=${RABBITMQ_SERVICE_HOST}
-loanorder.rabbitmq.connection.port=${RABBITMQ_SERVICE_PORT_NODE}
-loanorder.rabbitmq.connection.user=${RABBITMQ_SERVICE_USER}
-loanorder.rabbitmq.connection.password={RABBITMQ_SERVICE_PASSWORD}
+loanorder.rabbitmq.connection.host=rabbitmq.qa1
+loanorder.rabbitmq.connection.port=5672
+loanorder.rabbitmq.connection.user=qa
+loanorder.rabbitmq.connection.password=qatest
 loanprogress.rabbitmq.connection.host=${RABBITMQ_SERVICE_HOST}
 loanprogress.rabbitmq.connection.port=${RABBITMQ_SERVICE_PORT_NODE}
 loanprogress.rabbitmq.connection.user=${RABBITMQ_SERVICE_USER}

java/du-jiang-yan.properties

@@ -5,6 +5,7 @@ dujiangyan.data.user=${DB_SERVICE_USER}
 
 
 ######### rabbitmq ##########
+
 #fundmanage.rabbitmq.host=${RABBITMQ_SERVICE_HOST}
 #fundmanage.rabbitmq.port=${RABBITMQ_SERVICE_PORT_NODE}
 #fundmanage.rabbitmq.user=${RABBITMQ_SERVICE_USER}
@@ -16,6 +17,7 @@ fundmanage.rabbitmq.user=rabbitadmin
 fundmanage.rabbitmq.password=123456
 
 
+
 ####### frontend service depend ######
 # todo: xyqb-ui or xjd-ui ????
 xyqb-ui.url=http://192.168.192.206:8999