Merge branch 'dev-2.0' into dev

Conflicts:
	mybatis-plus/src/main/java/com/baomidou/framework/service/IService.java
	mybatis-plus/src/main/java/com/baomidou/framework/service/impl/ServiceImpl.java
	mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java
	mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/StringEscape.java
	mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/StringUtils.java
	mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/EntityWrapperTest.java

mybatis-plus/pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.baomidou</groupId>
 	<artifactId>mybatis-plus</artifactId>
-	<version>2.0</version>
+	<version>1.4.8</version>
 	<packaging>jar</packaging>
 
 	<name>mybatis-plus</name>
@@ -125,24 +125,6 @@
 			<version>${contiperf.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.xerial</groupId>
-			<artifactId>sqlite-jdbc</artifactId>
-			<version>3.14.2.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-			<version>9.1-901-1.jdbc4</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.hsqldb</groupId>
-			<artifactId>hsqldb</artifactId>
-			<version>2.3.4</version>
-			<scope>test</scope>
-		</dependency>
 		<!-- test end -->
 	</dependencies>
 

mybatis-plus/src/main/java/com/baomidou/framework/service/IService.java

@@ -30,7 +30,7 @@ import java.util.Map;
  * @author hubin
  * @Date 2016-04-20
  */
-public interface IService<T> {
+public interface IService<T, PK> {
 
 	/**
 	 * <p>

mybatis-plus/src/main/java/com/baomidou/framework/service/impl/ServiceImpl.java

@@ -41,7 +41,7 @@ import java.util.logging.Logger;
  * @author hubin
  * @Date 2016-04-20
  */
-public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
+public class ServiceImpl<M extends BaseMapper<T, PK>, T, PK extends Serializable> implements IService<T, PK> {
 
     protected Class<T> modleClass = ReflectionKit.getSuperClassGenricType(getClass(), 1);
 

mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisConfiguration.java

@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.mapper.DBType;
 import com.baomidou.mybatisplus.mapper.IMetaObjectHandler;
 import com.baomidou.mybatisplus.mapper.ISqlInjector;
 import org.apache.ibatis.binding.MapperRegistry;
-import org.apache.ibatis.mapping.Environment;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSession;
@@ -92,15 +91,6 @@ public class MybatisConfiguration extends Configuration {
 		System.err.println("mybatis-plus init success.");
 	}
 
-	/**
-	 * JDBC开启ActiveRecord
-	 * 
-	 * @param environment
-	 */
-	public MybatisConfiguration(Environment environment) {
-		super(environment);
-	}
-
 	/**
 	 * <p>
 	 * MybatisPlus 加载 SQL 顺序：

mybatis-plus/src/main/java/com/baomidou/mybatisplus/MybatisMapperRegistry.java

@@ -42,8 +42,6 @@ public class MybatisMapperRegistry extends MapperRegistry {
 	public MybatisMapperRegistry(Configuration config) {
 		super(config);
 		this.config = config;
-		// TODO 注入全局CRUD SQL
-		MybatisConfiguration.SQL_INJECTOR.injectOfSql(config);
 	}
 
 	@SuppressWarnings("unchecked")

mybatis-plus/src/main/java/com/baomidou/mybatisplus/generator/ConfigGenerator.java

@@ -173,7 +173,11 @@ public class ConfigGenerator {
 
 	public String getSuperService() {
 		if (StringUtils.isEmpty(superService)) {
-			return "com.baomidou.framework.service.IService";
+			if (this.getConfigIdType() == ConfigIdType.STRING) {
+				return "com.baomidou.framework.service.ICommonService";
+			} else {
+				return "com.baomidou.framework.service.ISuperService";
+			}
 		}
 		return superService;
 	}
@@ -184,7 +188,11 @@ public class ConfigGenerator {
 
 	public String getSuperServiceImpl() {
 		if (StringUtils.isEmpty(superServiceImpl)) {
-			return "com.baomidou.framework.service.impl.ServiceImpl";
+			if (this.getConfigIdType() == ConfigIdType.STRING) {
+				return "com.baomidou.framework.service.impl.CommonServiceImpl";
+			} else {
+				return "com.baomidou.framework.service.impl.SuperServiceImpl";
+			}
 		}
 		return superServiceImpl;
 	}

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/AutoSqlInjector.java

@@ -15,13 +15,12 @@
  */
 package com.baomidou.mybatisplus.mapper;
 
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Logger;
-
+import com.baomidou.mybatisplus.MybatisConfiguration;
+import com.baomidou.mybatisplus.annotations.FieldStrategy;
+import com.baomidou.mybatisplus.annotations.IdType;
+import com.baomidou.mybatisplus.toolkit.TableFieldInfo;
+import com.baomidou.mybatisplus.toolkit.TableInfo;
+import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
 import org.apache.ibatis.executor.keygen.KeyGenerator;
@@ -34,12 +33,12 @@ import org.apache.ibatis.scripting.LanguageDriver;
 import org.apache.ibatis.scripting.defaults.RawSqlSource;
 import org.apache.ibatis.session.Configuration;
 
-import com.baomidou.mybatisplus.MybatisConfiguration;
-import com.baomidou.mybatisplus.annotations.FieldStrategy;
-import com.baomidou.mybatisplus.annotations.IdType;
-import com.baomidou.mybatisplus.toolkit.TableFieldInfo;
-import com.baomidou.mybatisplus.toolkit.TableInfo;
-import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Logger;
 
 /**
  * <p>

mybatis-plus/src/main/java/com/baomidou/mybatisplus/mapper/BaseMapper.java

@@ -33,7 +33,7 @@ import java.util.Map;
  * @author hubin
  * @Date 2016-01-23
  */
-public interface BaseMapper<T> {
+public interface BaseMapper<T, PK extends Serializable> {
 
 	/**
 	 * <p>

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/Sequence.java

@@ -15,13 +15,13 @@
  */
 package com.baomidou.mybatisplus.toolkit;
 
+import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
+
 import java.lang.management.ManagementFactory;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.util.logging.Logger;
 
-import com.baomidou.mybatisplus.exceptions.MybatisPlusException;
-
 /**
  * <p>
  * 分布式高效有序ID生产黑科技(sequence) <br>
@@ -68,11 +68,11 @@ public class Sequence {
 	public Sequence(long workerId, long datacenterId) {
 		if (workerId > maxWorkerId || workerId < 0) {
 			throw new MybatisPlusException(
-					String.format("worker Id can't be greater than %dialect or less than 0", maxWorkerId));
+					String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
 		}
 		if (datacenterId > maxDatacenterId || datacenterId < 0) {
 			throw new MybatisPlusException(
-					String.format("datacenter Id can't be greater than %dialect or less than 0", maxDatacenterId));
+					String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
 		}
 		this.workerId = workerId;
 		this.datacenterId = datacenterId;
@@ -87,7 +87,7 @@ public class Sequence {
 		long timestamp = timeGen();
 		if (timestamp < lastTimestamp) {
 			throw new MybatisPlusException(String.format(
-					"Clock moved backwards. Refusing to generate id for %dialect milliseconds", lastTimestamp - timestamp));
+					"Clock moved backwards. Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
 		}
 		if (lastTimestamp == timestamp) {
 			sequence = (sequence + 1) & sequenceMask;

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/StringEscape.java

@@ -2,7 +2,7 @@ package com.baomidou.mybatisplus.toolkit;
 
 /**
  * <p>
- * StringEscape ，数据库字符串转义
+ * EscapeOfString ，数据库字符串转义
  * </p>
  *
  * @author Caratacus
@@ -24,20 +24,6 @@ public class StringEscape {
 			char c = x.charAt(i);
 
 			switch (c) {
-				case 0: /* Must be escaped for 'mysql' */
-
-					needsHexEscape = true;
-					break;
-
-				case '\n': /* Must be escaped for logs */
-					needsHexEscape = true;
-
-					break;
-
-				case '\r':
-					needsHexEscape = true;
-					break;
-
 				case '\\':
 					needsHexEscape = true;
 
@@ -53,9 +39,6 @@ public class StringEscape {
 
 					break;
 
-				case '\032': /* This gives problems on Win32 */
-					needsHexEscape = true;
-					break;
 			}
 
 			if (needsHexEscape) {
@@ -93,23 +76,6 @@ public class StringEscape {
 				char c = x.charAt(i);
 
 				switch (c) {
-					case 0: /* Must be escaped for 'mysql' */
-						buf.append('\\');
-						buf.append('0');
-
-						break;
-
-					case '\n': /* Must be escaped for logs */
-						buf.append('\\');
-						buf.append('n');
-
-						break;
-
-					case '\r':
-						buf.append('\\');
-						buf.append('r');
-
-						break;
 
 					case '\\':
 						buf.append('\\');
@@ -120,19 +86,11 @@ public class StringEscape {
 					case '\'':
 						buf.append('\\');
 						buf.append('\'');
-
 						break;
 
 					case '"': /* Better safe than sorry */
 						buf.append('\\');
 						buf.append('"');
-
-						break;
-
-					case '\032': /* This gives problems on Win32 */
-						buf.append('\\');
-						buf.append('Z');
-
 						break;
 
 					default:

mybatis-plus/src/main/java/com/baomidou/mybatisplus/toolkit/TableInfoHelper.java

@@ -218,8 +218,6 @@ public class TableInfoHelper {
             if (null == tableInfo.getSqlSessionFactory()) {
                 tableInfo.setSqlSessionFactory(sqlSessionFactory);
             }
-
-
         }
     }
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/RoleMapper.java

@@ -1,12 +1,12 @@
 package com.baomidou.mybatisplus.test.mysql;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.mapper.AutoMapper;
 import com.baomidou.mybatisplus.test.mysql.entity.Role;
 
 /**
  * @author junyu
  * @Date 2016-09-09
  */
-public interface RoleMapper extends BaseMapper<Role> {
+public interface RoleMapper extends AutoMapper<Role> {
 
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/TestMapper.java

@@ -17,18 +17,18 @@ package com.baomidou.mybatisplus.test.mysql;
 
 import org.apache.ibatis.annotations.Insert;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.mapper.AutoMapper;
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
 
 /**
  * <p>
- * 继承 BaseMapper，就自动拥有CRUD方法
+ * 继承 AutoMapper，就自动拥有CRUD方法
  * </p>
- * 
+ *
  * @author Caratacus hubin
  * @Date 2016-09-25
  */
-public interface TestMapper extends BaseMapper<Test> {
+public interface TestMapper extends AutoMapper<Test> {
 
 	/**
 	 * 注解插入【测试】

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapper.java

@@ -15,7 +15,7 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.mapper.AutoMapper;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.session.RowBounds;
@@ -24,27 +24,27 @@ import java.util.List;
 
 /**
  * <p>
- * 继承 BaseMapper，就自动拥有CRUD方法
+ * 继承 AutoMapper，就自动拥有CRUD方法
  * </p>
- * 
+ *
  * @author hubin
  * @Date 2016-01-23
  */
-public interface UserMapper extends BaseMapper<User> {
+public interface UserMapper extends AutoMapper<User> {
 
 	/**
 	 * 用户列表，分页显示
-	 * 
+	 *
 	 * @param pagination
 	 *            传递参数包含该属性，即自动分页
 	 * @return
 	 */
 	List<User> selectListRow(RowBounds pagination);
-	
+
 	/**
 	 * 注解插入【测试】
 	 */
-	@Insert("insert into user(test_id,name,age) values(#{id},#{name},#{age})")  
+	@Insert("insert into user(test_id,name,age) values(#{id},#{name},#{age})")
 	int insertInjector(User user);
 
 	/**

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java

@@ -65,7 +65,7 @@ public class UserMapperTest {
 
 		/*
          * 此处采用 MybatisSessionFactoryBuilder 构建
-		 * SqlSessionFactory，目的是引入BaseMapper功能
+		 * SqlSessionFactory，目的是引入AutoMapper功能
 		 */
         MybatisSessionFactoryBuilder mf = new MybatisSessionFactoryBuilder();
 
@@ -110,7 +110,7 @@ public class UserMapperTest {
         int rlt = userMapper.insert(userA);
         User whereUser = userMapper.selectOne(userA);
         print(whereUser);
-        
+
         userA.setAge(18);
         userMapper.updateById(userA);
         userMapper.deleteSelective(userA);
@@ -200,7 +200,7 @@ public class UserMapperTest {
          * 修改
          * </p>
          *
-         * updateById 是从 BaseMapper 中继承而来的，UserMapper.xml中并没有申明改sql
+         * updateById 是从 AutoMapper 中继承而来的，UserMapper.xml中并没有申明改sql
          *
          */
         rlt = userMapper.updateSelectiveById(new User(12L, "MybatisPlus"));

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/entity/Test.java

@@ -15,11 +15,12 @@
  */
 package com.baomidou.mybatisplus.test.mysql.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 测试没有XML同样注入CRUD SQL 实体
@@ -29,11 +30,10 @@ import com.baomidou.mybatisplus.annotations.TableName;
  * @Date 2016-09-25
  */
 @TableName("test")
-public class Test extends Model<Test> {
+public class Test implements Serializable {
 
 	@TableField(exist = false)
 	private static final long serialVersionUID = 1L;
-	public static final Test instance = new Test();
 
 	/** 主键 */
 	@TableId
@@ -65,5 +65,4 @@ public class Test extends Model<Test> {
 	public void setType(String type) {
 		this.type = type;
 	}
-
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/oracle/TestUserMapper.java

@@ -1,6 +1,6 @@
 package com.baomidou.mybatisplus.test.oracle;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.mapper.CommonMapper;
 import com.baomidou.mybatisplus.test.oracle.entity.TestUser;
 
 /**
@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.test.oracle.entity.TestUser;
  * TestUser 表数据库控制层接口
  *
  */
-public interface TestUserMapper extends BaseMapper<TestUser> {
+public interface TestUserMapper extends CommonMapper<TestUser> {
 
 
 }

mybatis-plus/src/test/resources/mysql-config.xml

@@ -84,7 +84,7 @@
 				<property name="driver" value="com.mysql.jdbc.Driver" />
 				<property name="url" value="jdbc:mysql://localhost:3306/mybatis-plus" />
 				<property name="username" value="root" />
-				<property name="password" value="521" />
+				<property name="password" value="123456" />
 			<!-- 
 				<property name="driver" value="${jdbc.driver}" />
 				<property name="url" value="${jdbc.url}" />