#7bug修復

Author: chenlei2

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/J2SE-1.5">
 		<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.5
+org.eclipse.jdt.core.compiler.compliance=1.5
 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.5

spring-boot-mybatis-rw/spring-boot-mybatis-rw-starter/.settings/org.eclipse.wst.common.component

@@ -2,5 +2,6 @@
     <wb-module deploy-name="spring-boot-mybatis-rw-starter">
         <wb-resource deploy-path="/" source-path="/src/main/java"/>
         <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+        <wb-resource deploy-path="/" source-path="/src/test/java"/>
     </wb-module>
 </project-modules>

spring-boot-mybatis-rw/spring-boot-mybatis-rw-starter/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
   <installed facet="jst.utility" version="1.0"/>
-  <installed facet="java" version="1.8"/>
+  <installed facet="java" version="1.5"/>
 </faceted-project>

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

@@ -30,14 +30,14 @@ 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;
 
 	/**
-	 * Create a new LazyConnectionDataSourceProxy.
+	 * Create a new LazyConnectionDataSourceProxy.a
 	 * 
 	 * @see #setTargetDataSource
 	 */
@@ -275,7 +275,9 @@ 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);
+					connectionMap.remove(ConnectionHold.READ);
+					ConnectionHold.FORCE_WRITE.set(Boolean.FALSE);
+					Connection writeCon = connectionMap.remove(ConnectionHold.WRITE);
 					if (writeCon != null) {
 						writeCon.close();
 					}
@@ -288,15 +290,8 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			// 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();
 			}

spring-boot-mybatis-rw/spring-boot-mybatis-rw-starter/src/main/java/org/spring/boot/mybatis/rw/starter/pulgin/RWPlugin.java

@@ -52,7 +52,7 @@ public Object intercept(Invocation invocation) throws Throwable {
 			}
 			String key = ConnectionHold.WRITE;
 
-			if (mappedStatement.getSqlCommandType() == SqlCommandType.SELECT) {
+			if (mappedStatement.getSqlCommandType() == SqlCommandType.SELECT && !mappedStatement.getId().endsWith("!selectKey")) {
 				key = ConnectionHold.READ;
 			} 
 			routeConnection(key, conn);