From b052a535fb03e3444c37844ead706412a0beefea Mon Sep 17 00:00:00 2001 From: xiangwbs Date: Fri, 11 May 2018 22:22:46 +0800 Subject: [PATCH] merge --- boot-service/src/main/resources/druid.properties | 4 ++-- boot-web/src/main/resources/application.yml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot-service/src/main/resources/druid.properties b/boot-service/src/main/resources/druid.properties index 83f4cbf..2ab17e2 100644 --- a/boot-service/src/main/resources/druid.properties +++ b/boot-service/src/main/resources/druid.properties @@ -1,8 +1,8 @@ # 数据库基本信息配置 jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://127.0.0.1:3306/springboot2?useUnicode=true&characterEncoding=utf8 +jdbc.url=jdbc:mysql://127.0.0.1:3306/xwbing?useUnicode=true&characterEncoding=utf8 jdbc.username=root -jdbc.password=xwbing +jdbc.password= # 初始化大小，最小，最大 jdbc.initSize=1 jdbc.minIdle=3 diff --git a/boot-web/src/main/resources/application.yml b/boot-web/src/main/resources/application.yml index f4d9d8b..e4ed12f 100644 --- a/boot-web/src/main/resources/application.yml +++ b/boot-web/src/main/resources/application.yml @@ -50,9 +50,9 @@ spring: rabbitmq: host: 127.0.0.1 port: 5672 - username: guest - password: guest - virtual-host: / + username: root + password: xwbing + virtual-host: /xwbing connection-timeout: 60000 #毫秒 publisher-confirms: true #支持发布确认 publisher-returns: true #支持发布返回