Skip to content

Commit 7fcbda3

Browse files
committed
回滚代码,保持 master 主分支支持 SpringBoot 1.x-2.x,对 SpringBoot 3.x 已开新分支 springboot_3,感谢 csx-bill 的贡献 #20
Revert "新增支持 SpringBoot3,感谢 csx-bill 的贡献 #19" This reverts commit 314b1f6, reversing changes made to c9a0558.
1 parent 314b1f6 commit 7fcbda3

6 files changed

Lines changed: 11 additions & 15 deletions

File tree

pom.xml

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

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

2827
<dependency>

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

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

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

4144
import com.alibaba.fastjson.JSONObject;
4245

@@ -48,10 +51,6 @@
4851
import apijson.orm.AbstractParser;
4952
import apijson.orm.Parser;
5053
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;
5554
import unitauto.MethodUtil;
5655
import unitauto.MethodUtil.InterfaceProxy;
5756

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

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

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

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

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

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

1717
import java.util.List;
1818

19+
import javax.servlet.http.HttpSession;
1920

2021
import com.alibaba.fastjson.JSONObject;
2122

@@ -25,7 +26,6 @@
2526
import apijson.orm.AbstractParser;
2627
import apijson.orm.Join;
2728
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,6 +21,7 @@
2121
import java.util.Map;
2222
import java.util.Set;
2323

24+
import javax.servlet.http.HttpSession;
2425

2526
import com.alibaba.fastjson.JSONObject;
2627

@@ -32,7 +33,6 @@
3233
import apijson.orm.SQLConfig;
3334
import apijson.orm.SQLExecutor;
3435
import apijson.orm.Verifier;
35-
import jakarta.servlet.http.HttpSession;
3636

3737

3838
/**请求解析器

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

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

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

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

4645

4746
/**权限验证器

0 commit comments

Comments
 (0)