Merge branch 'master' of luofaqiang/esb into master

src/main/resources/application.yml

@@ -48,6 +48,7 @@ spring:
      username: esb
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: upload
  activemq:
    broker-url: tcp://172.19.103.57:61616?wireFormat.maxInactivityDuration=0
    user: admin
@@ -67,6 +68,7 @@ spring:
      username: esb
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: upload
  activemq:
    broker-url: tcp://172.19.103.86:61616?wireFormat.maxInactivityDuration=0
    user: admin
@@ -113,7 +115,7 @@ spring:
      username: esb
      password: esb
      authenticationDatabase: admin
      gridFsDatabase: upload
  activemq:
    broker-url: tcp://172.19.103.86:61616?wireFormat.maxInactivityDuration=0
    user: admin