Skip to content

Commit 314b1f6

Browse files
authored
新增支持 SpringBoot3,感谢 csx-bill 的贡献 #19
#19
2 parents c9a0558 + f5ae447 commit 314b1f6

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919

2020
<dependencies>
2121
<dependency>
22-
<groupId>javax.servlet</groupId>
23-
<artifactId>javax.servlet-api</artifactId>
24-
<version>4.0.1</version>
22+
<groupId>jakarta.servlet</groupId>
23+
<artifactId>jakarta.servlet-api</artifactId>
24+
<version>6.0.0</version>
25+
<scope>provided</scope>
2526
</dependency>
2627

2728
<dependency>

src/main/java/apijson/framework/APIJSONController.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
import java.rmi.ServerException;
3737
import java.util.Map;
3838

39-
import javax.servlet.AsyncContext;
40-
import javax.servlet.ServletResponse;
41-
import javax.servlet.http.HttpServletRequest;
42-
import javax.servlet.http.HttpSession;
39+
4340

4441
import com.alibaba.fastjson.JSONObject;
4542

@@ -51,6 +48,10 @@
5148
import apijson.orm.AbstractParser;
5249
import apijson.orm.Parser;
5350
import apijson.orm.Visitor;
51+
import jakarta.servlet.AsyncContext;
52+
import jakarta.servlet.ServletResponse;
53+
import jakarta.servlet.http.HttpServletRequest;
54+
import jakarta.servlet.http.HttpSession;
5455
import unitauto.MethodUtil;
5556
import unitauto.MethodUtil.InterfaceProxy;
5657

src/main/java/apijson/framework/APIJSONFunctionParser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import java.util.List;
3232
import java.util.Map;
3333

34-
import javax.servlet.http.HttpSession;
34+
3535

3636
import com.alibaba.fastjson.JSONArray;
3737
import com.alibaba.fastjson.JSONObject;
@@ -46,6 +46,7 @@
4646
import apijson.orm.JSONRequest;
4747
import apijson.orm.script.JavaScriptExecutor;
4848
import apijson.orm.script.ScriptExecutor;
49+
import jakarta.servlet.http.HttpSession;
4950
import unitauto.MethodUtil;
5051
import unitauto.MethodUtil.Argument;
5152

src/main/java/apijson/framework/APIJSONObjectParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import java.util.List;
1818

19-
import javax.servlet.http.HttpSession;
2019

2120
import com.alibaba.fastjson.JSONObject;
2221

@@ -26,6 +25,7 @@
2625
import apijson.orm.AbstractParser;
2726
import apijson.orm.Join;
2827
import apijson.orm.SQLConfig;
28+
import jakarta.servlet.http.HttpSession;
2929

3030

3131
/**简化Parser,getObject和getArray(getArrayConfig)都能用

src/main/java/apijson/framework/APIJSONParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Map;
2222
import java.util.Set;
2323

24-
import javax.servlet.http.HttpSession;
2524

2625
import com.alibaba.fastjson.JSONObject;
2726

@@ -33,6 +32,7 @@
3332
import apijson.orm.SQLConfig;
3433
import apijson.orm.SQLExecutor;
3534
import apijson.orm.Verifier;
35+
import jakarta.servlet.http.HttpSession;
3636

3737

3838
/**请求解析器

src/main/java/apijson/framework/APIJSONVerifier.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import java.util.SortedMap;
2828
import java.util.TreeMap;
2929

30-
import javax.servlet.http.HttpSession;
30+
3131

3232
import com.alibaba.fastjson.JSONArray;
3333
import com.alibaba.fastjson.JSONObject;
@@ -41,6 +41,7 @@
4141
import apijson.orm.AbstractVerifier;
4242
import apijson.orm.JSONRequest;
4343
import apijson.orm.Visitor;
44+
import jakarta.servlet.http.HttpSession;
4445

4546

4647
/**权限验证器

0 commit comments

Comments
 (0)