Merge pull request #29 from EightMonth/master

升级spring boot 3
jeecgboot · Dec 19, 2023 · c32be1f · c32be1f
2 parents 79711bd + 00cc740
commit c32be1f
Show file tree

Hide file tree

Showing 12 changed files with 92 additions and 38 deletions.
diff --git a/docs/修改日志.log b/docs/修改日志.log
@@ -0,0 +1,48 @@
+--author:scott-----date:20220902----for:升级依赖版本号，重点升级jsqlparser重构了不兼容方法
+升级springframework依赖到5.3.18 ，与jeecgboot同步
+升级spring-boot-starter依赖到2.6.6 ，与jeecgboot同步
+升级javassist依赖到 3.25.0-GA
+升级jsqlparser依赖到 4.3
+
+
+org\jeecgframework\minidao\pagehelper\parser\SqlServerParser.java
+org\jeecgframework\minidao\pagehelper\parser\OrderByParser.java
+org\jeecgframework\minidao\pagehelper\parser\CountSqlParser.java
+org\jeecgframework\minidao\util\SqlServerParse.java
+minidao-pe-framework\pom.xml
+minidao-pe-spring-boot-starter\pom.xml
+--author:scott-----date:20220902----for:升级依赖版本号，重点升级jsqlparser重构了不兼容方法
+
+--author:scott-----date:20210718----for:升级版本号1.9.1，自动生成ID如果用户设置了id值，则不再生成
+org\jeecgframework\minidao\util\ReflectUtil.java
+org\jeecgframework\minidao\aop\MiniDaoHandler.java
+minidao-pe-example\pom.xml
+minidao-pe-framework\pom.xml
+minidao-pe-spring-boot-starter\pom.xml
+--author:scott-----date:20210718----for:升级版本号1.9.1，自动生成ID如果用户设置了id值，则不再生成
+
+--author:scott-----date:202108011----for:升级版本号1.9.2，为了升级底层依赖jsqlparser.version>4.4版本
+pom.xml
+--author:scott-----date:202108011----for:升级版本号1.9.2，为了升级底层依赖jsqlparser.version>4.4版本
+
+--author:scott-----date:20210804----for:freemarker模板注入问题 禁止解析ObjectConstructor，Execute
+org\jeecgframework\minidao\util\FreemarkerParseFactory.java
+--author:scott-----date:20210804----for:freemarker模板注入问题 禁止解析ObjectConstructor，Execute
+
+--author:scott-----date:20230907----for:拦截器支持定义select规则，支持自动注入saas隔离条件--
+org\jeecgframework\minidao\annotation\IgnoreSaas.java(+)
+org\jeecgframework\minidao\aop\MiniDaoHandler.java
+org\jeecgframework\minidao\aspect\EmptyInterceptor.java
+org\jeecgframework\minidao\aspect\MinidaoInterceptor.java
+--author:scott-----date:20230907----for:拦截器支持定义select规则，支持自动注入saas隔离条件--
+
+--author:scott-----date:20230907----for:升级版本号，支持saas拦截器--
+minidao-pe-example\src\main\java\examples\interceptor\MinidaoInterceptor.java
+minidao-pe-example\pom.xml
+minidao-pe-framework\pom.xml
+minidao-pe-spring-boot-starter\pom.xml
+--author:scott-----date:20230907----for:升级版本号，支持saas拦截器--
+
+--author:wangshuai-----date:20231008----for:【QQYUN-6633】升级 1.6.2-GA2 后，下拉树组件多选后参数传递到 sql 中 in 语句失效 增加拼接函数/in函数--
+src/main/java/org/jeecgframework/minidao/util/SimpleFormat.java
+--author:wangshuai-----date:20231008----for:【QQYUN-6633】升级 1.6.2-GA2 后，下拉树组件多选后参数传递到 sql 中 in 语句失效 增加拼接函数/in函数--
diff --git a/minidao-pe-example/pom.xml b/minidao-pe-example/pom.xml
@@ -15,7 +15,7 @@
 	<properties>
 		<minidao.version>1.9.5</minidao.version>
 		<junit.version>4.13.1</junit.version>
