改为纯配置的DataSource

abel533 · abel533 · commit 2bea8bcdd51a · 2015-12-20T00:11:26.000+08:00
diff --git a/src/main/java/tk/mybatis/springboot/Application.java b/src/main/java/tk/mybatis/springboot/Application.java
@@ -15,7 +15,7 @@
 @EnableWebMvc
 @SpringBootApplication
 public class Application extends WebMvcConfigurerAdapter {
-
+    
     public static void main(String[] args) {
         SpringApplication.run(Application.class, args);
     }
diff --git a/src/main/java/tk/mybatis/springboot/conf/DataSourceConfig.java b/src/main/java/tk/mybatis/springboot/conf/DataSourceConfig.java
diff --git a/src/main/java/tk/mybatis/springboot/conf/MyBatisConfig.java b/src/main/java/tk/mybatis/springboot/conf/MyBatisConfig.java
@@ -29,12 +29,10 @@
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.core.io.support.ResourcePatternResolver;
-import tk.mybatis.mapper.entity.Config;
 
 import javax.sql.DataSource;
 import java.io.IOException;
@@ -58,12 +56,6 @@ public class MyBatisConfig {
     @Autowired
     SqlSessionFactory sqlSessionFactory;
 
-    @Bean
-    @ConfigurationProperties(prefix = "mybatis.mapper")
-    public Config mapperConfig() {
-        return new Config();
-    }
-
     @Bean(name = "sqlSessionFactory")
     public SqlSessionFactoryBean sqlSessionFactoryBean() {
         SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -7,12 +7,14 @@ logging:
         tk.mybatis: DEBUG
 
 spring:
-    druid:
+    datasource:
         name: test
         url: jdbc:mysql://192.168.16.137:3306/test
         username: root
         password:
-        driverClassName: com.mysql.jdbc.Driver
+        # 使用druid数据源
+        type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: com.mysql.jdbc.Driver
         filters: stat
         maxActive: 20
         initialSize: 1

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`@EnableWebMvc`
`16`	`16`	`@SpringBootApplication`
`17`	`17`	`public class Application extends WebMvcConfigurerAdapter {`
`18`		`-`
	`18`	`+`
`19`	`19`	`public static void main(String[] args) {`
`20`	`20`	`SpringApplication.run(Application.class, args);`
`21`	`21`	`}`