test

Author: chenl

spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/.classpath

@@ -17,7 +17,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/.settings/org.eclipse.jdt.core.prefs

@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/pom.xml

@@ -13,6 +13,7 @@
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <java.version>1.8</java.version>
   </properties>
   <dependencies>
   	  <dependency>

spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/sql/students.sql

@@ -24,7 +24,7 @@ CREATE TABLE `students` (
   `id` bigint(20) NOT NULL,
   `name` varchar(20) DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=UTF-8;
 
 /*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
 /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/src/main/java/org/spring/boot/mybatis/rw/sample/service/impl/StrudentsServiceImpl.java

@@ -13,14 +13,14 @@ public class StrudentsServiceImpl implements StrudentsService {
 	private StudentsMapper studentsMapper;
 	@Autowired
 	private SqlSessionTemplate sqlSessionTemplate;
-	@Transactional
+//	@Transactional
 	public void rw() {
 
 		Students students = (Students)sqlSessionTemplate.selectOne("selectByPrimaryKey", 1L);
 		System.out.println(students.getName());
 		students.setName("rw");
 		sqlSessionTemplate.update("updateByPrimaryKeySelective", students);
-		//studentsMapper.updateByPrimaryKeySelective(students);
+		studentsMapper.updateByPrimaryKeySelective(students);
 		students.setId(2L);
 		studentsMapper.updateByPrimaryKeySelective(students);
 		students = studentsMapper.selectByPrimaryKey(2L);

spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/src/main/resources/application.properties

@@ -5,12 +5,12 @@ spring.data.mybatis.typeAliasesPackage=org.spring.boot.mybatis.rw.sample.mapper
 spring.mybatis.rw.readDataSources[0].url=jdbc:MySql://localhost:3306/test?characterEncoding=UTF-8
 spring.mybatis.rw.readDataSources[0].driverClassName=com.mysql.jdbc.Driver
 spring.mybatis.rw.readDataSources[0].username=root
-spring.mybatis.rw.readDataSources[0].password=123456
+spring.mybatis.rw.readDataSources[0].password=root
 
 spring.mybatis.rw.writeDataSource.url=jdbc:MySql://localhost:3306/chenlei?characterEncoding=UTF-8
 spring.mybatis.rw.writeDataSource.driverClassName=com.mysql.jdbc.Driver
 spring.mybatis.rw.writeDataSource.username=root
-spring.mybatis.rw.writeDataSource.password=123456
+spring.mybatis.rw.writeDataSource.password=root
 
 server.servletPath=/user
 

spring-boot-mybatis-rw/spring-boot-mybatis-rw-starter/pom.xml

@@ -13,6 +13,7 @@
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+     <java.version>1.8</java.version>
   </properties>
   <dependencies>
 		<dependency>

spring-boot-mybatis-rw/spring-boot-mybatis-rw-starter/src/main/java/org/spring/boot/mybatis/rw/starter/datasource/DataSourceProxy.java

@@ -30,9 +30,9 @@ public class DataSourceProxy implements DataSource {
 
 	private static final Log logger = LogFactory.getLog(DataSourceProxy.class);
 
-	private Boolean defaultAutoCommit;
+	private Boolean defaultAutoCommit = Boolean.TRUE;
 
-	private Integer defaultTransactionIsolation;
+	private Integer defaultTransactionIsolation = 2;
 
 	private DataSourceRout dataSourceRout;
 
@@ -275,7 +275,11 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 				}
 				if (method.getName().equals("close")) {
 					Map<String, Connection> connectionMap = ConnectionHold.CONNECTION_CONTEXT.get();
-					Connection writeCon = connectionMap.get(ConnectionHold.WRITE);
+					Connection readCon = connectionMap.remove(ConnectionHold.READ);
+					if (readCon != null) {
+					    readCon.close();
+                    }
+					Connection writeCon = connectionMap.remove(ConnectionHold.WRITE);
 					if (writeCon != null) {
 						writeCon.close();
 					}
@@ -287,16 +291,11 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			// Target Connection already fetched,
 			// or target Connection necessary for current operation ->
 			// invoke method on target connection.
+			
 			try {
-				if (!hasTargetConnection()) {
-					Connection conn = getTargetConnection(method);
-					return method.invoke(conn, args);
-
-				} else {
-					return method.invoke(
-							ConnectionHold.CONNECTION_CONTEXT.get().get(ConnectionHold.CURRENT_CONNECTION.get()), args);
+			    return method.invoke(
+	                     ConnectionHold.CONNECTION_CONTEXT.get().get(ConnectionHold.CURRENT_CONNECTION.get()), args);
 
-				}
 			} catch (InvocationTargetException ex) {
 				throw ex.getTargetException();
 			}