Merge branch 'master' into springboot3

# Conflicts: # README.md # docs/修改日志.log # minidao-pe-example/pom.xml # minidao-pe/pom.xml # minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java # minidao-spring-boot-starter/pom.xml
jeecgboot · Jul 4, 2024 · 039d769 · 039d769
2 parents 3da26b6 + f6d02e0
commit 039d769
Show file tree

Hide file tree

Showing 26 changed files with 1,707 additions and 1,277 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 MiniDao 
 =======
-当前最新版本： 1.9.6 （发布日期：20240107）
+当前最新版本： 1.10.1 （发布日期：2024-07-03）
 
 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jeecg.com/aboutusIndex)
 [![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net)
-[![](https://img.shields.io/badge/version-1.9.6-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/version-1.10.1-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)
 
@@ -45,7 +45,7 @@ MiniDao 是一款轻量级JAVA持久层框架，基于 SpringJdbc + freemarker
 <dependency>
   <groupId>org.jeecgframework.boot3</groupId>
   <artifactId>minidao-spring-boot-starter</artifactId>
-  <version>1.9.6</version>
+  <version>1.10.1</version>
 </dependency>
 ```
 

diff --git a/docs/修改日志.log b/docs/修改日志.log
@@ -63,3 +63,27 @@ minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java
 minidao-pe-example/src/test/java/test/spring/SpringTxTestCase.java
 ---author:chenrui---date:2024/1/8-----for:[QQYUN-7775]minidao springboot3版本打包，报junit错误---
 
+
+
+---author:chenrui---date:20240321-----for:minidao-pe-example去掉老的p3代码生成器的相关代码，导致单元测试不输出日志---
+minidao-pe-example/jeecg\codegenerate\OneToMainUtil.java（-）
+minidao-pe-example/jeecg\codegenerate\CodeGenerateUtil.java（-）
+minidao-pe-example/jeecg\aop\MinidaoInterceptor.java（-）
+minidao-pe-example/examples\util\JdbcUtils.java（-）
+minidao-pe-example/pom.xml
+---author:chenrui---date:20240321-----for:minidao-pe-example去掉老的p3代码生成器的相关代码，导致单元测试不输出日志---
+
+---author:scott---date:2024-07-04-----for:SQL解析兼容机制（判断支持JSqlParser，才用JSqlParser引擎）---
+// 默认可不引入jsqlparser依赖，避免版本冲突问题
+org/jeecgframework/minidao/aop/MiniDaoHandler.java
+org/jeecgframework/minidao/pagehelper/dialect/helper/SqlServerDialect.java
+org/jeecgframework/minidao/sqlparser/impl/util/JSqlCountSqlParser.java 更名路径
+org/jeecgframework/minidao/sqlparser/impl/util/JSqlRemoveSqlOrderBy.java 更名路径
+org/jeecgframework/minidao/sqlparser/impl/util/JSqlServerPagesHelper.java 更名路径
+org/jeecgframework/minidao/sqlparser/impl/util/JSqlSubSelectBody.java 更名路径
+org/jeecgframework/minidao/sqlparser/impl/JsqlparserSqlProcessor.java（+）
+org/jeecgframework/minidao/sqlparser/impl/SimpleSqlProcessor.java（+）
+org/jeecgframework/minidao/sqlparser/AbstractSqlProcessor.java（+）
+org/jeecgframework/minidao/util/MiniDaoUtil.java
+org/jeecgframework/minidao/util/ReflectUtil.java
+---author:scott---date:2024-07-04-----for:SQL解析兼容机制（判断支持JSqlParser，才用JSqlParser引擎）---
diff --git a/minidao-pe-example/pom.xml b/minidao-pe-example/pom.xml
@@ -3,28 +3,28 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jeecgframework.boot3</groupId>
 	<artifactId>minidao-pe-example</artifactId>
-	<version>1.9.6</version>
+	<version>1.10.1</version>
 	<packaging>jar</packaging>
 	<url>http://www.jeecg.com</url>
 	<parent>
 		<groupId>org.jeecgframework.boot3</groupId>
 		<artifactId>minidao-parent</artifactId>
-		<version>1.9.6</version>
+		<version>1.10.1</version>
 	</parent>
 
 	<properties>
-		<minidao.version>1.9.6</minidao.version>
+		<minidao.version>1.10.1</minidao.version>
 		<junit.version>4.13.1</junit.version>
 		<springframework.version>6.0.13</springframework.version>
 		<!-- 数据库驱动 -->
 		<mysql.version>8.0.21</mysql.version>
-		<postgresql.version>42.2.6</postgresql.version>
+		<postgresql.version>42.4.3</postgresql.version>
 		<ojdbc6.version>11.2.0.3</ojdbc6.version>
 		<sqljdbc4.version>4.0</sqljdbc4.version>
 		<mariadb.version>2.6.2</mariadb.version>
-		<sqlit.version>3.7.2</sqlit.version>
+		<sqlit.version>3.41.2.2</sqlit.version>
 
-		<druid.version>1.2.20</druid.version>
+		<druid.version>1.2.22</druid.version>
 		<log4j.version>1.2.16</log4j.version>
 	</properties>
 
@@ -64,7 +64,7 @@
 			<artifactId>minidao-pe</artifactId>
 			<version>${minidao.version}</version>
 		</dependency>
-		<!-- 代码生成器 -->
+		<!-- 代码生成器 
 		<dependency>
 			<groupId>org.jeecgframework.p3</groupId>
 			<artifactId>jeecg-p3-generate</artifactId>
@@ -116,6 +116,8 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		-->
+
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid</artifactId>
@@ -187,19 +189,19 @@
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
-			<version>2.2.8</version>
+			<version>2.7.1</version>
 		</dependency>
 		<!--h2-->
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
-			<version>1.4.197</version>
+			<version>2.2.220</version>
 		</dependency>
 		<!--derby-->
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
-			<version>10.9.1.0</version>
+			<version>10.17.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
@@ -218,10 +220,9 @@
 			<artifactId>jcc</artifactId>
 			<version>11.5.0.0</version>
 		</dependency>
-
 	</dependencies>
 
-
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -271,6 +272,4 @@
 		</resources>
 	</build>
 
-
-
 </project>