From 993472d7600d18a682d6de504fdde8f990fad6f1 Mon Sep 17 00:00:00 2001
From: xiangwbs <xiangwbs@163.com>
Date: Sun, 18 Mar 2018 14:48:06 +0800
Subject: [PATCH] merge

---
 .../{DruidConfig.java => DruidDataSourceConfig.java}          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename boot-web/src/main/java/com/xwbing/configuration/{DruidConfig.java => DruidDataSourceConfig.java} (95%)

diff --git a/boot-web/src/main/java/com/xwbing/configuration/DruidConfig.java b/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java
similarity index 95%
rename from boot-web/src/main/java/com/xwbing/configuration/DruidConfig.java
rename to boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java
index 22257a0..875de1b 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DruidConfig.java
+++ b/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java
@@ -20,10 +20,10 @@ import java.sql.SQLException;
  */
 @Configuration
 @EnableConfigurationProperties(DruidDataSourceModel.class)
-public class DruidConfig {
+public class DruidDataSourceConfig {
     @Resource
     private DruidDataSourceModel druidDataSourceModel;
-    private final Logger logger= LoggerFactory.getLogger(DruidConfig.class);
+    private final Logger logger= LoggerFactory.getLogger(DruidDataSourceConfig.class);
 
     @Bean
     @Primary