From bda7c76d9e8db47389599423620b8df95a8c0209 Mon Sep 17 00:00:00 2001
From: TommyLemon <tommylemon@qq.com>
Date: Tue, 12 Dec 2023 23:24:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20APIJSON=20=E5=8F=8A?=
 =?UTF-8?q?=E8=87=AA=E8=BA=AB=206.3.0=EF=BC=8Capijson-column=201.8.0?=
 =?UTF-8?q?=EF=BC=8Cunitauto-java=20=E5=8F=8A=20unitauto-jar=203.0.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 6e2619f510329b0632c48c0f3621bf6efee840e4)
---
 .gitignore                                    | 48 +++++++++++++------
 pom.xml                                       | 12 ++---
 .../apijson/framework/APIJSONController.java  |  3 --
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7e1cc57..c2065bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,37 @@
-# Compiled class file
-*.class
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
 
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-/target/
-bin
+### STS ###
+.apt_generated
 .classpath
+.factorypath
 .project
 .settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/
diff --git a/pom.xml b/pom.xml
index 45130ef..737631b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,8 +4,8 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>apijson.framework</groupId>
-	<artifactId>apijson-framework-spring-boot3</artifactId>
-	<version>6.2.0</version>
+	<artifactId>apijson-framework</artifactId>
+	<version>6.3.0</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONFramework</name>
@@ -38,12 +38,12 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>6.2.0</version>
+			<version>6.3.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
 			<artifactId>apijson-column</artifactId>
-			<version>1.7.0</version>
+			<version>1.8.0</version>
 		</dependency>
 
 		<!-- 数据库 JDBC 驱动 <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< -->
@@ -64,12 +64,12 @@
 		<dependency>
 			<groupId>com.github.TommyLemon</groupId>
 			<artifactId>unitauto-java</artifactId>
-			<version>2.9.0</version>
+			<version>3.0.5</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.TommyLemon</groupId>
 			<artifactId>unitauto-jar</artifactId>
-			<version>2.9.0</version>
+			<version>3.0.5</version>
 		</dependency>
 		<!-- 单元测试：可使用 libs 目录的 unitauto-java.jar 和 unitauto-jar.jar 来替代，两种方式二选一 >>>>>>>>> -->
 
diff --git a/src/main/java/apijson/framework/APIJSONController.java b/src/main/java/apijson/framework/APIJSONController.java
index 6c5506f..567ffd5 100755
--- a/src/main/java/apijson/framework/APIJSONController.java
+++ b/src/main/java/apijson/framework/APIJSONController.java
@@ -110,8 +110,6 @@ public String parseByTag(RequestMethod method, String tag, Map<String, String> p
 
 	/**增删改查统一入口，这个一个方法可替代以下 7 个方法，牺牲一点路由解析性能来提升一些开发效率
 	 * @param method
-	 * @param tag
-	 * @param params
 	 * @param request
 	 * @param session
 	 * @return
@@ -316,7 +314,6 @@ public String deleteByTag(String tag, Map<String, String> params, String request
 
 
 	/**重新加载配置
-	 * @param request
 	 * @return
 	 * @see
 	 * <pre>

From 6815798519d0ee35d4bcd31d1d5c0f01131ac13b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Feb 2024 00:23:18 +0000
Subject: [PATCH 2/3] Bump org.postgresql:postgresql from 42.3.8 to 42.7.2

Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.3.8 to 42.7.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/commits)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 737631b..8b4a101 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<version>42.3.8</version>
+			<version>42.7.2</version>
 		</dependency>
 		<!-- 数据库 JDBC 驱动 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -->
 

From fd3092dd58f713dfd683c9dd496a0649ee0135f1 Mon Sep 17 00:00:00 2001
From: calmcc <jkkl100@foxmail.com>
Date: Wed, 6 Mar 2024 15:12:15 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7apijson=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=88=B06.4.3-springboot3=20=E5=8D=87=E7=BA=A7maven-compiler-p?=
 =?UTF-8?q?lugin=E7=89=88=E6=9C=AC=E5=88=B03.12.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8b4a101..e80b429 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>apijson.framework</groupId>
 	<artifactId>apijson-framework</artifactId>
-	<version>6.3.0</version>
+	<version>6.3.0-springboot3</version>
 	<packaging>jar</packaging>
 
 	<name>APIJSONFramework</name>
@@ -38,7 +38,7 @@
 		<dependency>
 			<groupId>com.github.Tencent</groupId>
 			<artifactId>APIJSON</artifactId>
-			<version>6.3.0</version>
+			<version>6.4.3-springboot3</version>
 		</dependency>
 		<dependency>
 			<groupId>com.github.APIJSON</groupId>
@@ -80,7 +80,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.8.1</version>
+				<version>3.12.1</version>
 				<configuration>
 					<source>17</source>
 					<target>17</target>