Skip to content

Commit 888a0b6

Browse files
lazycecelazycece
committed
Merge remote-tracking branch 'origin/dev_jakarta'
2 parents bd8cd2c + 6f3a548 commit 888a0b6

File tree

10 files changed

+123
-60
lines changed

10 files changed

+123
-60
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ build/
3131
.vscode/
3232

3333
### custom ###
34-
logs/
34+
logs/
35+
.flattened-pom.xml

‎README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@
66

77
`Au api`是一个基于[Au框架](https://github.com/lazycece/au) 实现的api安全框架，支持token认证、防拦截、参数签名以及数据加密等，适用于任何基于`servlet`的web项目, 如Spring, Spring Boot 等等。
88

9+
## Environment
10+
11+
Au API 环境依赖如下:
12+
13+
|Au API|Java|Servlet Api|
14+
|---|---|---|
15+
|1.x|1.8+|javax.servlet-api:>=4.0.0|
16+
|2.x|17+|jakarta.servlet-api:>=5.0.0|
17+
918
## 如何使用？
1019

1120
> `spring boot`项目请移步[`au-api-spring-boot`](https://github.com/lazycece/au-api-spring-boot)
@@ -31,7 +40,7 @@
3140
<dependency>
3241
<groupId>com.lazycece.au</groupId>
3342
<artifactId>au-api</artifactId>
34-
<version>${au.core.version}</version>
43+
<version>${au-api.version}</version>
3544
</dependency>
3645
```
3746

‎au-api-all/pom.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>au-api-parent</artifactId>
88
<groupId>com.lazycece.au</groupId>
9-
<version>1.0.2</version>
9+
<version>${revision}</version>
1010
</parent>
1111
<artifactId>au-api</artifactId>
1212
<name>au-api-all</name>
@@ -24,4 +24,17 @@
2424
<version>${project.version}</version>
2525
</dependency>
2626
</dependencies>
27+
28+
<build>
29+
<plugins>
30+
<plugin>
31+
<groupId>org.apache.maven.plugins</groupId>
32+
<artifactId>maven-javadoc-plugin</artifactId>
33+
<version>${maven.javadoc.plugin.version}</version>
34+
<configuration>
35+
<skip>true</skip>
36+
</configuration>
37+
</plugin>
38+
</plugins>
39+
</build>
2740
</project>

‎au-api-example/pom.xml

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,34 +3,44 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
6-
<groupId>org.springframework.boot</groupId>
7-
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.2.4.RELEASE</version>
9-
<relativePath/> <!-- lookup parent from repository -->
6+
<artifactId>au-api-parent</artifactId>
7+
<groupId>com.lazycece.au</groupId>
8+
<version>${revision}</version>
109
</parent>
11-
<groupId>com.lazycece.au</groupId>
1210
<artifactId>au-api-example</artifactId>
13-
<version>1.0.0</version>
1411
<name>au-api-example</name>
1512
<description>Au api example for Spring Boot</description>
1613

1714
<properties>
18-
<java.version>1.8</java.version>
19-
<maven.test.skip>true</maven.test.skip>
20-
<au.api.version>1.0.2</au.api.version>
15+
<spring-boot.version>3.1.0</spring-boot.version>
2116
</properties>
2217

18+
<dependencyManagement>
19+
<dependencies>
20+
<dependency>
21+
<groupId>org.springframework.boot</groupId>
22+
<artifactId>spring-boot-dependencies</artifactId>
23+
<version>${spring-boot.version}</version>
24+
<type>pom</type>
25+
<scope>import</scope>
26+
</dependency>
27+
</dependencies>
28+
</dependencyManagement>
29+
2330
<dependencies>
2431
<dependency>
2532
<groupId>com.lazycece.au</groupId>
2633
<artifactId>au-api</artifactId>
27-
<version>${au.api.version}</version>
34+
<version>${project.version}</version>
2835
</dependency>
2936
<dependency>
3037
<groupId>org.springframework.boot</groupId>
3138
<artifactId>spring-boot-starter-web</artifactId>
3239
</dependency>
33-
40+
<dependency>
41+
<groupId>org.springframework.boot</groupId>
42+
<artifactId>spring-boot-starter-validation</artifactId>
43+
</dependency>
3444
<dependency>
3545
<groupId>org.springframework.boot</groupId>
3646
<artifactId>spring-boot-configuration-processor</artifactId>
@@ -55,11 +65,28 @@
5565
</dependencies>
5666

5767
<build>
68+
5869
<plugins>
5970
<plugin>
6071
<groupId>org.springframework.boot</groupId>
6172
<artifactId>spring-boot-maven-plugin</artifactId>
6273
</plugin>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-deploy-plugin</artifactId>
77+
<version>${maven.deploy.plugin.version}</version>
78+
<configuration>
79+
<skip>true</skip>
80+
</configuration>
81+
</plugin>
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-javadoc-plugin</artifactId>
85+
<version>${maven.javadoc.plugin.version}</version>
86+
<configuration>
87+
<skip>true</skip>
88+
</configuration>
89+
</plugin>
6390
</plugins>
6491
</build>
6592

‎au-api-example/src/main/java/com/lazycece/au/api/example/controller/UserController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import lombok.extern.slf4j.Slf4j;
99
import org.springframework.web.bind.annotation.*;
1010

11-
import javax.annotation.Resource;
12-
import javax.servlet.http.HttpServletResponse;
11+
import jakarta.annotation.Resource;
12+
import jakarta.servlet.http.HttpServletResponse;
1313

1414
/**
1515
* @author lazycece

‎au-api-example/src/main/java/com/lazycece/au/api/example/entity/req/LoginReq.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import lombok.Getter;
44
import lombok.Setter;
55

6-
import javax.validation.constraints.NotBlank;
6+
import jakarta.validation.constraints.NotBlank;
77

88
/**
99
* @author lazycece

‎au-api-params/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>au-api-parent</artifactId>
88
<groupId>com.lazycece.au</groupId>
9-
<version>1.0.2</version>
9+
<version>${revision}</version>
1010
</parent>
1111
<artifactId>au-api-params</artifactId>
1212
<description>Parameter signature, encryption and decryption .</description>

‎au-api-params/src/main/java/com/lazycece/au/api/params/filter/MultiPartRequestFilter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import org.apache.commons.lang3.StringUtils;
77
import org.apache.commons.lang3.reflect.FieldUtils;
88

9-
import javax.servlet.ServletException;
10-
import javax.servlet.http.HttpServletRequest;
11-
import javax.servlet.http.Part;
9+
import jakarta.servlet.ServletException;
10+
import jakarta.servlet.http.HttpServletRequest;
11+
import jakarta.servlet.http.Part;
1212
import java.io.IOException;
1313
import java.lang.reflect.Field;
1414
import java.util.*;
@@ -36,7 +36,7 @@ public boolean preHandle() throws Exception {
3636
return true;
3737
}
3838

39-
static class MultiPartRequestWrapper extends javax.servlet.http.HttpServletRequestWrapper {
39+
static class MultiPartRequestWrapper extends jakarta.servlet.http.HttpServletRequestWrapper {
4040

4141
private Collection<Part> parts = null;
4242

‎au-api-token/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>au-api-parent</artifactId>
88
<groupId>com.lazycece.au</groupId>
9-
<version>1.0.2</version>
9+
<version>${revision}</version>
1010
</parent>
1111
<artifactId>au-api-token</artifactId>
1212
<description>api token</description>

‎pom.xml

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.lazycece.au</groupId>
77
<artifactId>au-api-parent</artifactId>
8-
<version>1.0.2</version>
8+
<version>${revision}</version>
99
<packaging>pom</packaging>
1010
<name>${project.artifactId}</name>
1111
<description>The parent project of Au Api</description>
@@ -35,31 +35,36 @@
3535
<module>au-api-token</module>
3636
<module>au-api-params</module>
3737
<module>au-api-all</module>
38+
<module>au-api-example</module>
3839
</modules>
3940

4041
<properties>
41-
<java.version>1.8</java.version>
42+
<!-- Project revision -->
43+
<revision>2.0.0</revision>
44+
45+
<java.version>17</java.version>
4246
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4347
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4448
<!-- Maven -->
4549
<maven.test.skip>true</maven.test.skip>
46-
<maven.deploy.skip>true</maven.deploy.skip>
47-
<maven.javadoc.skip>true</maven.javadoc.skip>
50+
<maven.deploy.skip>false</maven.deploy.skip>
51+
<maven.javadoc.skip>false</maven.javadoc.skip>
4852
<maven.compiler.source>${java.version}</maven.compiler.source>
4953
<maven.compiler.target>${java.version}</maven.compiler.target>
5054
<maven.compiler.plugin.version>3.6.2</maven.compiler.plugin.version>
5155
<maven.surefire.plugin.version>2.22.1</maven.surefire.plugin.version>
5256
<maven.source.plugin.version>3.0.1</maven.source.plugin.version>
5357
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
54-
<maven.javadoc.plugin.version>2.10.4</maven.javadoc.plugin.version>
58+
<maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
5559
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
60+
<flatten.maven.plugin.version>1.2.7</flatten.maven.plugin.version>
5661
<!-- Test -->
5762
<junit.version>4.13.2</junit.version>
5863
<assertj.core.version>3.24.2</assertj.core.version>
5964
<mockito.core.version>5.2.0</mockito.core.version>
6065
<!-- core -->
61-
<au.core.version>1.0.3</au.core.version>
62-
<servlet.api.version>4.0.1</servlet.api.version>
66+
<au.core.version>3.0.0</au.core.version>
67+
<servlet.api.version>5.0.0</servlet.api.version>
6368
<commons.codec.version>1.15</commons.codec.version>
6469
<jwt.version>3.8.3</jwt.version>
6570
<fastjson.version>1.2.83</fastjson.version>
@@ -112,8 +117,8 @@
112117
<version>${au.core.version}</version>
113118
</dependency>
114119
<dependency>
115-
<groupId>javax.servlet</groupId>
116-
<artifactId>javax.servlet-api</artifactId>
120+
<groupId>jakarta.servlet</groupId>
121+
<artifactId>jakarta.servlet-api</artifactId>
117122
<version>${servlet.api.version}</version>
118123
<scope>provided</scope>
119124
</dependency>
@@ -139,36 +144,11 @@
139144

140145
<profiles>
141146
<profile>
142-
<id>jdk1.8</id>
147+
<id>jdk17</id>
143148
<activation>
144-
<jdk>[1.8,)</jdk>
149+
<jdk>[17,)</jdk>
145150
<activeByDefault>true</activeByDefault>
146151
</activation>
147-
<!-- Disable doclint under JDK 8 -->
148-
<reporting>
149-
<plugins>
150-
<plugin>
151-
<groupId>org.apache.maven.plugins</groupId>
152-
<artifactId>maven-javadoc-plugin</artifactId>
153-
<version>${maven.javadoc.plugin.version}</version>
154-
<configuration>
155-
<additionalparam>-Xdoclint:none</additionalparam>
156-
</configuration>
157-
</plugin>
158-
</plugins>
159-
</reporting>
160-
<build>
161-
<plugins>
162-
<plugin>
163-
<groupId>org.apache.maven.plugins</groupId>
164-
<artifactId>maven-javadoc-plugin</artifactId>
165-
<version>${maven.javadoc.plugin.version}</version>
166-
<configuration>
167-
<additionalparam>-Xdoclint:none</additionalparam>
168-
</configuration>
169-
</plugin>
170-
</plugins>
171-
</build>
172152
</profile>
173153
<profile>
174154
<id>release</id>
@@ -242,8 +222,16 @@
242222
<version>${maven.javadoc.plugin.version}</version>
243223
<configuration>
244224
<skip>${maven.javadoc.skip}</skip>
245-
<additionalparam>-tag date</additionalparam>
225+
<additionalJOption>-tag date</additionalJOption>
246226
<locale>en_US</locale>
227+
<charset>UTF-8</charset>
228+
<encoding>UTF-8</encoding>
229+
<docencoding>UTF-8</docencoding>
230+
<source>${maven.compiler.source}</source>
231+
<links>
232+
<link>http://docs.oracle.com/javase/17/docs/api</link>
233+
</links>
234+
<doclint>none</doclint>
247235
</configuration>
248236
<executions>
249237
<execution>
@@ -263,6 +251,31 @@
263251
<skip>${maven.deploy.skip}</skip>
264252
</configuration>
265253
</plugin>
254+
<plugin>
255+
<groupId>org.codehaus.mojo</groupId>
256+
<artifactId>flatten-maven-plugin</artifactId>
257+
<version>${flatten.maven.plugin.version}</version>
258+
<configuration>
259+
<updatePomFile>true</updatePomFile>
260+
<flattenMode>resolveCiFriendliesOnly</flattenMode>
261+
</configuration>
262+
<executions>
263+
<execution>
264+
<id>flatten</id>
265+
<phase>process-resources</phase>
266+
<goals>
267+
<goal>flatten</goal>
268+
</goals>
269+
</execution>
270+
<execution>
271+
<id>flatten.clean</id>
272+
<phase>clean</phase>
273+
<goals>
274+
<goal>clean</goal>
275+
</goals>
276+
</execution>
277+
</executions>
278+
</plugin>
266279
</plugins>
267280
</build>
268281
</project>

0 commit comments

Comments
 (0)