Skip to content

Commit d15d18e

Browse files
megadotnetmegadotnet
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/com/app/login/config/Swagger2Config.java
2 parents fde08e1 + 2221122 commit d15d18e

36 files changed

+352
-278
lines changed

‎.github/workflows/maven.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v4
24-
- name: Set up JDK 8
24+
- name: Set up JDK 17
2525
uses: actions/setup-java@v4
2626
with:
27-
java-version: '8'
27+
java-version: '17'
2828
distribution: 'temurin'
2929
cache: maven
3030
- name: Build with Maven

‎Dockerfile

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
FROM openjdk:8-jdk-slim
1+
FROM eclipse-temurin:17-jdk-alpine
22
MAINTAINER megadotnet
3+
ENV TZ=Asia/Shanghai
34
VOLUME /tmp
4-
# Not support with windows
5-
RUN sed -i s@/deb.debian.org/@/mirrors.ustc.edu.cn/@g /etc/apt/sources.list \
6-
&& apt-get clean \
7-
&& apt-get update \
8-
&& apt-get install -y --no-install-recommends curl jq \
9-
&& rm -rf /var/lib/apt/lists/*
10-
115
ARG JAR_FILE
12-
ADD ${JAR_FILE} app.jar
6+
ADD target/*.jar app.jar
137
ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
148

15-
HEALTHCHECK --start-period=30s --interval=30s --timeout=5s --retries=3 CMD curl -m 5 --silent --fail --request GET http://localhost:7080/actuator/health | jq --exit-status -n 'inputs | if has("status") then .status=="UP" else false end' > /dev/null || exit 1
9+
HEALTHCHECK --start-period=30s --interval=30s --timeout=5s --retries=3 CMD curl -m 5 --silent --fail --request GET http://localhost:7080/actuator/health | jq --exit-status -n 'inputs | if has("status") then .status=="UP" else false end' > /dev/null || exit 1

‎pom.xml

+35-19
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.appe</groupId>
55
<artifactId>springboot-login-application</artifactId>
6-
<version>1.0</version>
6+
<version>1.0.0</version>
77
<packaging>jar</packaging>
8-
<description>spring-boot2 demo application</description>
8+
<description>spring-boot demo application</description>
99
<properties>
10-
<maven.compiler.source>1.8</maven.compiler.source>
11-
<maven.compiler.target>1.8</maven.compiler.target>
12-
<commons.io.version>2.7</commons.io.version>
10+
<maven.compiler.source>17</maven.compiler.source>
11+
<maven.compiler.target>17</maven.compiler.target>
12+
<commons.io.version>2.14.0</commons.io.version>
1313
<commons-lang.version>3.5</commons-lang.version>
1414
<jjwt.version>0.6.0</jjwt.version>
1515
<junit.version>4.13.1</junit.version>
16-
<spring.boot.version>2.5.12</spring.boot.version>
16+
<spring.boot.version>3.3.5</spring.boot.version>
1717
<docker.image.prefix>megadotnet</docker.image.prefix>
1818
<joda.time.version>2.9.9</joda.time.version>
1919
<qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
2020
</properties>
2121
<parent>
2222
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter-parent</artifactId>
24-
<version>2.3.12.RELEASE</version>
24+
<version>3.3.5</version>
2525
</parent>
2626
<build>
2727
<plugins>
@@ -30,16 +30,15 @@
3030
<artifactId>maven-compiler-plugin</artifactId>
3131
<version>3.8.1</version>
3232
<configuration>
33-
<source>1.8</source>
34-
<target>1.8</target>
33+
<source>17</source>
34+
<target>17</target>
3535
</configuration>
3636
</plugin>
3737
<plugin>
3838
<groupId>org.springframework.boot</groupId>
3939
<artifactId>spring-boot-maven-plugin</artifactId>
4040
<version>${spring.boot.version}</version>
4141
<configuration>
42-
<fork>true</fork>
4342
<addResources>true</addResources>
4443
</configuration>
4544
<executions>
@@ -81,6 +80,10 @@
8180
<groupId>org.springframework.boot</groupId>
8281
<artifactId>spring-boot-starter-undertow</artifactId>
8382
</dependency>
83+
<dependency>
84+
<groupId>jakarta.servlet</groupId>
85+
<artifactId>jakarta.servlet-api</artifactId>
86+
</dependency>
8487
<dependency>
8588
<groupId>org.springframework.boot</groupId>
8689
<artifactId>spring-boot-starter-mail</artifactId>
@@ -143,16 +146,13 @@
143146
<groupId>org.springframework.boot</groupId>
144147
<artifactId>spring-boot-devtools</artifactId>
145148
</dependency>
149+
146150
<dependency>
147-
<groupId>io.springfox</groupId>
148-
<artifactId>springfox-swagger2</artifactId>
149-
<version>2.8.0</version>
150-
</dependency>
151-
<dependency>
152-
<groupId>io.springfox</groupId>
153-
<artifactId>springfox-swagger-ui</artifactId>
154-
<version>2.8.0</version>
151+
<groupId>org.springdoc</groupId>
152+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
153+
<version>2.0.4</version>
155154
</dependency>
155+
156156
<dependency>
157157
<groupId>org.mockito</groupId>
158158
<artifactId>mockito-all</artifactId>
@@ -167,7 +167,7 @@
167167
<dependency>
168168
<groupId>org.projectlombok</groupId>
169169
<artifactId>lombok</artifactId>
170-
<version>1.16.20</version>
170+
<version>1.18.22</version>
171171
<scope>provided</scope>
172172
</dependency>
173173

@@ -207,6 +207,22 @@
207207
<scope>test</scope>
208208
</dependency>
209209

210+
<dependency>
211+
<groupId>javax.xml.bind</groupId>
212+
<artifactId>jaxb-api</artifactId>
213+
<version>2.3.1</version>
214+
</dependency>
215+
<dependency>
216+
<groupId>org.glassfish.jaxb</groupId>
217+
<artifactId>jaxb-runtime</artifactId>
218+
<version>2.3.1</version>
219+
</dependency>
220+
<dependency>
221+
<groupId>commons-codec</groupId>
222+
<artifactId>commons-codec</artifactId>
223+
<version>1.15</version>
224+
</dependency>
225+
210226
</dependencies>
211227

212228
<!-- 阿里云maven仓库 -->

‎src/main/java/com/app/login/Application.java

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.springframework.scheduling.annotation.EnableAsync;
99

1010

11+
1112
/**
1213
* Spring-boot demo Application
1314
* @author megadotnet

‎src/main/java/com/app/login/common/utils/ValidationFacade.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import org.springframework.stereotype.Component;
44

5-
import javax.validation.ConstraintViolation;
6-
import javax.validation.ConstraintViolationException;
7-
import javax.validation.Validator;
5+
import jakarta.validation.ConstraintViolation;
6+
import jakarta.validation.ConstraintViolationException;
7+
import jakarta.validation.Validator;
88
import java.util.Set;
99

1010
/**

‎src/main/java/com/app/login/common/utils/ValidationHelper.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.app.login.common.utils;
22

3-
import javax.validation.ConstraintViolation;
4-
import javax.validation.ConstraintViolationException;
5-
import javax.validation.Validation;
6-
import javax.validation.Validator;
3+
import jakarta.validation.ConstraintViolation;
4+
import jakarta.validation.ConstraintViolationException;
5+
import jakarta.validation.Validation;
6+
import jakarta.validation.Validator;
77
import java.util.Set;
88

99
/**

‎src/main/java/com/app/login/common/utils/filter/StubLoggingFilter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import org.springframework.web.util.ContentCachingRequestWrapper;
1010
import org.springframework.web.util.ContentCachingResponseWrapper;
1111

12-
import javax.servlet.FilterChain;
13-
import javax.servlet.ServletException;
14-
import javax.servlet.http.HttpServletRequest;
15-
import javax.servlet.http.HttpServletResponse;
12+
import jakarta.servlet.FilterChain;
13+
import jakarta.servlet.ServletException;
14+
import jakarta.servlet.http.HttpServletRequest;
15+
import jakarta.servlet.http.HttpServletResponse;
1616
import java.io.IOException;
1717
import java.io.UnsupportedEncodingException;
1818
import java.util.Arrays;

‎src/main/java/com/app/login/config/CloudStorageConfig.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import org.hibernate.validator.constraints.Range;
77
import org.hibernate.validator.constraints.URL;
88

9-
import javax.validation.constraints.NotBlank;
10-
import javax.validation.constraints.NotNull;
9+
import jakarta.validation.constraints.NotBlank;
10+
import jakarta.validation.constraints.NotNull;
1111
import java.io.Serializable;
1212

1313
/**

‎src/main/java/com/app/login/config/OpenAPIConfig.java

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
package com.app.login.config;
2+
3+
import io.swagger.v3.oas.models.ExternalDocumentation;
4+
import io.swagger.v3.oas.models.OpenAPI;
5+
import io.swagger.v3.oas.models.info.Info;
6+
import io.swagger.v3.oas.models.info.License;
7+
import org.springframework.context.annotation.Bean;
8+
import org.springframework.context.annotation.Configuration;
9+
import org.springframework.context.annotation.Profile;
10+
11+
/**
12+
* OpenAPIConfig
13+
* Created by Administrator on 2024/10/31.
14+
* migrating-from-springfox https://springdoc.org/#migrating-from-springfox
15+
*/
16+
@Configuration
17+
@Profile("!prod")
18+
public class OpenAPIConfig {
19+
/**
20+
* 配置OpenAPI信息
21+
* 该方法定义了应用程序的OpenAPI文档的基本信息，如标题、描述、版本和许可证等
22+
* 这有助于生成更丰富、更详细的API文档
23+
*
24+
* @return OpenAPI 实例，包含API文档的基本信息
25+
*/
26+
@Bean
27+
public OpenAPI springShopOpenAPI() {
28+
return new OpenAPI()
29+
.info(new Info().title("Login service API")
30+
.description("Spring Login sample application")
31+
.version("v0.0.1")
32+
.license(new License().name("Apache 2.0").url("https://github.com/megadotnet")))
33+
.externalDocs(new ExternalDocumentation()
34+
.description("Spring Login sample application")
35+
.url("https://github.com/megadotnet"));
36+
}
37+
38+
}

‎src/main/java/com/app/login/config/PasswordEncoderConfig.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.app.login.config;
2+
3+
import org.springframework.context.annotation.Bean;
4+
import org.springframework.context.annotation.Configuration;
5+
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
6+
import org.springframework.security.crypto.password.PasswordEncoder;
7+
8+
@Configuration
9+
public class PasswordEncoderConfig {
10+
11+
@Bean
12+
public PasswordEncoder passwordEncoder() {
13+
return new BCryptPasswordEncoder();
14+
}
15+
}

0 commit comments

Comments
 (0)