rename package

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/IJpaMapper.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/IJpaMapper.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa;
 
 import java.util.List;
 import org.apache.ibatis.annotations.DeleteProvider;
@@ -23,6 +23,7 @@ import org.apache.ibatis.annotations.InsertProvider;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
 import org.apache.ibatis.annotations.UpdateProvider;
+import org.dromara.mybatis.jpa.provider.MapperSqlProvider;
 import org.dromara.mybatis.jpa.query.Query;
 
 /**

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/JpaService.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/JpaService.java

@@ -15,14 +15,16 @@
  */
  
 
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa;
 
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import org.dromara.mybatis.jpa.PageResultsSqlCache;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
+import org.dromara.mybatis.jpa.entity.JpaPageResults;
+import org.dromara.mybatis.jpa.entity.PageResultsSqlCache;
 import org.dromara.mybatis.jpa.query.Query;
 import org.dromara.mybatis.jpa.util.BeanUtil;
 import org.dromara.mybatis.jpa.util.InstanceUtil;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/MyBatisSessionFactoryBean.java

@@ -23,6 +23,7 @@ import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.dromara.mybatis.jpa.dialect.Dialect;
+import org.dromara.mybatis.jpa.interceptor.StatementHandlerInterceptor;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/DB2Dialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 
 public class DB2Dialect extends Dialect {
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/DerbyDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 
 public class DerbyDialect extends Dialect {
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/Dialect.java

@@ -21,7 +21,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.util.HashMap;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/HighgoDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 
 public class HighgoDialect extends Dialect {
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/MySQLDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 
 public class MySQLDialect extends Dialect {
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/OracleDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 
 public class OracleDialect extends Dialect {
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/PostgreSQLDialect.java

@@ -20,7 +20,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 
 public class PostgreSQLDialect extends Dialect {
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/dialect/SQLServerDialect.java

@@ -21,7 +21,7 @@ package org.dromara.mybatis.jpa.dialect;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
 
 public class SQLServerDialect extends Dialect {
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/JpaEntity.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/JpaEntity.java

@@ -15,13 +15,14 @@
  */
  
 
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa.entity;
 
 import java.io.Serializable;
 import java.util.UUID;
 
 import org.dromara.mybatis.jpa.id.IdStrategy;
 import org.dromara.mybatis.jpa.id.IdentifierGeneratorFactory;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
 
 /**
  * Base Entity for Database Table Entity

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/JpaPageResults.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/JpaPageResults.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa.entity;
 
 import java.util.List;
 import org.slf4j.Logger;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/JpaPagination.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/JpaPagination.java

@@ -18,7 +18,7 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/PageResultsSqlCache.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/entity/PageResultsSqlCache.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa;
+package org.dromara.mybatis.jpa.entity;
 
 import org.apache.ibatis.mapping.BoundSql;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/AbstractStatementHandlerInterceptor.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/interceptor/AbstractStatementHandlerInterceptor.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa;
+package org.dromara.mybatis.jpa.interceptor;
 
 import java.util.StringTokenizer;
 import org.apache.ibatis.executor.statement.RoutingStatementHandler;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/AllStatementHandlerInterceptor.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/interceptor/AllStatementHandlerInterceptor.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa;
+package org.dromara.mybatis.jpa.interceptor;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
@@ -37,7 +37,7 @@ import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
 import org.apache.ibatis.session.RowBounds;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/StatementHandlerInterceptor.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/interceptor/StatementHandlerInterceptor.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa;
+package org.dromara.mybatis.jpa.interceptor;
 
 import java.lang.reflect.Method;
 import java.sql.Connection;
@@ -31,8 +31,9 @@ import org.apache.ibatis.plugin.Plugin;
 import org.apache.ibatis.plugin.Signature;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.reflection.SystemMetaObject;
-import org.dromara.mybatis.jpa.persistence.JpaService;
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.JpaService;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.PageResultsSqlCache;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/FieldColumnMapper.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/metadata/FieldColumnMapper.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa.metadata;
 
 import org.dromara.mybatis.jpa.annotations.ColumnDefault;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/MapperMetadata.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/metadata/MapperMetadata.java

@@ -18,7 +18,7 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa.metadata;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentMap;
 
 import org.apache.ibatis.jdbc.SQL;
 import org.dromara.mybatis.jpa.annotations.ColumnDefault;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
 import org.dromara.mybatis.jpa.id.IdentifierGeneratorFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/SqlSyntax.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/metadata/SqlSyntaxConstants.java

-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.metadata;
 
-public class SqlSyntax {
+public class SqlSyntaxConstants {
 	
 	public  final  static String SELECT 	= "select";
 	

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/package-info.java

-/*
- * Copyright [2021] [MaxKey of copyright http://www.maxkey.top]
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.dromara.mybatis.jpa.persistence;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/DateConverter.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/DateConverter.java

-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
@@ -7,7 +7,7 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
-import org.dromara.mybatis.jpa.persistence.FieldColumnMapper;
+import org.dromara.mybatis.jpa.metadata.FieldColumnMapper;
 import org.dromara.mybatis.jpa.util.BeanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/DeleteProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/DeleteProvider.java

@@ -18,15 +18,15 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import java.util.ArrayList;
 import java.util.Map;
 import org.apache.ibatis.jdbc.SQL;
-import org.dromara.mybatis.jpa.persistence.FieldColumnMapper;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata.SQL_TYPE;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
+import org.dromara.mybatis.jpa.metadata.FieldColumnMapper;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata.SQL_TYPE;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/FindProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/FindProvider.java

@@ -18,15 +18,15 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import java.sql.Types;
 import java.util.Map;
 
 import org.apache.ibatis.jdbc.SQL;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata.SQL_TYPE;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata.SQL_TYPE;
 import org.dromara.mybatis.jpa.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/GetProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/GetProvider.java

@@ -18,15 +18,15 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import java.util.Map;
 
 import org.apache.ibatis.jdbc.SQL;
-import org.dromara.mybatis.jpa.persistence.FieldColumnMapper;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata.SQL_TYPE;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
+import org.dromara.mybatis.jpa.metadata.FieldColumnMapper;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata.SQL_TYPE;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/InsertProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/InsertProvider.java

@@ -18,17 +18,17 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.jdbc.SQL;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
 import org.dromara.mybatis.jpa.id.IdStrategy;
 import org.dromara.mybatis.jpa.id.IdentifierGeneratorFactory;
-import org.dromara.mybatis.jpa.persistence.FieldColumnMapper;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata;
+import org.dromara.mybatis.jpa.metadata.FieldColumnMapper;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
 import org.dromara.mybatis.jpa.util.BeanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/MapperSqlProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/MapperSqlProvider.java

@@ -18,17 +18,11 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence;
+package org.dromara.mybatis.jpa.provider;
 
 import java.util.Map;
 
-import org.dromara.mybatis.jpa.persistence.provider.DeleteProvider;
-import org.dromara.mybatis.jpa.persistence.provider.FindProvider;
-import org.dromara.mybatis.jpa.persistence.provider.GetProvider;
-import org.dromara.mybatis.jpa.persistence.provider.InsertProvider;
-import org.dromara.mybatis.jpa.persistence.provider.PageResultsCountProvider;
-import org.dromara.mybatis.jpa.persistence.provider.QueryProvider;
-import org.dromara.mybatis.jpa.persistence.provider.UpdateProvider;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
 import org.dromara.mybatis.jpa.query.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/PageResultsCountProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/PageResultsCountProvider.java

@@ -18,14 +18,15 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.ParameterMapping;
-import org.dromara.mybatis.jpa.PageResultsSqlCache;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
-import org.dromara.mybatis.jpa.persistence.JpaService;
-import org.dromara.mybatis.jpa.persistence.JpaPagination;
+import org.dromara.mybatis.jpa.JpaService;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
+import org.dromara.mybatis.jpa.entity.JpaPagination;
+import org.dromara.mybatis.jpa.entity.PageResultsSqlCache;
+import org.dromara.mybatis.jpa.metadata.SqlSyntaxConstants;
 import org.dromara.mybatis.jpa.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +54,7 @@ public class PageResultsCountProvider <T extends JpaEntity>{
 		BoundSql boundSql = (BoundSql)pageResultsSqlCache.getBoundSql();
 		_logger.trace("Count original SQL  :\n{}" , selectSql);
 		
-		StringBuffer sql = new StringBuffer(SqlSyntax.SELECT +" "+ SqlSyntax.Functions.COUNT_ONE +" countrows_ ");
+		StringBuffer sql = new StringBuffer(SqlSyntaxConstants.SELECT +" "+ SqlSyntaxConstants.Functions.COUNT_ONE +" countrows_ ");
 		StringBuffer countSql = new StringBuffer();
 
 		if(boundSql.getParameterMappings() == null ||boundSql.getParameterMappings().isEmpty()) {
@@ -69,18 +70,18 @@ public class PageResultsCountProvider <T extends JpaEntity>{
 		String countSqlLowerCase = countSql.toString().toLowerCase();
 		_logger.trace("Count SQL LowerCase  :\n{}" , countSqlLowerCase);
 		
-		if(countSqlLowerCase.indexOf(SqlSyntax.DISTINCT + " ")>0 //去重
-				||countSqlLowerCase.indexOf(" " + SqlSyntax.GROUPBY + " ")>0 //分组
-				||countSqlLowerCase.indexOf(" " + SqlSyntax.HAVING + " ")>0 //聚合函数
-				||(countSqlLowerCase.indexOf(" " + SqlSyntax.FROM + " ") 
-						!= countSqlLowerCase.lastIndexOf(" " + SqlSyntax.FROM + " ")
+		if(countSqlLowerCase.indexOf(SqlSyntaxConstants.DISTINCT + " ")>0 //去重
+				||countSqlLowerCase.indexOf(" " + SqlSyntaxConstants.GROUPBY + " ")>0 //分组
+				||countSqlLowerCase.indexOf(" " + SqlSyntaxConstants.HAVING + " ")>0 //聚合函数
+				||(countSqlLowerCase.indexOf(" " + SqlSyntaxConstants.FROM + " ") 
+						!= countSqlLowerCase.lastIndexOf(" " + SqlSyntaxConstants.FROM + " ")
 				) //嵌套
 				) {
 			_logger.trace("Count SQL Complex ");
-			sql.append(SqlSyntax.FROM).append(" (").append(countSql).append(" ) count_table_");
+			sql.append(SqlSyntaxConstants.FROM).append(" (").append(countSql).append(" ) count_table_");
 		}else {
-			int fromIndex = countSqlLowerCase.indexOf(" " + SqlSyntax.FROM + " ");
-			int orderByIndex = countSqlLowerCase.indexOf(" " + SqlSyntax.ORDERBY + " ");
+			int fromIndex = countSqlLowerCase.indexOf(" " + SqlSyntaxConstants.FROM + " ");
+			int orderByIndex = countSqlLowerCase.indexOf(" " + SqlSyntaxConstants.ORDERBY + " ");
 			_logger.trace("Count SQL from Index {} , order by {}" ,fromIndex,orderByIndex);
 			if(orderByIndex > -1) {
 				sql.append(countSql.substring(fromIndex,orderByIndex));

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/QueryProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/QueryProvider.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import org.apache.ibatis.jdbc.SQL;
-import org.dromara.mybatis.jpa.persistence.FieldColumnMapper;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
+import org.dromara.mybatis.jpa.metadata.FieldColumnMapper;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
 import org.dromara.mybatis.jpa.query.Condition;
 import org.dromara.mybatis.jpa.query.Operator;
 import org.dromara.mybatis.jpa.query.Query;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/persistence/provider/UpdateProvider.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/provider/UpdateProvider.java

@@ -18,13 +18,13 @@
 /**
  * 
  */
-package org.dromara.mybatis.jpa.persistence.provider;
+package org.dromara.mybatis.jpa.provider;
 
 import java.util.List;
 import org.apache.ibatis.jdbc.SQL;
-import org.dromara.mybatis.jpa.persistence.FieldColumnMapper;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
+import org.dromara.mybatis.jpa.metadata.FieldColumnMapper;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
 import org.dromara.mybatis.jpa.util.BeanUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/SpringBootVFS.java → mybatis-jpa-extra-core/src/main/java/org/dromara/mybatis/jpa/spring/SpringBootVFS.java

@@ -15,7 +15,7 @@
  */
  
 
-package org.dromara.mybatis.jpa;
+package org.dromara.mybatis.jpa.spring;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;

mybatis-jpa-extra-spring-boot-starter-test/src/test/java/org/dromara/mybatis/jpa/test/MybatisJpaApplication.java

@@ -17,8 +17,8 @@
 
 package org.dromara.mybatis.jpa.test;
 
+import org.dromara.mybatis.jpa.entity.JpaPageResults;
 import org.dromara.mybatis.jpa.id.SerialGenerator;
-import org.dromara.mybatis.jpa.persistence.JpaPageResults;
 import org.dromara.mybatis.jpa.test.dao.service.StudentsService;
 import org.dromara.mybatis.jpa.test.entity.Students;
 import org.dromara.mybatis.jpa.util.MybatisJpaContext;

mybatis-jpa-extra-spring-boot-starter/src/main/java/org/dromara/mybatis/jpa/starter/MybatisAutoConfiguration.java

@@ -34,8 +34,8 @@ import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.type.TypeHandler;
 import org.dromara.mybatis.jpa.MyBatisSessionFactoryBean;
 import org.dromara.mybatis.jpa.id.IdentifierGeneratorFactory;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata;
-import org.dromara.mybatis.jpa.persistence.MapperMetadata.CASE_TYPE;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata;
+import org.dromara.mybatis.jpa.metadata.MapperMetadata.CASE_TYPE;
 import org.mybatis.spring.SqlSessionFactoryBean;
 import org.mybatis.spring.SqlSessionTemplate;
 import org.mybatis.spring.mapper.MapperFactoryBean;

mybatis-jpa-extra-test/src/main/java/org/dromara/mybatis/jpa/test/dao/persistence/StudentsMapper.java

@@ -21,7 +21,7 @@ package org.dromara.mybatis.jpa.test.dao.persistence;
 
 import java.util.List;
 
-import org.dromara.mybatis.jpa.persistence.IJpaMapper;
+import org.dromara.mybatis.jpa.IJpaMapper;
 import org.dromara.mybatis.jpa.test.entity.Students;
 
 /**

mybatis-jpa-extra-test/src/main/java/org/dromara/mybatis/jpa/test/dao/service/StudentsService.java

@@ -16,7 +16,7 @@
 
 package org.dromara.mybatis.jpa.test.dao.service;
 
-import org.dromara.mybatis.jpa.persistence.JpaService;
+import org.dromara.mybatis.jpa.JpaService;
 import org.dromara.mybatis.jpa.test.dao.persistence.StudentsMapper;
 import org.dromara.mybatis.jpa.test.entity.Students;
 import org.springframework.stereotype.Service;

mybatis-jpa-extra-test/src/main/java/org/dromara/mybatis/jpa/test/entity/Students.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import org.dromara.mybatis.jpa.annotations.ColumnDefault;
-import org.dromara.mybatis.jpa.persistence.JpaEntity;
+import org.dromara.mybatis.jpa.entity.JpaEntity;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;

mybatis-jpa-extra-test/src/test/java/org/dromara/mybatis/jpa/test/PageResultsTestRunner.java

@@ -19,7 +19,7 @@ package org.dromara.mybatis.jpa.test;
 
 import java.util.List;
 
-import org.dromara.mybatis.jpa.persistence.JpaPageResults;
+import org.dromara.mybatis.jpa.entity.JpaPageResults;
 import org.dromara.mybatis.jpa.test.dao.service.StudentsService;
 import org.dromara.mybatis.jpa.test.entity.Students;
 import org.junit.jupiter.api.BeforeAll;