-		<springframework.version>5.3.18</springframework.version>
+		<springframework.version>6.0.13</springframework.version>
 		<!-- 数据库驱动 -->
 		<mysql.version>8.0.21</mysql.version>
 		<postgresql.version>42.2.6</postgresql.version>
@@ -24,7 +24,7 @@
 		<mariadb.version>2.6.2</mariadb.version>
 		<sqlit.version>3.7.2</sqlit.version>
 
-		<druid.version>1.2.6</druid.version>
+		<druid.version>1.2.20</druid.version>
 		<log4j.version>1.2.16</log4j.version>
 	</properties>
 
@@ -34,15 +34,15 @@
             <name>aliyun Repository</name>
             <url>http://maven.aliyun.com/nexus/content/groups/public</url>
             <snapshots>
-				<enabled>false</enabled>
+				<enabled>true</enabled>
 			</snapshots>
         </repository>
 		<repository>
             <id>jeecg</id>
             <name>jeecg Repository</name>
             <url>http://maven.jeecg.org/nexus/content/repositories/jeecg</url>
             <snapshots>
-				<enabled>false</enabled>
+				<enabled>true</enabled>
 			</snapshots>
         </repository>
 	</repositories>
@@ -218,9 +218,10 @@
 			<artifactId>jcc</artifactId>
 			<version>11.5.0.0</version>
 		</dependency>
+
 	</dependencies>
 
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -270,4 +271,6 @@
 		</resources>
 	</build>
 
+
+
 </project>
diff --git a/...pe-example/src/main/resources/p3/cg/template/bootstrap/onetomany/serviceImplMainClass.ftl b/...pe-example/src/main/resources/p3/cg/template/bootstrap/onetomany/serviceImplMainClass.ftl
@@ -1,6 +1,6 @@
 package ${serviceImplPackage};
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.jeecgframework.minidao.pojo.MiniDaoPage;
 import org.springframework.stereotype.Service;

diff --git a/...-pe-example/src/main/resources/p3/cg/template/bootstrap/onetomany/serviceImplSubClass.ftl b/...-pe-example/src/main/resources/p3/cg/template/bootstrap/onetomany/serviceImplSubClass.ftl
@@ -1,6 +1,6 @@
 package ${serviceImplPackage};
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import org.jeecgframework.minidao.pojo.MiniDaoPage;
 import org.springframework.stereotype.Service;

diff --git a/minidao-pe-example/src/main/resources/p3/cg/template/bootstrap/serviceImplClass.ftl b/minidao-pe-example/src/main/resources/p3/cg/template/bootstrap/serviceImplClass.ftl
@@ -1,6 +1,6 @@
 package ${serviceImplPackage};
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.UUID;
 import org.jeecgframework.minidao.pojo.MiniDaoPage;
 import org.springframework.stereotype.Service;

diff --git a/minidao-pe-example/src/main/resources/p3/cg/template/ftl/onetomany/serviceImplMainClass.ftl b/minidao-pe-example/src/main/resources/p3/cg/template/ftl/onetomany/serviceImplMainClass.ftl
@@ -1,6 +1,6 @@
 package ${serviceImplPackage};
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.jeecgframework.minidao.pojo.MiniDaoPage;
 import org.springframework.stereotype.Service;

diff --git a/minidao-pe-example/src/main/resources/p3/cg/template/ftl/onetomany/serviceImplSubClass.ftl b/minidao-pe-example/src/main/resources/p3/cg/template/ftl/onetomany/serviceImplSubClass.ftl
@@ -1,6 +1,6 @@
 package ${serviceImplPackage};
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.List;
 import org.jeecgframework.minidao.pojo.MiniDaoPage;
 import org.springframework.stereotype.Service;

