Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 46110ee

Browse files
| 2023年07月11日 | 安全更新,正式支持SpringBoot3,javax升级到jakarta。
| 2023年07月11日 | 安全更新,正式支持SpringBoot3,javax升级到jakarta。
1 parent 8f4e09d commit 46110ee

File tree

7 files changed

+24
-14
lines changed

7 files changed

+24
-14
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Thanks for `JetBrains` providing us the `Licenses for Open Source Development`
6161
# Update Logs
6262
| 更新日期 | 更新内容 |
6363
|:-----------|:------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
64+
| 2023年07月11日 | 安全更新,正式支持SpringBoot3,javax升级到jakarta。 |
6465
| 2023年01月02日 | 新增TkMybatis模板(感谢@sgj666的建议)。 |
6566
| 2023年01月01日 | 新增GCP BigQuery/Dataflow JJS/QlikSense BI模板。 |
6667
| 2022年09月28日 | MySQL to Java type conversion 数据库类型转换优化(感谢@jadelike得贡献) |

‎generator-web/src/main/java/com/softdev/system/generator/config/GlobalDefaultExceptionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.springframework.web.bind.annotation.ExceptionHandler;
66
import org.springframework.web.bind.annotation.ResponseBody;
77

8-
import javax.servlet.http.HttpServletRequest;
8+
import jakarta.servlet.http.HttpServletRequest;
99

1010
/**
1111
* @author zhengkai.blog.csdn.net

‎generator-web/src/main/java/com/softdev/system/generator/config/WebMvcConfig.java

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

33
import com.alibaba.fastjson.support.config.FastJsonConfig;
44
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
5+
import jakarta.servlet.DispatcherType;
56
import org.springframework.boot.web.servlet.FilterRegistrationBean;
67
import org.springframework.context.annotation.Bean;
78
import org.springframework.context.annotation.Configuration;
@@ -11,7 +12,6 @@
1112
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
1213
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1314

14-
import javax.servlet.DispatcherType;
1515
import java.nio.charset.StandardCharsets;
1616
import java.util.ArrayList;
1717
import java.util.List;

‎generator-web/src/main/java/com/softdev/system/generator/config/XssFilter.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package com.softdev.system.generator.config;
22

3-
import javax.servlet.*;
4-
import javax.servlet.http.HttpServletRequest;
3+
import jakarta.servlet.*;
4+
import jakarta.servlet.http.HttpServletRequest;
5+
56
import java.io.IOException;
67

78
/**
@@ -18,8 +19,8 @@ public void init(FilterConfig config) throws ServletException {
1819
@Override
1920
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
2021
throws IOException, ServletException {
21-
XssHttpServletRequestWrapperxssRequest = newXssHttpServletRequestWrapper(
22-
(HttpServletRequest)request);
22+
23+
XssHttpServletRequestWrapperxssRequest = newXssHttpServletRequestWrapper((HttpServletRequest)request);
2324
chain.doFilter(xssRequest, response);
2425
}
2526

‎generator-web/src/main/java/com/softdev/system/generator/config/XssHttpServletRequestWrapper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.softdev.system.generator.config;
22

3+
import jakarta.servlet.ReadListener;
4+
import jakarta.servlet.ServletInputStream;
5+
import jakarta.servlet.http.HttpServletRequest;
6+
import jakarta.servlet.http.HttpServletRequestWrapper;
37
import org.apache.commons.io.IOUtils;
48
import org.apache.commons.lang3.StringUtils;
59
import org.springframework.http.HttpHeaders;
610
import org.springframework.http.MediaType;
711

8-
import javax.servlet.ReadListener;
9-
import javax.servlet.ServletInputStream;
10-
import javax.servlet.http.HttpServletRequest;
11-
import javax.servlet.http.HttpServletRequestWrapper;
1212
import java.io.ByteArrayInputStream;
1313
import java.io.IOException;
1414
import java.util.LinkedHashMap;

‎generator-web/src/main/java/com/softdev/system/generator/entity/ReturnT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.softdev.system.generator.entity;
22

33
import lombok.Data;
4+
import lombok.EqualsAndHashCode;
45

5-
import java.io.Serializable;
66
import java.util.HashMap;
77
import java.util.Map;
88

@@ -11,6 +11,7 @@
1111
*
1212
* @author zhengkai.blog.csdn.net
1313
*/
14+
@EqualsAndHashCode(callSuper = true)
1415
@Data
1516
public class ReturnT extends HashMap<String, Object> {
1617
private static final long serialVersionUID = 1L;

‎pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
<groupId>com.softdev.system</groupId>
77
<artifactId>SpringBootCodeGenerator</artifactId>
8-
<version>3.0</version>
8+
<version>2023</version>
99
<packaging>pom</packaging>
1010

1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.6.3</version>
14+
<version>3.0.8</version>
1515
</parent>
1616

1717
<modules>
@@ -49,9 +49,16 @@
4949
<dependency>
5050
<groupId>com.alibaba</groupId>
5151
<artifactId>fastjson</artifactId>
52-
<version>1.2.83</version>
52+
<version>2.0.34</version>
5353
</dependency>
5454

55+
<!-- https://mvnrepository.com/artifact/jakarta.servlet/jakarta.servlet-api -->
56+
<dependency>
57+
<groupId>jakarta.servlet</groupId>
58+
<artifactId>jakarta.servlet-api</artifactId>
59+
<version>6.0.0</version>
60+
<scope>provided</scope>
61+
</dependency>
5562
<!-- 支持 @ConfigurationProperties 注解 -->
5663
<dependency>
5764
<groupId>org.springframework.boot</groupId>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /