[new]update version and readme

Author: VonChange

.gitignore

@@ -1,4 +1,5 @@
 /target/
+/*/target/
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###

README.md

@@ -1,4 +1,4 @@
-## spring-data-jdbc-mybatis
+# spring-data-jdbc-mybatis
 
 [![](https://img.shields.io/badge/Blog-博客-blue.svg)](http://www.vonchange.com/doc/mini.html)
 ![](https://img.shields.io/maven-central/v/com.vonchange.common/spring-data-jdbc-mybatis.svg?label=Maven%20Central)
@@ -8,7 +8,7 @@
 ](https://gitee.com/vonchange/spring-data-jdbc-mybatis)
 
 **spring data jdbc extend mybatis dynamic sql**
-### What Is This?
+## What Is This?
 * It aims at being conceptually easy. In order to achieve this it does NOT offer caching, lazy loading, write behind or many other features of JPA. This makes  a simple, limited, opinionated ORM.
 
 * use mybatis dynamic SQL,it is good for complex SQL
@@ -28,8 +28,19 @@ SELECT  [@id column] FROM user_base
 <if test="null!=createTime">  and create_time < #{createTime}  </if>
 </where>
 ```
-### see  [easy-dynamic-sql.md](easy-dynamic-sql.md)
-### Getting Started with JDBC mybatis
+## see  [easy-dynamic-sql.md](easy-dynamic-sql.md)
+## Features
+### batch update
+> need rewriteBatchedStatements=true&allowMultiQueries=true
+```java
+public interface UserInfoRepository extends CrudRepository<UserInfoDO, Long> {
+    @BatchUpdate
+    int batchUpdate(List<UserInfoDO> list);
+}
+```
+### [multi-datasource.md](multi-datasource.md)
+
+## Getting Started with JDBC mybatis
 
 
 ```java

multi-datasource.md

@@ -0,0 +1,36 @@
+
+```java
+@Configuration
+public class DbConfig {
+    @Bean(name = "dataSource")
+    @Primary
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DataSource mainDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+    
+    @Bean(name = "orderDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.order")
+    public DataSource oldDataSource() {
+        return DataSourceBuilder.create().build();
+    }
+    
+    @Bean("dataSourceWrapper")
+    public DataSourceWrapper dataSourceWrapper(@Qualifier("dataSource")DataSource dataSource) {
+        return new DataSourceWrapper(dataSource,"dataSource");
+    }
+ 
+
+    @Bean("orderDataSourceWrapper")
+    public DataSourceWrapper oldDataSourceWrapper(@Qualifier("orderDataSource")DataSource dataSource) {
+        return new DataSourceWrapper(dataSource,"orderDataSource");
+    }
+
+}
+```
+
+```java
+@DataSourceKey("orderDataSource")
+public interface OrderQueryDao extends QueryRepository {
+}
+```

spring-data-jdbc-mybatis-test/src/main/java/com/vonchange/nine/demo/config/H2Dialect.java renamed to mybatis-sql-extend/src/main/java/com/vonchange/mybatis/dialect/H2Dialect.java

@@ -1,4 +1,4 @@
-package com.vonchange.nine.demo.config;
+package com.vonchange.mybatis.dialect;
 
 
 import com.vonchange.common.util.ConvertUtil;

spring-data-jdbc-mybatis-low-test/src/main/java/com/vonchange/nine/demo/domain/BaseDO.java

@@ -1,8 +1,6 @@
 package com.vonchange.nine.demo.domain;
 
-import com.vonchange.mybatis.tpl.annotation.InsertIfNull;
-import com.vonchange.mybatis.tpl.annotation.UpdateDuplicateKeyIgnore;
-import com.vonchange.mybatis.tpl.annotation.UpdateIfNull;
+
 import com.vonchange.mybatis.tpl.annotation.UpdateNotNull;
 
 import javax.persistence.Id;
@@ -17,12 +15,8 @@ public class BaseDO {
     private Long id;
     @UpdateNotNull
     private Integer isDelete;
-    @InsertIfNull(function = "now()")
     @UpdateNotNull
     private Date createTime;
-    @UpdateDuplicateKeyIgnore
-    @InsertIfNull(function = "now()")
-    @UpdateIfNull(function = "now()")
     private Date updateTime;
 
     public BaseDO(){

spring-data-jdbc-mybatis-low-test/src/main/java/com/vonchange/nine/demo/domain/UserBaseDO.java

@@ -1,7 +1,5 @@
 package com.vonchange.nine.demo.domain;
 
-import com.vonchange.mybatis.tpl.annotation.InsertIfNull;
-import com.vonchange.mybatis.tpl.annotation.UpdateIfNull;
 import com.vonchange.mybatis.tpl.annotation.UpdateNotNull;
 
 import javax.persistence.Column;
@@ -27,12 +25,8 @@ public class UserBaseDO {
     //@InsertIfNull("0")
     @UpdateNotNull
     private Integer isDelete;
-    @InsertIfNull(function = "now()")
     @UpdateNotNull
     private LocalDateTime createTime;
-    //@UpdateDuplicateKeyIgnore
-    @InsertIfNull(function = "now()")
-    @UpdateIfNull(function = "now()")
     private Date updateTime;
     private EnumDelete enumDelete;
     private byte[] headImageData;

spring-data-jdbc-mybatis-low-test/src/main/java/com/vonchange/nine/demo/jpa/UserBase.java

@@ -1,7 +1,6 @@
 package com.vonchange.nine.demo.jpa;
 
-import com.vonchange.mybatis.tpl.annotation.InsertIfNull;
-import com.vonchange.mybatis.tpl.annotation.UpdateIfNull;
+
 import com.vonchange.mybatis.tpl.annotation.UpdateNotNull;
 
 import javax.persistence.Column;
@@ -29,12 +28,10 @@ public class UserBase {
     //@InsertIfNull("0")
     @UpdateNotNull
     private Integer isDelete;
-    @InsertIfNull(function = "now()")
+
     @UpdateNotNull
     private LocalDateTime createTime;
-    //@UpdateDuplicateKeyIgnore
-    @InsertIfNull(function = "now()")
-    @UpdateIfNull(function = "now()")
+
     private Date updateTime;
     private byte[] headImageData;
     public UserBase(){

spring-data-jdbc-mybatis-low-test/src/test/java/com/vonchange/nine/demo/dao/UserBaseRepositoryTest.java

@@ -142,15 +142,6 @@ public void insert() throws IOException {
     }
 
 
-    @Test
-    public void insertDuplicateKey() {
-        UserBaseDO userBaseDO = new UserBaseDO();
-        userBaseDO.setUserName("UUUUU");
-        userBaseDO.setMobilePhone("110");
-        int result  = userBaseRepository.insertDuplicateKey(userBaseDO);
-        log.info("\nresult {} {}",result,userBaseDO.getId());
-
-    }
     @Test
     //@Transactional
     //@Rollback
@@ -196,26 +187,6 @@ public void insertBatch() {
 
 
 
-    /**
-     * 批量插入
-     */
-    @Test
-    @Transactional
-    public void insertBatchDuplicateKey() {
-        int result  = userBaseRepository.update(new UserBaseDO(1L,"testxx","",1,null,null));
-        log.info("result {}",result);
-        long start = System.currentTimeMillis();
-        List<UserBaseDO> list = new ArrayList<>();
-        for (int i=0;i<10000;i++) {
-            list.add(new UserBaseDO(null,"三e"+i,"1100"+i,null, LocalDateTime.now(),null));
-        }
-        int resultx = userBaseRepository.insertBatchDuplicateKey(list,5000);
-        log.info("id {}",list.get(0).getId());
-        log.info("result {}",resultx);
-        int resulty = userBaseRepository.insertBatchDuplicateKey(list,5000);
-        log.info("result {}",resulty);
-        log.info("time {}",System.currentTimeMillis()-start);//1554
-    }
 
     @Test
     //@Transactional

spring-data-jdbc-mybatis-low/src/main/java/com/vonchange/jdbc/mybatis/core/support/BaseRepository.java

@@ -42,14 +42,7 @@ public interface BaseRepository<T, ID extends Serializable> extends Repository<T
 
 	<S extends T> int insertBatch(List<S> entitys,int batchSize);
 
-	<S extends T> int  insertBatchDuplicateKey(List<S> entitys,int batchSize);
 
-	/**
-	 * insert into  on duplication key
-	 * @param entity
-	 * @param <S>
-	 */
-	<S extends T> int insertDuplicateKey(S entity);
 
 	/**
 	 * 默认只更新不为空的字段

spring-data-jdbc-mybatis-low/src/main/java/com/vonchange/jdbc/mybatis/core/support/JdbcRepositoryFactory.java

@@ -15,8 +15,10 @@
  */
 package com.vonchange.jdbc.mybatis.core.support;
 
+import com.vonchange.common.util.MarkdownUtil;
+import com.vonchange.common.util.StringPool;
 import com.vonchange.jdbc.abstractjdbc.core.JdbcRepository;
-import com.vonchange.jdbc.abstractjdbc.util.markdown.MarkdownUtil;
+
 import com.vonchange.jdbc.mybatis.core.config.ConfigInfo;
 import com.vonchange.jdbc.mybatis.core.config.DataSourceWrapperHelper;
 import com.vonchange.jdbc.mybatis.core.query.DataSourceKey;
@@ -76,9 +78,7 @@ protected Object getTargetRepository(RepositoryInformation repositoryInformation
 		String interfaceName =repositoryInformation.getRepositoryInterface().getSimpleName();
 		SqlPackage sqlPackage=	repositoryInformation.getRepositoryInterface().getAnnotation(SqlPackage.class);
 		String configLoc=null!=sqlPackage?sqlPackage.value():"sql";
-		if(MarkdownUtil.markdownFileExist(configLoc,interfaceName+".md")){
-			MarkdownUtil.readMarkdownFile(configLoc,interfaceName+".md",false);
-		}
+		MarkdownUtil.readMarkdownFile(configLoc+ StringPool.DOT+interfaceName,false);
 		DataSourceKey dataSourceKey=repositoryInformation.getRepositoryInterface().getAnnotation(DataSourceKey.class);
 		String dataSourceKeyValue=null!=dataSourceKey?dataSourceKey.value():null;
 		ConfigInfo configInfo= new ConfigInfo();

spring-data-jdbc-mybatis-low/src/main/java/com/vonchange/jdbc/mybatis/core/support/JdbcRepositoryQuery.java

@@ -109,8 +109,9 @@ private Object executeDo(Object[] objects) {
 			return operations.insert(dataSourceWrapper, sqlId, parameters.getParameter());
 		}
 		if (null != parameters.getAbstractPageWork()) {
-			operations.queryBigData(dataSourceWrapper, parameters.getAbstractPageWorkClass(), sqlId,
-					parameters.getAbstractPageWork(), parameters.getParameter());
+			//@@@
+			//operations.queryBigData(dataSourceWrapper, parameters.getAbstractPageWorkClass(), sqlId,
+				//	parameters.getAbstractPageWork(), parameters.getParameter());
 		}
 		if (queryMethod.isCollectionQuery() || queryMethod.isStreamQuery()) {
 			return operations.queryList(dataSourceWrapper, queryMethod.getReturnedObjectType(), sqlId,

spring-data-jdbc-mybatis-low/src/main/java/com/vonchange/jdbc/mybatis/core/support/SimpleJdbcRepository.java

@@ -52,15 +52,6 @@ public <S extends T> int insertBatch(List<S> entitys, int batchSize) {
 		return entityOperations.insertBatch(configInfo.getDataSourceWrapper(), entitys, batchSize);
 	}
 
-	@Override
-	public <S extends T> int insertBatchDuplicateKey(List<S> entitys, int batchSize) {
-		return entityOperations.insertBatchDuplicateKey(configInfo.getDataSourceWrapper(), entitys, batchSize);
-	}
-
-	@Override
-	public <S extends T> int insertDuplicateKey(S entity) {
-		return entityOperations.insertDuplicateKey(configInfo.getDataSourceWrapper(), entity);
-	}
 
 	@Override
 	public <S extends T> int update(S entity) {

spring-data-jdbc-mybatis-low/src/main/java/com/vonchange/jdbc/mybatis/repository/JdbcRepositorySpringDataImpl.java

@@ -116,10 +116,6 @@ protected DataSourceWrapper getDataSourceFromSql(String sql) {
         return dataSourceInSql.getDataSourceFromSql(sql);
     }
 
-    @Override
-    protected int batchSize() {
-        return batchSize;
-    }
 
     @Override
     protected boolean logRead() {

spring-data-jdbc-mybatis-test/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <version>2.7.18</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.vonchange.common</groupId>

spring-data-jdbc-mybatis-test/src/main/java/com/vonchange/nine/demo/config/DBConfig.java

@@ -15,7 +15,7 @@
 
 
 @Configuration
-public class DBConfig implements InitializingBean {
+public class DBConfig {
     @Bean(name = "dataSource")
     @Primary
     @ConfigurationProperties(prefix = "spring.datasource.hikari")
@@ -46,11 +46,5 @@ public DataSource[] allReadDataSources() {
             }
         };
     }
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        /*DataSource dataSource=mainDataSource();
-        Connection connection = DataSourceUtils.getConnection(dataSource);
-        DataSourceUtils.releaseConnection(connection,dataSource);*/
-    }
 
 }

spring-data-jdbc-mybatis-test/src/main/java/com/vonchange/nine/demo/dao/UserInfoRepository.java

@@ -34,7 +34,7 @@ List<UserInfoDO> findListByIds(@Param("userName") String userName,
   @BatchUpdate
   int batchUpdate(List<UserInfoDO> list);
 
-  @BatchUpdate(size = 5000)
+  @BatchUpdate(size = 1000)
   int batchInsert(List<UserInfoDO> list);
 
   List<Long> findLongList();