diff --git a/minidao-pe-example/src/main/resources/p3/cg/template/ftl/serviceImplClass.ftl b/minidao-pe-example/src/main/resources/p3/cg/template/ftl/serviceImplClass.ftl
@@ -1,6 +1,6 @@
 package ${serviceImplPackage};
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.util.UUID;
 import org.jeecgframework.minidao.pojo.MiniDaoPage;
 import org.springframework.stereotype.Service;

diff --git a/minidao-pe-example/src/test/java/test/EmployeeDaoJunit.java b/minidao-pe-example/src/test/java/test/EmployeeDaoJunit.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import test.spring.SpringTxTestCase;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;

diff --git a/minidao-pe/pom.xml b/minidao-pe/pom.xml
@@ -32,11 +32,11 @@
 	<properties>
 		<aspectj.version>1.9.6</aspectj.version>
 		<commons-collections.version>3.2.2</commons-collections.version>
-		<freemarker.version>2.3.30</freemarker.version>
+		<freemarker.version>2.3.32</freemarker.version>
 		<ognl.version>3.2.21</ognl.version>
 		<commons-logging.version>1.2</commons-logging.version>
 		<commons-lang3.version>3.12.0</commons-lang3.version>
-		<org.springframework.version>5.3.18</org.springframework.version>
+		<org.springframework.version>6.0.13</org.springframework.version>
 		<javassist.version>3.25.0-GA</javassist.version>
 		<jsqlparser.version>4.4</jsqlparser.version>
 	</properties>
@@ -112,6 +112,12 @@
 			<artifactId>jsqlparser</artifactId>
 			<version>${jsqlparser.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>2.1.1</version>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 
 	<profiles>

diff --git a/minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java b/minidao-pe/src/main/java/org/jeecgframework/minidao/aop/MiniDaoHandler.java
@@ -1,19 +1,7 @@
 package org.jeecgframework.minidao.aop;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.math.BigDecimal;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import net.sf.jsqlparser.JSQLParserException;
-import netscape.javascript.JSException;
 import ognl.Ognl;
 import ognl.OgnlException;
-
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -45,8 +33,16 @@
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
-import javax.annotation.Resource;
+
 import javax.sql.DataSource;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * 

diff --git a/minidao-spring-boot-starter/pom.xml b/minidao-spring-boot-starter/pom.xml
@@ -2,14 +2,15 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.jeecgframework</groupId>
-	<artifactId>minidao-spring-boot-starter</artifactId>
+	<artifactId>minidao-spring-boot3-starter</artifactId>
 	<version>1.9.5</version>
 	<packaging>jar</packaging>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.6.6</version>
+		<version>3.1.5</version>
+		<relativePath/>
 	</parent>
 
 	<licenses>
@@ -33,7 +34,7 @@
 	<properties>
 		<!-- minidao -->
 		<minidao.version>1.9.5</minidao.version>
-		<druid.version>1.1.9</druid.version>
+		<druid.version>1.2.20</druid.version>
 	</properties>
 
 	<dependencies>
@@ -67,8 +68,8 @@
 
 		<!-- db connect -->
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
+			<groupId>com.mysql</groupId>
+			<artifactId>mysql-connector-j</artifactId>
 			<optional>true</optional>
             <scope>runtime</scope>
 		</dependency>
@@ -90,8 +91,8 @@
 					<plugin>
 						<artifactId>maven-compiler-plugin</artifactId>
 						<configuration>
-							<source>1.8</source>
-							<target>1.8</target>
+							<source>17</source>
+							<target>17</target>
 							<encoding>UTF-8</encoding>
 						</configuration>
 					</plugin>
@@ -131,8 +132,8 @@
 					<plugin>
 						<artifactId>maven-compiler-plugin</artifactId>
 						<configuration>
-							<source>1.8</source>
-							<target>1.8</target>
+							<source>17</source>
+							<target>17</target>
 							<encoding>UTF-8</encoding>
 						</configuration>
 					</plugin>
@@ -216,8 +217,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
            </plugin>