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/jitpack.yml b/jitpack.yml new file mode 100644 index 0000000..9e42c42 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,6 @@ +jdk: + - openjdk17 + +before_install: + - sdk install java 17.0.6-open + - sdk use java 17.0.6-open diff --git a/pom.xml b/pom.xml index 08f48dd..b8bebde 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ apijson.framework apijson-framework - 6.3.0 + 6.4.3-springboot-3 jar APIJSONFramework @@ -14,14 +14,18 @@ UTF-8 UTF-8 - 1.8 + 17 + UTF-8 + 17 + 17 - javax.servlet - javax.servlet-api - 4.0.1 + jakarta.servlet + jakarta.servlet-api + 6.0.0 + provided @@ -34,12 +38,12 @@ com.github.Tencent APIJSON - 6.3.0 + 6.4.3-springboot3 com.github.APIJSON apijson-column - 1.8.0 + 1.9.3-springboot3 @@ -51,7 +55,7 @@ org.postgresql postgresql - 42.3.8 + 42.7.2 @@ -76,10 +80,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.12.1 - 1.8 - 1.8 + 17 + 17 diff --git a/src/main/java/apijson/framework/APIJSONController.java b/src/main/java/apijson/framework/APIJSONController.java index 0024d2a..567ffd5 100755 --- a/src/main/java/apijson/framework/APIJSONController.java +++ b/src/main/java/apijson/framework/APIJSONController.java @@ -36,10 +36,10 @@ import java.rmi.ServerException; import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import com.alibaba.fastjson.JSONObject; @@ -110,8 +110,6 @@ public String parseByTag(RequestMethod method, String tag, Map p /**增删改查统一入口,这个一个方法可替代以下 7 个方法,牺牲一点路由解析性能来提升一些开发效率 * @param method - * @param tag - * @param params * @param request * @param session * @return @@ -316,7 +314,6 @@ public String deleteByTag(String tag, Map params, String request /**重新加载配置 - * @param request * @return * @see *
diff --git a/src/main/java/apijson/framework/APIJSONFunctionParser.java b/src/main/java/apijson/framework/APIJSONFunctionParser.java
index 061a74b..3af0e1d 100755
--- a/src/main/java/apijson/framework/APIJSONFunctionParser.java
+++ b/src/main/java/apijson/framework/APIJSONFunctionParser.java
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
diff --git a/src/main/java/apijson/framework/APIJSONObjectParser.java b/src/main/java/apijson/framework/APIJSONObjectParser.java
index c4bd3d9..e35627b 100755
--- a/src/main/java/apijson/framework/APIJSONObjectParser.java
+++ b/src/main/java/apijson/framework/APIJSONObjectParser.java
@@ -16,7 +16,7 @@
 
 import java.util.List;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import apijson.orm.*;
 import com.alibaba.fastjson.JSONObject;
diff --git a/src/main/java/apijson/framework/APIJSONParser.java b/src/main/java/apijson/framework/APIJSONParser.java
index ebb1e1f..71d4e4b 100755
--- a/src/main/java/apijson/framework/APIJSONParser.java
+++ b/src/main/java/apijson/framework/APIJSONParser.java
@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import com.alibaba.fastjson.JSONObject;
 
diff --git a/src/main/java/apijson/framework/APIJSONVerifier.java b/src/main/java/apijson/framework/APIJSONVerifier.java
index b558da9..02d1ee0 100755
--- a/src/main/java/apijson/framework/APIJSONVerifier.java
+++ b/src/main/java/apijson/framework/APIJSONVerifier.java
@@ -22,7 +22,7 @@
 import java.rmi.ServerException;
 import java.util.*;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 import apijson.column.ColumnUtil;
 import apijson.orm.*;