Merge branch 'master' of

https://github.com/chenlei2/spring-boot-mybatis-rw.git

Conflicts:
	spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/.classpath
	spring-boot-mybatis-rw/spring-boot-mybatis-rw-sample/.settings/org.eclipse.jdt.core.prefs
	spring-boot-mybatis-rw/spring-boot-mybatis-rw-starter/src/main/java/org/spring/boot/mybatis/rw/starter/datasource/DataSourceProxy.java

Author: chenl

spring-boot-mybatis-rw/spring-boot-mybatis-rw-starter/.settings/org.eclipse.core.resources.prefs

@@ -1,4 +1,5 @@
 eclipse.preferences.version=1
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
 encoding/<project>=UTF-8

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

@@ -37,7 +37,7 @@ public class DataSourceProxy implements DataSource {
 	private DataSourceRout dataSourceRout;
 
 	/**
-	 * Create a new LazyConnectionDataSourceProxy.
+	 * Create a new LazyConnectionDataSourceProxy.a
 	 * 
 	 * @see #setTargetDataSource
 	 */
@@ -274,6 +274,7 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 					return null;
 				}
 				if (method.getName().equals("close")) {
+		            ConnectionHold.FORCE_WRITE.set(Boolean.FALSE);
 					Map<String, Connection> connectionMap = ConnectionHold.CONNECTION_CONTEXT.get();
 					Connection readCon = connectionMap.remove(ConnectionHold.READ);
 					if (readCon != null) {
@@ -295,7 +296,6 @@ public Object invoke(Object proxy, Method method, Object[] args) throws Throwabl
 			try {
 			    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);