From b4cabe178f1a36433270c79048beecfab0edc487 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 30 Jan 2018 17:20:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/application.yml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ddf5b3f..b76fb92 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -36,6 +36,7 @@
# ������������DruidDataSource���������������
useGlobalDataSourceStat: true
+
rabbitmq:
host: 116.62.12.115
port: 5672
@@ -63,4 +64,4 @@
mybatis:
mapper-locations: classpath*:/mapper/*Mapper.xml
- type-aliases-packageS: com.moral.entity
\ No newline at end of file
+ config-location: classpath:/mapper/mybatis-config.xml
\ No newline at end of file
--
Gitblit v1.8.0