完善，调整。

abel533 · abel533 · commit 416a9028746a · 2015-12-24T22:20:08.000+08:00
diff --git a/README.md b/README.md
@@ -29,7 +29,7 @@ public class MyBatisMapperScannerConfig {
         mapperScannerConfigurer.setSqlSessionFactoryBeanName("sqlSessionFactory");
         mapperScannerConfigurer.setBasePackage("tk.mybatis.springboot.mapper");
         Properties properties = new Properties();
-        properties.setProperty("mappers", "tk.mybatis.mapper.MyMapper");
+        properties.setProperty("mappers", "tk.mybatis.springboot.util.MyMapper");
         properties.setProperty("notEmpty", "false");
         properties.setProperty("IDENTITY", "MYSQL");
         //这里使用的通用Mapper的MapperScannerConfigurer，所有有下面这个方法
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/MyBatisConfig.java b/src/main/java/tk/mybatis/springboot/conf/MyBatisConfig.java
@@ -28,14 +28,18 @@
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 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 org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 
 import javax.sql.DataSource;
-import java.io.IOException;
 import java.util.Properties;
 
 /**
@@ -45,19 +49,14 @@
  * @since 2015-12-19 10:11
  */
 @Configuration
-public class MyBatisConfig {
+@EnableTransactionManagement
+public class MyBatisConfig implements TransactionManagementConfigurer {
 
     @Autowired
     DataSource dataSource;
 
-    @Autowired
-    SqlSessionFactoryBean sqlSessionFactoryBean;
-
-    @Autowired
-    SqlSessionFactory sqlSessionFactory;
-
     @Bean(name = "sqlSessionFactory")
-    public SqlSessionFactoryBean sqlSessionFactoryBean() {
+    public SqlSessionFactory sqlSessionFactoryBean() {
         SqlSessionFactoryBean bean = new SqlSessionFactoryBean();
         bean.setDataSource(dataSource);
         bean.setTypeAliasesPackage("tk.mybatis.springboot.model");
@@ -78,19 +77,21 @@ public SqlSessionFactoryBean sqlSessionFactoryBean() {
         ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
         try {
             bean.setMapperLocations(resolver.getResources("classpath:mapper/*.xml"));
-        } catch (IOException e) {
+            return bean.getObject();
+        } catch (Exception e) {
             e.printStackTrace();
+            throw new RuntimeException(e);
         }
-        return bean;
     }
 
     @Bean
-    public SqlSessionFactory sqlSessionFactory() {
-        try {
-            return sqlSessionFactoryBean.getObject();
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new RuntimeException(e);
-        }
+    public SqlSessionTemplate sqlSessionTemplate(SqlSessionFactory sqlSessionFactory) {
+        return new SqlSessionTemplate(sqlSessionFactory);
+    }
+
+    @Bean
+    @Override
+    public PlatformTransactionManager annotationDrivenTransactionManager() {
+        return new DataSourceTransactionManager(dataSource);
     }
 }
diff --git a/src/main/java/tk/mybatis/springboot/conf/MyBatisMapperScannerConfig.java b/src/main/java/tk/mybatis/springboot/conf/MyBatisMapperScannerConfig.java
@@ -48,7 +48,7 @@ public MapperScannerConfigurer mapperScannerConfigurer() {
         mapperScannerConfigurer.setSqlSessionFactoryBeanName("sqlSessionFactory");
         mapperScannerConfigurer.setBasePackage("tk.mybatis.springboot.mapper");
         Properties properties = new Properties();
-        properties.setProperty("mappers", "tk.mybatis.mapper.MyMapper");
+        properties.setProperty("mappers", "tk.mybatis.springboot.util.MyMapper");
         properties.setProperty("notEmpty", "false");
         properties.setProperty("IDENTITY", "MYSQL");
         mapperScannerConfigurer.setProperties(properties);
diff --git a/src/main/java/tk/mybatis/springboot/mapper/CountryMapper.java b/src/main/java/tk/mybatis/springboot/mapper/CountryMapper.java
@@ -24,8 +24,8 @@
 
 package tk.mybatis.springboot.mapper;
 
-import tk.mybatis.mapper.MyMapper;
 import tk.mybatis.springboot.model.Country;
+import tk.mybatis.springboot.util.MyMapper;
 
 public interface CountryMapper extends MyMapper<Country> {
 
diff --git a/src/main/java/tk/mybatis/springboot/util/MyMapper.java b/src/main/java/tk/mybatis/springboot/util/MyMapper.java
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-package tk.mybatis.mapper;
+package tk.mybatis.springboot.util;
 
 import tk.mybatis.mapper.common.Mapper;
 import tk.mybatis.mapper.common.MySqlMapper;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -45,7 +45,7 @@ spring:
 #        returnPageInfo: check
 #        params: count=countSql
 #    mapper:
-#        mappers: tk.mybatis.mapper.MyMapper
+#        mappers: tk.mybatis.springboot.util.MyMapper
 #        notEmpty: true
 #        style: camelhump
 #    sqlSessionFactoryBean:
diff --git a/src/main/resources/templates/view.ftl b/src/main/resources/templates/view.ftl
@@ -19,11 +19,11 @@
             </td>
             <td><input type="submit" value="保存"/></td>
         </tr>
-        <#if msg??>
+    <#if msg??>
         <tr style="color:#00ba00;">
             <th colspan="5">${msg}</th>
         </tr>
-        </#if>
+    </#if>
     </table>
 </form>
 </body>

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`	`}`