From e65df08d1b1eb7d5daa4a6a6cb8bfebf1854ac19 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Sun, 12 Apr 2026 05:32:31 +0800 Subject: [PATCH 01/25] feat: implement User and UserCredential models with repository and service layers --- .../deltaforceguide/domain/entity/User.java | 73 +++++++++++++ .../domain/entity/UserCredential.java | 83 +++++++++++++++ .../domain/entity/UserCredentialId.java | 49 +++++++++ .../manager/UserCredentialManager.java | 47 ++++++++ .../deltaforceguide/manager/UserManager.java | 50 +++++++++ .../repository/UserCredentialRepository.java | 52 +++++++++ .../repository/UserRepository.java | 29 +++++ .../deltaforceguide/service/UserService.java | 100 ++++++++++++++++++ src/main/resources/db/migration/V4__user.sql | 16 +++ 9 files changed, 499 insertions(+) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/manager/UserCredentialManager.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/repository/UserCredentialRepository.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/service/UserService.java create mode 100644 src/main/resources/db/migration/V4__user.sql diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java new file mode 100644 index 0000000..31cf527 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java @@ -0,0 +1,73 @@ +package com.onixbyte.deltaforceguide.domain.entity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Table(name = "app_user") +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "username", nullable = false) + private String username; + + @Column(name = "email", nullable = false) + private String email; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true) + private List credentials = new ArrayList<>(); + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public List getCredentials() { + return credentials; + } + + public void setCredentials(List credentials) { + this.credentials = credentials; + } + + public void addCredential(UserCredential credential) { + this.credentials.add(credential); + credential.setUser(this); + } + + public void removeCredential(UserCredential credential) { + this.credentials.remove(credential); + credential.setUser(null); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java new file mode 100644 index 0000000..44e409e --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java @@ -0,0 +1,83 @@ +package com.onixbyte.deltaforceguide.domain.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.AttributeOverrides; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.ForeignKey; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.MapsId; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; + +@Entity +@Table(name = "app_user_credential") +public class UserCredential { + + @EmbeddedId + @AttributeOverrides({ + @AttributeOverride(name = "userId", column = @Column(name = "user_id")), + @AttributeOverride(name = "provider", column = @Column(name = "provider")) + }) + private UserCredentialId id = new UserCredentialId(); + + @MapsId("userId") + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "user_id", nullable = false, foreignKey = @ForeignKey(name = "fk_user_credential_user")) + private User user; + + @Column(name = "credential", nullable = false, length = 255) + private String credential; + + public UserCredentialId getId() { + return id; + } + + public void setId(UserCredentialId id) { + this.id = id; + } + + public User getUser() { + return user; + } + + public void setUser(User user) { + this.user = user; + if (this.id == null) { + this.id = new UserCredentialId(); + } + this.id.setUserId(user == null ? null : user.getId()); + } + + public Long getUserId() { + return id == null ? null : id.getUserId(); + } + + public void setUserId(Long userId) { + if (this.id == null) { + this.id = new UserCredentialId(); + } + this.id.setUserId(userId); + } + + public String getProvider() { + return id == null ? null : id.getProvider(); + } + + public void setProvider(String provider) { + if (this.id == null) { + this.id = new UserCredentialId(); + } + this.id.setProvider(provider); + } + + public String getCredential() { + return credential; + } + + public void setCredential(String credential) { + this.credential = credential; + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java new file mode 100644 index 0000000..ac1a98c --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java @@ -0,0 +1,49 @@ +package com.onixbyte.deltaforceguide.domain.entity; + +import jakarta.persistence.Embeddable; + +import java.io.Serializable; +import java.util.Objects; + +@Embeddable +public class UserCredentialId implements Serializable { + + private Long userId; + + private String provider; + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } + + public String getProvider() { + return provider; + } + + public void setProvider(String provider) { + this.provider = provider; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + UserCredentialId that = (UserCredentialId) o; + return Objects.equals(userId, that.userId) && Objects.equals(provider, that.provider); + } + + @Override + public int hashCode() { + return Objects.hash(userId, provider); + } +} + + diff --git a/src/main/java/com/onixbyte/deltaforceguide/manager/UserCredentialManager.java b/src/main/java/com/onixbyte/deltaforceguide/manager/UserCredentialManager.java new file mode 100644 index 0000000..f4aa494 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/manager/UserCredentialManager.java @@ -0,0 +1,47 @@ +package com.onixbyte.deltaforceguide.manager; + +import com.onixbyte.deltaforceguide.domain.entity.UserCredential; +import com.onixbyte.deltaforceguide.repository.UserCredentialRepository; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; + +@Component +public class UserCredentialManager { + + private final UserCredentialRepository userCredentialRepository; + + public UserCredentialManager(UserCredentialRepository userCredentialRepository) { + this.userCredentialRepository = userCredentialRepository; + } + + @Transactional(readOnly = true) + public List findAllByUserId(Long userId) { + return userCredentialRepository.findAllByUserId(userId); + } + + @Transactional(readOnly = true) + public Optional findByUserIdAndProvider(Long userId, String provider) { + return userCredentialRepository.findByUserIdAndProvider(userId, provider); + } + + @Transactional + public UserCredential save(UserCredential userCredential) { + return userCredentialRepository.save(userCredential); + } + + @Transactional + public void deleteByUserIdAndProvider(Long userId, String provider) { + userCredentialRepository.deleteByUserIdAndProvider(userId, provider); + } + + @Transactional + public void deleteAllByUserId(Long userId) { + userCredentialRepository.deleteAllByUserId(userId); + } +} + + + diff --git a/src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java b/src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java new file mode 100644 index 0000000..08ffa3c --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java @@ -0,0 +1,50 @@ +package com.onixbyte.deltaforceguide.manager; + +import com.onixbyte.deltaforceguide.domain.entity.User; +import com.onixbyte.deltaforceguide.repository.UserRepository; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Optional; + +@Component +public class UserManager { + + private final UserRepository userRepository; + + public UserManager(UserRepository userRepository) { + this.userRepository = userRepository; + } + + @Transactional(readOnly = true) + public Optional findById(Long id) { + return userRepository.findById(id); + } + + @Transactional(readOnly = true) + public List findAll() { + return userRepository.findAll(); + } + + @Transactional(readOnly = true) + public Optional findByUsername(String username) { + return userRepository.findByUsername(username); + } + + @Transactional(readOnly = true) + public Optional findByEmail(String email) { + return userRepository.findByEmail(email); + } + + @Transactional + public User save(User user) { + return userRepository.save(user); + } + + @Transactional + public void deleteById(Long id) { + userRepository.deleteById(id); + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/repository/UserCredentialRepository.java b/src/main/java/com/onixbyte/deltaforceguide/repository/UserCredentialRepository.java new file mode 100644 index 0000000..94fb8ec --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/repository/UserCredentialRepository.java @@ -0,0 +1,52 @@ +package com.onixbyte.deltaforceguide.repository; + +import com.onixbyte.deltaforceguide.domain.entity.UserCredential; +import com.onixbyte.deltaforceguide.domain.entity.UserCredentialId; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; +import java.util.Optional; + +@Repository +public interface UserCredentialRepository extends JpaRepository { + + @EntityGraph(attributePaths = {"user"}) + @Query(""" + select uc + from UserCredential uc + where uc.user.id = :userId + """) + List findAllByUserId(@Param("userId") Long userId); + + @EntityGraph(attributePaths = {"user"}) + @Query(""" + select uc + from UserCredential uc + where uc.user.id = :userId + and uc.id.provider = :provider + """) + Optional findByUserIdAndProvider(@Param("userId") Long userId, @Param("provider") String provider); + + @Modifying + @Query(""" + delete from UserCredential uc + where uc.user.id = :userId + and uc.id.provider = :provider + """) + void deleteByUserIdAndProvider(@Param("userId") Long userId, @Param("provider") String provider); + + @Modifying + @Query(""" + delete from UserCredential uc + where uc.user.id = :userId + """) + void deleteAllByUserId(@Param("userId") Long userId); +} + + + diff --git a/src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java b/src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java new file mode 100644 index 0000000..3efa050 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java @@ -0,0 +1,29 @@ +package com.onixbyte.deltaforceguide.repository; + +import com.onixbyte.deltaforceguide.domain.entity.User; +import org.jspecify.annotations.NonNull; +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; + +@Repository +public interface UserRepository extends JpaRepository { + + @Override + @EntityGraph(attributePaths = {"credentials"}) + @NonNull + Optional findById(@NonNull Long id); + + @EntityGraph(attributePaths = {"credentials"}) + Optional findByUsername(String username); + + @EntityGraph(attributePaths = {"credentials"}) + Optional findByEmail(String email); + + boolean existsByUsername(String username); + + boolean existsByEmail(String email); +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/UserService.java b/src/main/java/com/onixbyte/deltaforceguide/service/UserService.java new file mode 100644 index 0000000..c57ce4f --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/service/UserService.java @@ -0,0 +1,100 @@ +package com.onixbyte.deltaforceguide.service; + +import com.onixbyte.deltaforceguide.domain.entity.User; +import com.onixbyte.deltaforceguide.domain.entity.UserCredential; +import com.onixbyte.deltaforceguide.manager.UserCredentialManager; +import com.onixbyte.deltaforceguide.manager.UserManager; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.server.ResponseStatusException; + +import java.util.List; + +@Service +public class UserService { + + private final UserManager userManager; + private final UserCredentialManager userCredentialManager; + + public UserService(UserManager userManager, UserCredentialManager userCredentialManager) { + this.userManager = userManager; + this.userCredentialManager = userCredentialManager; + } + + @Transactional(readOnly = true) + public List findAll() { + return userManager.findAll(); + } + + @Transactional(readOnly = true) + public User queryById(Long id) { + return userManager.findById(id) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "User not found: " + id)); + } + + @Transactional(readOnly = true) + public User queryByUsername(String username) { + return userManager.findByUsername(username) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "User not found: " + username)); + } + + @Transactional + public User create(User user) { + return userManager.save(user); + } + + @Transactional + public User update(User user) { + if (user.getId() == null || userManager.findById(user.getId()).isEmpty()) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "User not found: " + user.getId()); + } + return userManager.save(user); + } + + @Transactional(readOnly = true) + public List findCredentials(Long userId) { + ensureUserExists(userId); + return userCredentialManager.findAllByUserId(userId); + } + + @Transactional(readOnly = true) + public UserCredential queryCredential(Long userId, String provider) { + ensureUserExists(userId); + return userCredentialManager.findByUserIdAndProvider(userId, provider) + .orElseThrow(() -> new ResponseStatusException( + HttpStatus.NOT_FOUND, + "User credential not found: userId=" + userId + ", provider=" + provider)); + } + + @Transactional + public UserCredential upsertCredential(Long userId, String provider, String credential) { + User user = ensureUserExists(userId); + UserCredential userCredential = userCredentialManager.findByUserIdAndProvider(userId, provider) + .orElseGet(UserCredential::new); + userCredential.setUser(user); + userCredential.setProvider(provider); + userCredential.setCredential(credential); + return userCredentialManager.save(userCredential); + } + + @Transactional + public void deleteCredential(Long userId, String provider) { + ensureUserExists(userId); + userCredentialManager.deleteByUserIdAndProvider(userId, provider); + } + + @Transactional + public void deleteById(Long id) { + ensureUserExists(id); + userCredentialManager.deleteAllByUserId(id); + userManager.deleteById(id); + } + + private User ensureUserExists(Long userId) { + return userManager.findById(userId) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "User not found: " + userId)); + } +} + + diff --git a/src/main/resources/db/migration/V4__user.sql b/src/main/resources/db/migration/V4__user.sql new file mode 100644 index 0000000..f3df299 --- /dev/null +++ b/src/main/resources/db/migration/V4__user.sql @@ -0,0 +1,16 @@ +DROP TABLE IF EXISTS app_user; +CREATE TABLE app_user +( + id BIGSERIAL NOT NULL PRIMARY KEY, + username VARCHAR(255) NOT NULL, + email VARCHAR(255) NOT NULL +); + +DROP TABLE IF EXISTS app_user_credential; +CREATE TABLE app_user_credential +( + user_id BIGINT NOT NULL REFERENCES app_user (id), + provider VARCHAR(255) NOT NULL, + credential VARCHAR(255) NOT NULL, + CONSTRAINT app_user_credential_pkey PRIMARY KEY (user_id, provider) +); \ No newline at end of file From 0a6813ceeaf1abbc4898cdf09720cd935dac8463 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Sun, 12 Apr 2026 05:37:24 +0800 Subject: [PATCH 02/25] chore: add Spring Security to library --- build.gradle.kts | 4 +++- gradle/libs.versions.toml | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8a5dd62..0ce2b78 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,10 +49,12 @@ dependencies { implementation(libs.flyway.core) implementation(libs.flyway.postgresql) implementation(libs.jackson.jsr310) - implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.16") + implementation(libs.spring.boot.starter.doc) + implementation(libs.spring.boot.starter.security) testImplementation(libs.spring.boot.starter.test) testImplementation(libs.reactor.test) testImplementation(libs.mybatis.starter.test) + testImplementation(libs.spring.security.test) runtimeOnly(libs.postgres.driver) testRuntimeOnly(libs.h2.database) testRuntimeOnly(libs.junit.launcher) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b0429e9..89621f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,6 +18,7 @@ mybatisVersion = "3.0.5" jacksonVersion = "2.19.2" hypersistenceVersion = "3.14.0" springDependencyManagementVersion = "1.1.7" +springDocVersion = "2.8.16" [libraries] # General Utilities @@ -57,16 +58,19 @@ spring-boot-configurationProcessor = { group = "org.springframework.boot", name spring-boot-actuator = { group = "org.springframework.boot", name = "spring-boot-starter-actuator" } # Security & Auth -spring-boot-starter-security = { group = "org.springframework.boot", name = "spring-boot-starter-security", version.ref = "springBootVersion" } +spring-boot-starter-security = { group = "org.springframework.boot", name = "spring-boot-starter-security" } jwt-core = { group = "com.auth0", name = "java-jwt", version.ref = "javaJwtVersion" } +# Spring Doc +spring-boot-starter-doc = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version.ref = "springDocVersion" } + # Cloud Services aws-sdk-bom = { group = "software.amazon.awssdk", name = "bom", version.ref = "awsSdkVersion" } aws-sdk-s3 = { group = "software.amazon.awssdk", name = "s3" } # Testing spring-boot-starter-test = { group = "org.springframework.boot", name = "spring-boot-starter-test", version.ref = "springBootVersion" } -spring-security-test = { group = "org.springframework.security", name = "spring-security-test", version.ref = "springSecurityVersion" } +spring-security-test = { group = "org.springframework.security", name = "spring-security-test" } reactor-test = { group = "io.projectreactor", name = "reactor-test", version.ref = "reactorVersion" } junit-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version.ref = "junitPlatformVersion" } mybatis-starter-test = { group = "org.mybatis.spring.boot", name = "mybatis-spring-boot-starter-test", version.ref = "mybatisVersion" } From 5e9b29c186b2bb99a9c42eb22bd1c2244c256592 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Mon, 13 Apr 2026 14:32:34 +0800 Subject: [PATCH 03/25] feat: implement JWT authentication with TokenClient, TokenAuthenticationFilter, and SecurityConfig --- .../deltaforceguide/client/TokenClient.java | 70 ++++++++++++++ .../deltaforceguide/config/CorsConfig.java | 55 +++++------ .../config/SecurityConfig.java | 92 +++++++++++++++++++ .../exeption/BizException.java | 35 +++++++ .../filter/TokenAuthenticationFilter.java | 83 +++++++++++++++++ .../properties/TokenProperties.java | 13 +++ .../UsernamePasswordAuthentication.java | 76 +++++++++++++++ ...sernamePasswordAuthenticationProvider.java | 83 +++++++++++++++++ .../shared/CredentialProvider.java | 6 ++ .../deltaforceguide/utils/DateTimeUtil.java | 13 +++ src/main/resources/application.yaml | 1 - 11 files changed, 494 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/client/TokenClient.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/exeption/BizException.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/properties/TokenProperties.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/security/authentication/UsernamePasswordAuthentication.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/shared/CredentialProvider.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/utils/DateTimeUtil.java diff --git a/src/main/java/com/onixbyte/deltaforceguide/client/TokenClient.java b/src/main/java/com/onixbyte/deltaforceguide/client/TokenClient.java new file mode 100644 index 0000000..d4b745c --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/client/TokenClient.java @@ -0,0 +1,70 @@ +package com.onixbyte.deltaforceguide.client; + +import com.auth0.jwt.JWT; +import com.auth0.jwt.JWTVerifier; +import com.auth0.jwt.algorithms.Algorithm; +import com.auth0.jwt.interfaces.DecodedJWT; +import com.onixbyte.deltaforceguide.domain.entity.User; +import com.onixbyte.deltaforceguide.properties.TokenProperties; +import com.onixbyte.deltaforceguide.utils.DateTimeUtil; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; + +@Component +public class TokenClient { + + private final Algorithm algorithm; + private final TokenProperties tokenProperties; + private final JWTVerifier verifier; + + /** + * Constructs a new TokenClient with the necessary algorithm and token properties. + * + * @param algorithm the signing algorithm used to secure the JWT + * @param tokenProperties the configuration properties for the token, such as issuer and + * validity period + */ + @Autowired + public TokenClient( + Algorithm algorithm, + TokenProperties tokenProperties, + JWTVerifier verifier + ) { + this.algorithm = algorithm; + this.tokenProperties = tokenProperties; + this.verifier = verifier; + } + + /** + * Generate a JSON Web Token to the current user. + * + * @param user the current user for whom the token is being generated + * @return a JWT string + */ + public String generateToken(User user) { + var issuedAt = LocalDateTime.now(); + var expiresAt = issuedAt.plus(tokenProperties.validTime()); + + return JWT.create() + .withSubject(user.getUsername()) + .withIssuer(tokenProperties.issuer()) + .withIssuedAt(DateTimeUtil.asInstant(issuedAt)) + .withExpiresAt(DateTimeUtil.asInstant(expiresAt)) + .sign(algorithm); + } + + /** + * Verify and decode token. + * + * @param token a JWT token + * @return information included in the given token + * @throws com.auth0.jwt.exceptions.JWTVerificationException if the token is invalid, such as + * expired, or not signed by + * specific server + */ + public DecodedJWT verifyToken(String token) { + return verifier.verify(token); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/config/CorsConfig.java b/src/main/java/com/onixbyte/deltaforceguide/config/CorsConfig.java index 916ff57..291695b 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/config/CorsConfig.java +++ b/src/main/java/com/onixbyte/deltaforceguide/config/CorsConfig.java @@ -2,46 +2,37 @@ package com.onixbyte.deltaforceguide.config; import com.onixbyte.deltaforceguide.properties.CorsProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import java.util.Optional; +import java.util.List; import java.util.stream.Stream; @Configuration @EnableConfigurationProperties({CorsProperties.class}) -public class CorsConfig implements WebMvcConfigurer { +public class CorsConfig { - private final CorsProperties properties; - - public CorsConfig(CorsProperties properties) { - this.properties = properties; - } - - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedOrigins(toSafeArray(properties.allowedOrigins())) - .allowedHeaders(toSafeArray(properties.allowedHeaders())) - .allowedMethods(toHttpMethodNames(properties.allowedMethods())) - .allowCredentials(properties.allowCredentials()) - .maxAge(properties.maxAge().toSeconds()) - .exposedHeaders(toSafeArray(properties.exposedHeaders())); - } - - private static String[] toSafeArray(String[] values) { - return values == null ? new String[0] : values; - } - - private static String[] toHttpMethodNames(HttpMethod[] methods) { - return Optional.ofNullable(methods) - .stream() - .flatMap(Stream::of) + @Bean + public CorsConfigurationSource corsConfigurationSource( + CorsProperties properties + ) { + var corsConfiguration = new CorsConfiguration(); + corsConfiguration.setAllowCredentials(properties.allowCredentials()); + corsConfiguration.setAllowedOrigins(List.of(properties.allowedOrigins())); + corsConfiguration.setAllowedHeaders(List.of(properties.allowedHeaders())); + corsConfiguration.setAllowedMethods(Stream.of(properties.allowedMethods()) .map(HttpMethod::name) - .toList() - .toArray(String[]::new); - } + .toList()); + corsConfiguration.setMaxAge(properties.maxAge()); + corsConfiguration.setAllowPrivateNetwork(properties.allowPrivateNetwork()); + corsConfiguration.setExposedHeaders(List.of(properties.exposedHeaders())); + var corsConfigurationSource = new UrlBasedCorsConfigurationSource(); + corsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration); + return corsConfigurationSource; + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java new file mode 100644 index 0000000..effe916 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java @@ -0,0 +1,92 @@ +package com.onixbyte.deltaforceguide.config; + +import com.auth0.jwt.JWT; +import com.auth0.jwt.JWTVerifier; +import com.auth0.jwt.algorithms.Algorithm; +import com.onixbyte.deltaforceguide.filter.TokenAuthenticationFilter; +import com.onixbyte.deltaforceguide.properties.TokenProperties; +import com.onixbyte.deltaforceguide.security.provider.UsernamePasswordAuthenticationProvider; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.ProviderManager; +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.access.ExceptionTranslationFilter; +import org.springframework.web.cors.CorsConfigurationSource; + +@Configuration +@EnableWebSecurity +@EnableMethodSecurity +@EnableConfigurationProperties({TokenProperties.class}) +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain( + HttpSecurity httpSecurity, + CorsConfigurationSource corsConfigurationSource, + TokenAuthenticationFilter tokenAuthenticationFilter + ) throws Exception { + return httpSecurity + .cors((cors) -> cors + .configurationSource(corsConfigurationSource)) + .csrf(AbstractHttpConfigurer::disable) + .sessionManagement((customiser) -> customiser + .sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests((customiser) -> customiser + .requestMatchers("/error", "/error/**").permitAll() + .requestMatchers("/captcha", "/captcha/**").permitAll() + .requestMatchers("/auth/**").permitAll() + .requestMatchers("/auth/logout").authenticated() + .requestMatchers( + "/swagger-ui.html", + "/swagger-ui", + "/swagger-ui/**", + "/v3/api-docs", + "/v3/api-docs.yaml", + "/v3/api-docs/swagger-config" + ).permitAll() + .requestMatchers(HttpMethod.GET, + "/firearms", "/firearms/*", + "/modifications", "/modifications/*" + ).permitAll() + .anyRequest().authenticated() + ) + .addFilterAfter(tokenAuthenticationFilter, ExceptionTranslationFilter.class) + .build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + + @Bean + public AuthenticationManager authenticationManager( + UsernamePasswordAuthenticationProvider usernamePasswordAuthenticationProvider + ) { + return new ProviderManager( + usernamePasswordAuthenticationProvider + ); + } + + @Bean + public Algorithm algorithm(TokenProperties properties) { + return Algorithm.HMAC256(properties.secret()); + } + + @Bean + public JWTVerifier verifier(Algorithm algorithm, TokenProperties tokenProperties) { + return JWT.require(algorithm) + .withIssuer(tokenProperties.issuer()) + .build(); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/exeption/BizException.java b/src/main/java/com/onixbyte/deltaforceguide/exeption/BizException.java new file mode 100644 index 0000000..aad96d2 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/exeption/BizException.java @@ -0,0 +1,35 @@ +package com.onixbyte.deltaforceguide.exeption; + +import org.springframework.http.HttpStatus; + +public class BizException extends RuntimeException { + + /** + * The HTTP status code associated with this business exception. + *

+ * This status code indicates the appropriate HTTP response status that should be returned to + * clients when this exception occurs. It enables consistent error handling across + * REST API endpoints. + */ + private final HttpStatus status; + + public BizException(String message) { + super(message); + this.status = HttpStatus.INTERNAL_SERVER_ERROR; + } + + public BizException(HttpStatus status, String message) { + super(message); + this.status = status; + } + + /** + * Returns the HTTP status code associated with this business exception. + * + * @return the HTTP status code that should be used in the error response + */ + public HttpStatus getStatus() { + return status; + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java b/src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java new file mode 100644 index 0000000..8cfd219 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java @@ -0,0 +1,83 @@ +package com.onixbyte.deltaforceguide.filter; + +import com.auth0.jwt.exceptions.JWTVerificationException; +import com.onixbyte.deltaforceguide.client.TokenClient; +import com.onixbyte.deltaforceguide.exeption.BizException; +import com.onixbyte.deltaforceguide.manager.UserManager; +import com.onixbyte.deltaforceguide.security.authentication.UsernamePasswordAuthentication; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.jspecify.annotations.NonNull; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import org.springframework.web.servlet.HandlerExceptionResolver; +import org.springframework.web.util.WebUtils; + +import java.io.IOException; +import java.util.Objects; +import java.util.Optional; + +@Component +public class TokenAuthenticationFilter extends OncePerRequestFilter { + + private final static Logger log = LoggerFactory.getLogger(TokenAuthenticationFilter.class); + + private final UserManager userManager; + private final TokenClient tokenClient; + private final HandlerExceptionResolver handlerExceptionResolver; + + public TokenAuthenticationFilter( + UserManager userManager, + TokenClient tokenClient, + HandlerExceptionResolver handlerExceptionResolver + ) { + this.userManager = userManager; + this.tokenClient = tokenClient; + this.handlerExceptionResolver = handlerExceptionResolver; + } + + @Override + protected void doFilterInternal( + @NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain + ) throws ServletException, IOException { + var token = Optional.ofNullable(WebUtils.getCookie(request, "AccessToken")) + .map(Cookie::getValue) + .orElse(null); + if (Objects.isNull(token) || token.isBlank()) { + filterChain.doFilter(request, response); + return; + } + + try { + var decodedToken = tokenClient.verifyToken(token); + var username = decodedToken.getSubject(); + + var userWrapper = userManager.findByUsername(username); + if (userWrapper.isEmpty()) { + throw new BizException(HttpStatus.UNAUTHORIZED, "登录已过期，请重新登录"); + } + + var user = userWrapper.get(); + var authentication = UsernamePasswordAuthentication.authenticated(user); + SecurityContextHolder.getContext().setAuthentication(authentication); + filterChain.doFilter(request, response); + } catch (JWTVerificationException e) { + log.error("JWT verification failed.", e); + handlerExceptionResolver.resolveException(request, response, null, + new BizException(HttpStatus.UNAUTHORIZED, "登录已过期，请重新登录")); + } catch (BizException e) { + handlerExceptionResolver.resolveException(request, response, null, e); + } + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/properties/TokenProperties.java b/src/main/java/com/onixbyte/deltaforceguide/properties/TokenProperties.java new file mode 100644 index 0000000..0d7a618 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/properties/TokenProperties.java @@ -0,0 +1,13 @@ +package com.onixbyte.deltaforceguide.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.time.Duration; + +@ConfigurationProperties(prefix = "app.jwt") +public record TokenProperties( + String issuer, + String secret, + Duration validTime +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/security/authentication/UsernamePasswordAuthentication.java b/src/main/java/com/onixbyte/deltaforceguide/security/authentication/UsernamePasswordAuthentication.java new file mode 100644 index 0000000..692efaf --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/security/authentication/UsernamePasswordAuthentication.java @@ -0,0 +1,76 @@ +package com.onixbyte.deltaforceguide.security.authentication; + +import com.onixbyte.deltaforceguide.domain.entity.User; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.CredentialsContainer; +import org.springframework.security.core.GrantedAuthority; + +import java.util.Collection; +import java.util.List; + +public class UsernamePasswordAuthentication implements Authentication, CredentialsContainer { + private final String username; + private String password; + private boolean authenticated; + private User user; + + private UsernamePasswordAuthentication(String username, String password, boolean authenticated, User user) { + this.username = username; + this.password = password; + this.authenticated = authenticated; + this.user = user; + } + + public static UsernamePasswordAuthentication unauthenticated(String username, String password) { + return new UsernamePasswordAuthentication(username, password, false, null); + } + + public static UsernamePasswordAuthentication authenticated(User user) { + return new UsernamePasswordAuthentication(user.getUsername(), null, true, user); + } + + @Override + public Collection getAuthorities() { + return List.of(); + } + + @Override + public String getCredentials() { + return password; + } + + @Override + public User getDetails() { + return user; + } + + @Override + public String getPrincipal() { + return username; + } + + @Override + public boolean isAuthenticated() { + return authenticated; + } + + @Override + public void setAuthenticated(boolean authenticated) throws IllegalArgumentException { + this.authenticated = authenticated; + } + + @Override + public String getName() { + return username; + } + + @Override + public void eraseCredentials() { + this.password = null; + } + + public void setDetails(User user) { + this.user = user; + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java b/src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java new file mode 100644 index 0000000..b32c814 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java @@ -0,0 +1,83 @@ +package com.onixbyte.deltaforceguide.security.provider; + +import com.onixbyte.deltaforceguide.domain.entity.UserCredential; +import com.onixbyte.deltaforceguide.exeption.BizException; +import com.onixbyte.deltaforceguide.manager.UserManager; +import com.onixbyte.deltaforceguide.repository.UserCredentialRepository; +import com.onixbyte.deltaforceguide.security.authentication.UsernamePasswordAuthentication; +import com.onixbyte.deltaforceguide.shared.CredentialProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Example; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Component; + +@Component +public class UsernamePasswordAuthenticationProvider implements AuthenticationProvider { + + private static final Logger log = LoggerFactory.getLogger(UsernamePasswordAuthenticationProvider.class); + private final UserManager userManager; + private final PasswordEncoder passwordEncoder; + private final UserCredentialRepository userCredentialRepository; + + @Autowired + public UsernamePasswordAuthenticationProvider( + UserManager userManager, + PasswordEncoder passwordEncoder, + UserCredentialRepository userCredentialRepository + ) { + this.userManager = userManager; + this.passwordEncoder = passwordEncoder; + this.userCredentialRepository = userCredentialRepository; + } + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + if (!(authentication instanceof UsernamePasswordAuthentication usernamePasswordAuthentication)) { + throw new BizException(HttpStatus.INTERNAL_SERVER_ERROR, "用户认证失败，请稍后再试。"); + } + + // get userContainer from database + var userContainer = userManager.findByUsername(usernamePasswordAuthentication.getPrincipal()); + if (userContainer.isEmpty()) { + log.error("User {} is trying to authenticate but no userContainer found.", usernamePasswordAuthentication.getPrincipal()); + throw new BizException(HttpStatus.UNAUTHORIZED, "用户名或密码错误。"); + } + + var user = userContainer.get(); + + var userCredentialExample = new UserCredential(); + userCredentialExample.setUserId(user.getId()); + userCredentialExample.setProvider(CredentialProvider.LOCAL); + + // get userContainer credentials from database + var userCredentials = userCredentialRepository.findOne(Example.of(userCredentialExample)) + .orElseThrow(() -> new BizException(HttpStatus.UNAUTHORIZED, "您还没有配置密码，请联系管理员处理。")); + + // validate password + if (!passwordEncoder.matches(usernamePasswordAuthentication.getCredentials(), userCredentials.getCredential())) { + log.error("User {} is trying to authenticate but password is incorrect.", usernamePasswordAuthentication.getPrincipal()); + throw new BizException(HttpStatus.UNAUTHORIZED, "用户名或密码错误。"); + } + + // erase credentials + usernamePasswordAuthentication.eraseCredentials(); + + // set values + usernamePasswordAuthentication.setAuthenticated(true); + usernamePasswordAuthentication.setDetails(user); + + return usernamePasswordAuthentication; + } + + @Override + public boolean supports(Class authentication) { + return UsernamePasswordAuthentication.class.isAssignableFrom(authentication); + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/shared/CredentialProvider.java b/src/main/java/com/onixbyte/deltaforceguide/shared/CredentialProvider.java new file mode 100644 index 0000000..115f935 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/shared/CredentialProvider.java @@ -0,0 +1,6 @@ +package com.onixbyte.deltaforceguide.shared; + +public class CredentialProvider { + + public static final String LOCAL = "LOCAL"; +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/utils/DateTimeUtil.java b/src/main/java/com/onixbyte/deltaforceguide/utils/DateTimeUtil.java new file mode 100644 index 0000000..f1360c8 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/utils/DateTimeUtil.java @@ -0,0 +1,13 @@ +package com.onixbyte.deltaforceguide.utils; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; + +public class DateTimeUtil { + + public static Instant asInstant(LocalDateTime ldt) { + return ldt.atZone(ZoneId.systemDefault()) + .toInstant(); + } +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 65b087c..66611ee 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -43,4 +43,3 @@ logging: level: org.hibernate: orm.connections.pooling: off - From 75abbb0a2a32551f3564a7995c6e54593b7222cf Mon Sep 17 00:00:00 2001 From: zihluwang Date: Mon, 13 Apr 2026 14:38:50 +0800 Subject: [PATCH 04/25] feat: add Swagger annotations for Firearm, Modification, and Tag controllers --- .../deltaforceguide/controller/FirearmController.java | 7 ++++++- .../deltaforceguide/controller/ModificationController.java | 7 ++++++- .../onixbyte/deltaforceguide/controller/TagController.java | 4 ++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java index f4d7a36..d6e8ca7 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java @@ -4,6 +4,8 @@ import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.enumeration.FirearmType; import com.onixbyte.deltaforceguide.service.FirearmService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import org.springframework.data.domain.PageRequest; @@ -15,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -@Validated +@Tag(name = "武器管理", description = "与武器有关的操作") @RestController @RequestMapping("/firearms") public class FirearmController { @@ -26,6 +28,8 @@ public class FirearmController { this.firearmService = firearmService; } + @Operation(description = "获取分页武器数据") + @Validated @GetMapping public PageResponse pageQuery( @RequestParam(defaultValue = "0") @Min(0) int page, @@ -37,6 +41,7 @@ public class FirearmController { return firearmService.pageQuery(type, PageRequest.of(page, size, Sort.by(direction, sortBy))); } + @Operation(description = "获取指定武器的数据") @GetMapping("/{id}") public FirearmResponse queryById(@PathVariable Long id) { return firearmService.queryById(id); diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java index 816adda..5f3b1c6 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java @@ -3,6 +3,8 @@ package com.onixbyte.deltaforceguide.controller; import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.service.ModificationService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Positive; @@ -17,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -@Validated +@Tag(name = "改装管理", description = "对枪械改装的管理") @RestController @RequestMapping("/modifications") public class ModificationController { @@ -28,6 +30,8 @@ public class ModificationController { this.modificationService = modificationService; } + @Operation(description = "分页查询改装信息") + @Validated @GetMapping public PageResponse pageQuery( @RequestParam(defaultValue = "0") @Min(0) int page, @@ -40,6 +44,7 @@ public class ModificationController { return modificationService.pageQuery(firearmId, tags, PageRequest.of(page, size, Sort.by(direction, sortBy))); } + @Operation(description = "查询指定改装的信息") @GetMapping("/{id}") public ModificationResponse queryById(@PathVariable Long id) { return modificationService.queryById(id); diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/TagController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/TagController.java index 41230aa..e22097d 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/TagController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/TagController.java @@ -1,5 +1,7 @@ package com.onixbyte.deltaforceguide.controller; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -8,6 +10,7 @@ import com.onixbyte.deltaforceguide.service.ModificationService; import java.util.List; +@Tag(name = "标签管理", description = "管理标签信息") @RestController @RequestMapping("/tags") public class TagController { @@ -18,6 +21,7 @@ public class TagController { this.modificationService = modificationService; } + @Operation(description = "查询指定武器或所有武器的标签") @GetMapping public List getTags(@RequestParam(required = false) Long firearmId) { return modificationService.findAllTags(firearmId); From 8fbb73740ca5fdc0dcb359eef8b7a2168843501e Mon Sep 17 00:00:00 2001 From: zihluwang Date: Mon, 13 Apr 2026 17:25:34 +0800 Subject: [PATCH 05/25] feat: implement user authentication with login endpoint and cookie management --- .../config/SecurityConfig.java | 3 +- .../controller/AuthController.java | 40 ++++++++++++++++ .../controller/GlobalExceptionHandler.java | 19 ++++++++ .../domain/dto/ErrorResponse.java | 7 +++ .../domain/dto/LoginRequest.java | 9 ++++ .../domain/dto/UserResponse.java | 17 +++++++ .../filter/TokenAuthenticationFilter.java | 19 ++++++++ .../manager/CookieManager.java | 37 +++++++++++++++ .../deltaforceguide/manager/UserManager.java | 4 ++ .../properties/CookieProperties.java | 17 +++++++ .../repository/UserRepository.java | 11 +++++ ...sernamePasswordAuthenticationProvider.java | 2 +- .../deltaforceguide/service/AuthService.java | 40 ++++++++++++++++ .../service/CookieService.java | 47 +++++++++++++++++++ src/main/resources/db/migration/V4__user.sql | 8 ++-- 15 files changed, 275 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/controller/GlobalExceptionHandler.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/ErrorResponse.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/UserResponse.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/manager/CookieManager.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/properties/CookieProperties.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/service/AuthService.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/service/CookieService.java diff --git a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java index effe916..1ac6d71 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java +++ b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java @@ -4,6 +4,7 @@ import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; import com.auth0.jwt.algorithms.Algorithm; import com.onixbyte.deltaforceguide.filter.TokenAuthenticationFilter; +import com.onixbyte.deltaforceguide.properties.CookieProperties; import com.onixbyte.deltaforceguide.properties.TokenProperties; import com.onixbyte.deltaforceguide.security.provider.UsernamePasswordAuthenticationProvider; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -26,7 +27,7 @@ import org.springframework.web.cors.CorsConfigurationSource; @Configuration @EnableWebSecurity @EnableMethodSecurity -@EnableConfigurationProperties({TokenProperties.class}) +@EnableConfigurationProperties({TokenProperties.class, CookieProperties.class}) public class SecurityConfig { @Bean diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java new file mode 100644 index 0000000..172f8b7 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java @@ -0,0 +1,40 @@ +package com.onixbyte.deltaforceguide.controller; + +import com.onixbyte.deltaforceguide.domain.dto.LoginRequest; +import com.onixbyte.deltaforceguide.domain.dto.UserResponse; +import com.onixbyte.deltaforceguide.client.TokenClient; +import com.onixbyte.deltaforceguide.service.AuthService; +import com.onixbyte.deltaforceguide.service.CookieService; +import jakarta.validation.Valid; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/auth") +public class AuthController { + + private final AuthService authService; + private final TokenClient tokenClient; + private final CookieService cookieService; + + public AuthController(AuthService authService, TokenClient tokenClient, CookieService cookieService) { + this.authService = authService; + this.tokenClient = tokenClient; + this.cookieService = cookieService; + } + + @PostMapping("/login") + public ResponseEntity login(@Valid @RequestBody LoginRequest request) { + var user = authService.login(request); + var accessToken = tokenClient.generateToken(user); + var accessTokenCookie = cookieService.buildCookie("AccessToken", accessToken); + + return ResponseEntity.ok() + .header(HttpHeaders.SET_COOKIE, accessTokenCookie.toString()) + .body(UserResponse.from(user)); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/GlobalExceptionHandler.java b/src/main/java/com/onixbyte/deltaforceguide/controller/GlobalExceptionHandler.java new file mode 100644 index 0000000..c0b19f1 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/GlobalExceptionHandler.java @@ -0,0 +1,19 @@ +package com.onixbyte.deltaforceguide.controller; + +import com.onixbyte.deltaforceguide.domain.dto.ErrorResponse; +import com.onixbyte.deltaforceguide.exeption.BizException; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(BizException.class) + public ResponseEntity handleBizException(BizException exception) { + var status = exception.getStatus(); + return ResponseEntity.status(status) + .body(new ErrorResponse(exception.getMessage())); + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ErrorResponse.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ErrorResponse.java new file mode 100644 index 0000000..f1efbfa --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ErrorResponse.java @@ -0,0 +1,7 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +public record ErrorResponse( + String message +) { +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java new file mode 100644 index 0000000..5dda62b --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java @@ -0,0 +1,9 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import jakarta.validation.constraints.NotBlank; + +public record LoginRequest( + @NotBlank(message = "登录名称不能为空") String principle, + @NotBlank(message = "登录口令不能为空") String credential +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/UserResponse.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/UserResponse.java new file mode 100644 index 0000000..75d9188 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/UserResponse.java @@ -0,0 +1,17 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import com.onixbyte.deltaforceguide.domain.entity.User; + +public record UserResponse( + Long id, + String username, + String email +) { + public static UserResponse from(User user) { + return new UserResponse( + user.getId(), + user.getUsername(), + user.getEmail() + ); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java b/src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java index 8cfd219..f4b9220 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java +++ b/src/main/java/com/onixbyte/deltaforceguide/filter/TokenAuthenticationFilter.java @@ -5,6 +5,7 @@ import com.onixbyte.deltaforceguide.client.TokenClient; import com.onixbyte.deltaforceguide.exeption.BizException; import com.onixbyte.deltaforceguide.manager.UserManager; import com.onixbyte.deltaforceguide.security.authentication.UsernamePasswordAuthentication; +import com.onixbyte.deltaforceguide.service.CookieService; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.Cookie; @@ -13,6 +14,7 @@ import jakarta.servlet.http.HttpServletResponse; import org.jspecify.annotations.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; @@ -22,6 +24,8 @@ import org.springframework.web.servlet.HandlerExceptionResolver; import org.springframework.web.util.WebUtils; import java.io.IOException; +import java.time.Duration; +import java.time.Instant; import java.util.Objects; import java.util.Optional; @@ -29,18 +33,22 @@ import java.util.Optional; public class TokenAuthenticationFilter extends OncePerRequestFilter { private final static Logger log = LoggerFactory.getLogger(TokenAuthenticationFilter.class); + private static final Duration ACCESS_TOKEN_RENEW_THRESHOLD = Duration.ofMinutes(5); private final UserManager userManager; private final TokenClient tokenClient; + private final CookieService cookieService; private final HandlerExceptionResolver handlerExceptionResolver; public TokenAuthenticationFilter( UserManager userManager, TokenClient tokenClient, + CookieService cookieService, HandlerExceptionResolver handlerExceptionResolver ) { this.userManager = userManager; this.tokenClient = tokenClient; + this.cookieService = cookieService; this.handlerExceptionResolver = handlerExceptionResolver; } @@ -70,6 +78,13 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { var user = userWrapper.get(); var authentication = UsernamePasswordAuthentication.authenticated(user); SecurityContextHolder.getContext().setAuthentication(authentication); + + if (shouldRenew(decodedToken.getExpiresAt().toInstant())) { + var renewedToken = tokenClient.generateToken(user); + var renewedTokenCookie = cookieService.buildCookie("AccessToken", renewedToken); + response.addHeader(HttpHeaders.SET_COOKIE, renewedTokenCookie.toString()); + } + filterChain.doFilter(request, response); } catch (JWTVerificationException e) { log.error("JWT verification failed.", e); @@ -79,5 +94,9 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter { handlerExceptionResolver.resolveException(request, response, null, e); } } + + private boolean shouldRenew(Instant expiresAt) { + return Duration.between(Instant.now(), expiresAt).compareTo(ACCESS_TOKEN_RENEW_THRESHOLD) < 0; + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/manager/CookieManager.java b/src/main/java/com/onixbyte/deltaforceguide/manager/CookieManager.java new file mode 100644 index 0000000..7bec528 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/manager/CookieManager.java @@ -0,0 +1,37 @@ +package com.onixbyte.deltaforceguide.manager; + +import com.onixbyte.deltaforceguide.properties.CookieProperties; +import org.springframework.boot.web.server.Cookie; +import org.springframework.stereotype.Component; + +import java.time.Duration; + +@Component +public class CookieManager { + + private final CookieProperties cookieProperties; + + public CookieManager(CookieProperties cookieProperties) { + this.cookieProperties = cookieProperties; + } + + public Boolean getHttpOnly() { + return cookieProperties.httpOnly(); + } + + public Boolean getSecure() { + return cookieProperties.secure(); + } + + public Cookie.SameSite getSameSite() { + return cookieProperties.sameSite(); + } + + public String getPath() { + return cookieProperties.path(); + } + + public Duration getMaxAge() { + return cookieProperties.maxAge(); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java b/src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java index 08ffa3c..fb8ac56 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java +++ b/src/main/java/com/onixbyte/deltaforceguide/manager/UserManager.java @@ -46,5 +46,9 @@ public class UserManager { public void deleteById(Long id) { userRepository.deleteById(id); } + + public Optional findByUsernameOrEmail(String principal) { + return userRepository.findByUsernameOrEmail(principal); + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/properties/CookieProperties.java b/src/main/java/com/onixbyte/deltaforceguide/properties/CookieProperties.java new file mode 100644 index 0000000..86dab77 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/properties/CookieProperties.java @@ -0,0 +1,17 @@ +package com.onixbyte.deltaforceguide.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.boot.context.properties.bind.DefaultValue; +import org.springframework.boot.web.server.Cookie; + +import java.time.Duration; + +@ConfigurationProperties(prefix = "app.cookie") +public record CookieProperties( + @DefaultValue("true") Boolean httpOnly, + @DefaultValue("true") Boolean secure, + @DefaultValue("/") String path, + @DefaultValue("PT2H") Duration maxAge, + @DefaultValue("LAX") Cookie.SameSite sameSite +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java b/src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java index 3efa050..7cecaad 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java +++ b/src/main/java/com/onixbyte/deltaforceguide/repository/UserRepository.java @@ -4,6 +4,8 @@ import com.onixbyte.deltaforceguide.domain.entity.User; import org.jspecify.annotations.NonNull; import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import java.util.Optional; @@ -25,5 +27,14 @@ public interface UserRepository extends JpaRepository { boolean existsByUsername(String username); boolean existsByEmail(String email); + + @EntityGraph(attributePaths = {"credentials"}) + @Query(""" + select u + from User u + where u.username = :principal + or u.email = :principal + """) + Optional findByUsernameOrEmail(@Param("principal") String principal); } diff --git a/src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java b/src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java index b32c814..d5e9a65 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java +++ b/src/main/java/com/onixbyte/deltaforceguide/security/provider/UsernamePasswordAuthenticationProvider.java @@ -43,7 +43,7 @@ public class UsernamePasswordAuthenticationProvider implements AuthenticationPro } // get userContainer from database - var userContainer = userManager.findByUsername(usernamePasswordAuthentication.getPrincipal()); + var userContainer = userManager.findByUsernameOrEmail(usernamePasswordAuthentication.getPrincipal()); if (userContainer.isEmpty()) { log.error("User {} is trying to authenticate but no userContainer found.", usernamePasswordAuthentication.getPrincipal()); throw new BizException(HttpStatus.UNAUTHORIZED, "用户名或密码错误。"); diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/AuthService.java b/src/main/java/com/onixbyte/deltaforceguide/service/AuthService.java new file mode 100644 index 0000000..b1bbfc7 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/service/AuthService.java @@ -0,0 +1,40 @@ +package com.onixbyte.deltaforceguide.service; + +import com.onixbyte.deltaforceguide.domain.dto.LoginRequest; +import com.onixbyte.deltaforceguide.domain.entity.User; +import com.onixbyte.deltaforceguide.exeption.BizException; +import com.onixbyte.deltaforceguide.security.authentication.UsernamePasswordAuthentication; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.stereotype.Service; + +import java.util.Objects; +import java.util.Optional; + +@Service +public class AuthService { + + private static final Logger log = LoggerFactory.getLogger(AuthService.class); + private final AuthenticationManager authenticationManager; + + public AuthService(AuthenticationManager authenticationManager) { + this.authenticationManager = authenticationManager; + } + + public User login(LoginRequest request) { + var _authentication = authenticationManager.authenticate(UsernamePasswordAuthentication + .unauthenticated(request.principle(), request.credential())); + if (!(_authentication instanceof UsernamePasswordAuthentication authentication)) { + log.error( + "Type mismatched, required type is UsernamePasswordAuthentication but got {}.", + _authentication.getClass() + ); + throw new BizException(HttpStatus.INTERNAL_SERVER_ERROR, "登录服务异常，请稍后再试。"); + } + + return authentication.getDetails(); + } + +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/CookieService.java b/src/main/java/com/onixbyte/deltaforceguide/service/CookieService.java new file mode 100644 index 0000000..764b47b --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/service/CookieService.java @@ -0,0 +1,47 @@ +package com.onixbyte.deltaforceguide.service; + +import com.onixbyte.deltaforceguide.manager.CookieManager; +import org.springframework.http.ResponseCookie; +import org.springframework.stereotype.Service; + +import java.time.Duration; + +@Service +public class CookieService { + + private final CookieManager cookieManager; + + public CookieService(CookieManager cookieManager) { + this.cookieManager = cookieManager; + } + + public ResponseCookie buildCookie(String cookieName, String value) { + return buildCookieInternal(cookieName, value, cookieManager.getMaxAge()); + } + + public ResponseCookie buildCookie(String cookieName, String value, Duration validDuration) { + return buildCookieInternal(cookieName, value, validDuration); + } + + /** + * Creates a response cookie builder with specified name, value and valid duration. + * + * @param name name of the cookie + * @param value value of the cookie + * @param maxAge valid duration of the cookie + * @return cookie builder + */ + protected ResponseCookie buildCookieInternal( + String name, + String value, + Duration maxAge + ) { + return ResponseCookie.from(name, value) + .secure(cookieManager.getSecure()) + .maxAge(maxAge) + .httpOnly(cookieManager.getHttpOnly()) + .path(cookieManager.getPath()) + .sameSite(cookieManager.getSameSite().attributeValue()) + .build(); + } +} diff --git a/src/main/resources/db/migration/V4__user.sql b/src/main/resources/db/migration/V4__user.sql index f3df299..0215d26 100644 --- a/src/main/resources/db/migration/V4__user.sql +++ b/src/main/resources/db/migration/V4__user.sql @@ -1,12 +1,14 @@ -DROP TABLE IF EXISTS app_user; +DROP TABLE IF EXISTS app_user CASCADE; CREATE TABLE app_user ( id BIGSERIAL NOT NULL PRIMARY KEY, username VARCHAR(255) NOT NULL, - email VARCHAR(255) NOT NULL + email VARCHAR(255) NOT NULL, + CONSTRAINT app_user_username_key UNIQUE (username), + CONSTRAINT app_user_email_key UNIQUE (email) ); -DROP TABLE IF EXISTS app_user_credential; +DROP TABLE IF EXISTS app_user_credential CASCADE; CREATE TABLE app_user_credential ( user_id BIGINT NOT NULL REFERENCES app_user (id), From 1fc7b932bc623e4d441eacb9880a9797aa5d7fa4 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Tue, 14 Apr 2026 12:13:02 +0800 Subject: [PATCH 06/25] feat: add logout endpoint and refactor cookie management in AuthController --- .../deltaforceguide/config/SecurityConfig.java | 2 +- .../deltaforceguide/controller/AuthController.java | 13 ++++++++++++- .../onixbyte/deltaforceguide/shared/CookieName.java | 6 ++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/shared/CookieName.java diff --git a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java index 1ac6d71..f77a522 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java +++ b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java @@ -45,8 +45,8 @@ public class SecurityConfig { .authorizeHttpRequests((customiser) -> customiser .requestMatchers("/error", "/error/**").permitAll() .requestMatchers("/captcha", "/captcha/**").permitAll() - .requestMatchers("/auth/**").permitAll() .requestMatchers("/auth/logout").authenticated() + .requestMatchers("/auth/**").permitAll() .requestMatchers( "/swagger-ui.html", "/swagger-ui", diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java index 172f8b7..481a549 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java @@ -5,6 +5,7 @@ import com.onixbyte.deltaforceguide.domain.dto.UserResponse; import com.onixbyte.deltaforceguide.client.TokenClient; import com.onixbyte.deltaforceguide.service.AuthService; import com.onixbyte.deltaforceguide.service.CookieService; +import com.onixbyte.deltaforceguide.shared.CookieName; import jakarta.validation.Valid; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; @@ -13,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.time.Duration; + @RestController @RequestMapping("/auth") public class AuthController { @@ -31,10 +34,18 @@ public class AuthController { public ResponseEntity login(@Valid @RequestBody LoginRequest request) { var user = authService.login(request); var accessToken = tokenClient.generateToken(user); - var accessTokenCookie = cookieService.buildCookie("AccessToken", accessToken); + var accessTokenCookie = cookieService.buildCookie(CookieName.ACCESS_TOKEN, accessToken); return ResponseEntity.ok() .header(HttpHeaders.SET_COOKIE, accessTokenCookie.toString()) .body(UserResponse.from(user)); } + + @PostMapping("/logout") + public ResponseEntity logout() { + var expiredCookie = cookieService.buildCookie(CookieName.ACCESS_TOKEN, "", Duration.ZERO); + return ResponseEntity.noContent() + .header(HttpHeaders.SET_COOKIE, expiredCookie.toString()) + .build(); + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/shared/CookieName.java b/src/main/java/com/onixbyte/deltaforceguide/shared/CookieName.java new file mode 100644 index 0000000..329852b --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/shared/CookieName.java @@ -0,0 +1,6 @@ +package com.onixbyte.deltaforceguide.shared; + +public class CookieName { + + public static final String ACCESS_TOKEN = "AccessToken"; +} From cb50892ffee8725c5195798c97602d76bdfdfe62 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Wed, 15 Apr 2026 11:14:19 +0800 Subject: [PATCH 07/25] feat: add builder pattern for Firearm, Modification, User, UserCredential, and UserCredentialId classes --- .../domain/entity/Firearm.java | 83 +++++++++++++++++++ .../domain/entity/Modification.java | 69 +++++++++++++++ .../deltaforceguide/domain/entity/User.java | 41 +++++++++ .../domain/entity/UserCredential.java | 55 ++++++++++++ .../domain/entity/UserCredentialId.java | 27 ++++++ 5 files changed, 275 insertions(+) diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Firearm.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Firearm.java index c38173f..65942d3 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Firearm.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Firearm.java @@ -140,5 +140,88 @@ public class Firearm { this.modifications.remove(modification); modification.setFirearm(null); } + + public static Builder builder() { + return new Builder(); + } + + public static class Builder { + + private Long id; + private String name; + private FirearmType type; + private String level; + private String review; + private String calibre; + private Integer fireRate; + private Integer armourDamage; + private Integer bodyDamage; + private List modifications; + + public Builder id(Long id) { + this.id = id; + return this; + } + + public Builder name(String name) { + this.name = name; + return this; + } + + public Builder type(FirearmType type) { + this.type = type; + return this; + } + + public Builder level(String level) { + this.level = level; + return this; + } + + public Builder review(String review) { + this.review = review; + return this; + } + + public Builder calibre(String calibre) { + this.calibre = calibre; + return this; + } + + public Builder fireRate(Integer fireRate) { + this.fireRate = fireRate; + return this; + } + + public Builder armourDamage(Integer armourDamage) { + this.armourDamage = armourDamage; + return this; + } + + public Builder bodyDamage(Integer bodyDamage) { + this.bodyDamage = bodyDamage; + return this; + } + + public Builder modifications(List modifications) { + this.modifications = modifications; + return this; + } + + public Firearm build() { + Firearm firearm = new Firearm(); + firearm.id = this.id; + firearm.name = this.name; + firearm.type = this.type; + firearm.level = this.level; + firearm.review = this.review; + firearm.calibre = this.calibre; + firearm.fireRate = this.fireRate; + firearm.armourDamage = this.armourDamage; + firearm.bodyDamage = this.bodyDamage; + firearm.modifications = this.modifications == null ? new ArrayList<>() : this.modifications; + return firearm; + } + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java index 6f29bd5..6ed3ec6 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java @@ -116,5 +116,74 @@ public class Modification { public void setVideoUrl(String videoUrl) { this.videoUrl = videoUrl; } + + public static Builder builder() { + return new Builder(); + } + + public static class Builder { + + private Long id; + private Firearm firearm; + private String name; + private String code; + private List tags; + private String note; + private String author; + private String videoUrl; + + public Builder id(Long id) { + this.id = id; + return this; + } + + public Builder firearm(Firearm firearm) { + this.firearm = firearm; + return this; + } + + public Builder name(String name) { + this.name = name; + return this; + } + + public Builder code(String code) { + this.code = code; + return this; + } + + public Builder tags(List tags) { + this.tags = tags; + return this; + } + + public Builder note(String note) { + this.note = note; + return this; + } + + public Builder author(String author) { + this.author = author; + return this; + } + + public Builder videoUrl(String videoUrl) { + this.videoUrl = videoUrl; + return this; + } + + public Modification build() { + Modification modification = new Modification(); + modification.id = this.id; + modification.firearm = this.firearm; + modification.name = this.name; + modification.code = this.code; + modification.tags = this.tags == null ? new ArrayList<>() : this.tags; + modification.note = this.note; + modification.author = this.author; + modification.videoUrl = this.videoUrl; + return modification; + } + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java index 31cf527..67142df 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/User.java @@ -70,4 +70,45 @@ public class User { this.credentials.remove(credential); credential.setUser(null); } + + public static Builder builder() { + return new Builder(); + } + + public static class Builder { + + private Long id; + private String username; + private String email; + private List credentials; + + public Builder id(Long id) { + this.id = id; + return this; + } + + public Builder username(String username) { + this.username = username; + return this; + } + + public Builder email(String email) { + this.email = email; + return this; + } + + public Builder credentials(List credentials) { + this.credentials = credentials; + return this; + } + + public User build() { + User user = new User(); + user.id = this.id; + user.username = this.username; + user.email = this.email; + user.credentials = this.credentials == null ? new ArrayList<>() : this.credentials; + return user; + } + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java index 44e409e..b8a09a6 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredential.java @@ -80,4 +80,59 @@ public class UserCredential { public void setCredential(String credential) { this.credential = credential; } + + public static Builder builder() { + return new Builder(); + } + + public static class Builder { + + private UserCredentialId id; + private User user; + private Long userId; + private String provider; + private String credential; + + public Builder id(UserCredentialId id) { + this.id = id; + return this; + } + + public Builder user(User user) { + this.user = user; + return this; + } + + public Builder userId(Long userId) { + this.userId = userId; + return this; + } + + public Builder provider(String provider) { + this.provider = provider; + return this; + } + + public Builder credential(String credential) { + this.credential = credential; + return this; + } + + public UserCredential build() { + UserCredential userCredential = new UserCredential(); + userCredential.id = this.id == null ? new UserCredentialId() : this.id; + userCredential.user = this.user; + if (this.user != null) { + userCredential.id.setUserId(this.user.getId()); + } + if (this.userId != null) { + userCredential.id.setUserId(this.userId); + } + if (this.provider != null) { + userCredential.id.setProvider(this.provider); + } + userCredential.credential = this.credential; + return userCredential; + } + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java index ac1a98c..57a819e 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/UserCredentialId.java @@ -44,6 +44,33 @@ public class UserCredentialId implements Serializable { public int hashCode() { return Objects.hash(userId, provider); } + + public static Builder builder() { + return new Builder(); + } + + public static class Builder { + + private Long userId; + private String provider; + + public Builder userId(Long userId) { + this.userId = userId; + return this; + } + + public Builder provider(String provider) { + this.provider = provider; + return this; + } + + public UserCredentialId build() { + UserCredentialId id = new UserCredentialId(); + id.userId = this.userId; + id.provider = this.provider; + return id; + } + } } From a58fefbd2d5375aa4bca1d8da0a8aa46e31d1a30 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Thu, 16 Apr 2026 09:52:55 +0800 Subject: [PATCH 08/25] feat: add addFirearm endpoint and FirearmRequest DTO for firearm creation --- .../controller/FirearmController.java | 12 +++++++----- .../domain/dto/FirearmRequest.java | 15 +++++++++++++++ .../deltaforceguide/service/FirearmService.java | 16 ++++++++++++++++ 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/FirearmRequest.java diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java index d6e8ca7..2f723fe 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java @@ -1,5 +1,6 @@ package com.onixbyte.deltaforceguide.controller; +import com.onixbyte.deltaforceguide.domain.dto.FirearmRequest; import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.enumeration.FirearmType; @@ -11,11 +12,7 @@ import jakarta.validation.constraints.Min; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Tag(name = "武器管理", description = "与武器有关的操作") @RestController @@ -46,5 +43,10 @@ public class FirearmController { public FirearmResponse queryById(@PathVariable Long id) { return firearmService.queryById(id); } + + @PostMapping + public FirearmResponse addFirearm(@Validated @RequestBody FirearmRequest request) { + return firearmService.addFirearm(request); + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/FirearmRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/FirearmRequest.java new file mode 100644 index 0000000..74e1993 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/FirearmRequest.java @@ -0,0 +1,15 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import com.onixbyte.deltaforceguide.enumeration.FirearmType; + +public record FirearmRequest( + String name, + FirearmType type, + String level, + String calibre, + Integer fireRate, + Integer armourDamage, + Integer bodyDamage, + String review +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java b/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java index 327254c..dc7f090 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java +++ b/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java @@ -1,5 +1,6 @@ package com.onixbyte.deltaforceguide.service; +import com.onixbyte.deltaforceguide.domain.dto.FirearmRequest; import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.domain.entity.Firearm; @@ -36,5 +37,20 @@ public class FirearmService { .map(FirearmResponse::from) .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Firearm not found: " + id)); } + + public FirearmResponse addFirearm(FirearmRequest request) { + var firearm = firearmRepository.save(Firearm.builder() + .name(request.name()) + .type(request.type()) + .level(request.level()) + .calibre(request.calibre()) + .fireRate(request.fireRate()) + .armourDamage(request.armourDamage()) + .bodyDamage(request.bodyDamage()) + .review(request.review()) + .build()); + + return FirearmResponse.from(firearm); + } } From f0a8006097945dfcd9c30725a4fd7e14eda5c68d Mon Sep 17 00:00:00 2001 From: zihluwang Date: Fri, 17 Apr 2026 10:55:39 +0800 Subject: [PATCH 09/25] feat: add Swagger annotations for user authentication endpoints and update validation in LoginRequest --- .../deltaforceguide/controller/AuthController.java | 8 ++++++-- .../deltaforceguide/domain/dto/LoginRequest.java | 10 ++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java index 481a549..af60283 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java @@ -6,9 +6,11 @@ import com.onixbyte.deltaforceguide.client.TokenClient; import com.onixbyte.deltaforceguide.service.AuthService; import com.onixbyte.deltaforceguide.service.CookieService; import com.onixbyte.deltaforceguide.shared.CookieName; -import jakarta.validation.Valid; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController; import java.time.Duration; +@Tag(name = "用户鉴权", description = "处理用户登录与退出功能") @RestController @RequestMapping("/auth") public class AuthController { @@ -30,8 +33,9 @@ public class AuthController { this.cookieService = cookieService; } + @Operation(description = "用户登录") @PostMapping("/login") - public ResponseEntity login(@Valid @RequestBody LoginRequest request) { + public ResponseEntity login(@Validated @RequestBody LoginRequest request) { var user = authService.login(request); var accessToken = tokenClient.generateToken(user); var accessTokenCookie = cookieService.buildCookie(CookieName.ACCESS_TOKEN, accessToken); diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java index 5dda62b..272d119 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java @@ -1,9 +1,15 @@ package com.onixbyte.deltaforceguide.domain.dto; +import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +@Schema(description = "登录请求") public record LoginRequest( - @NotBlank(message = "登录名称不能为空") String principle, - @NotBlank(message = "登录口令不能为空") String credential + @NotBlank(message = "登录名称不能为空") + @Schema(description = "用户名或电子邮箱") + String principle, + @NotBlank(message = "登录口令不能为空") + @Schema(description = "密码") + String credential ) { } From 17048104d9acf876b1f77851c9c41c8021646614 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Fri, 17 Apr 2026 10:57:41 +0800 Subject: [PATCH 10/25] feat: add logout operation description and update schema annotations in LoginRequest --- .../onixbyte/deltaforceguide/controller/AuthController.java | 1 + .../com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java index af60283..6d7e4e5 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java @@ -45,6 +45,7 @@ public class AuthController { .body(UserResponse.from(user)); } + @Operation(description = "退出登录") @PostMapping("/logout") public ResponseEntity logout() { var expiredCookie = cookieService.buildCookie(CookieName.ACCESS_TOKEN, "", Duration.ZERO); diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java index 272d119..ab820ec 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/LoginRequest.java @@ -6,10 +6,10 @@ import jakarta.validation.constraints.NotBlank; @Schema(description = "登录请求") public record LoginRequest( @NotBlank(message = "登录名称不能为空") - @Schema(description = "用户名或电子邮箱") + @Schema(description = "用户名或电子邮箱", requiredMode = Schema.RequiredMode.REQUIRED) String principle, @NotBlank(message = "登录口令不能为空") - @Schema(description = "密码") + @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED) String credential ) { } From dec7f3c7d23a398b13a6b4386a6af4f3ca7bc32a Mon Sep 17 00:00:00 2001 From: zihluwang Date: Tue, 21 Apr 2026 14:07:17 +0800 Subject: [PATCH 11/25] feat: add Accessory and Tuning classes, update Modification to include accessories --- .../domain/entity/Accessory.java | 48 +++++++++++++++++++ .../domain/entity/Modification.java | 41 +++++++++++----- .../deltaforceguide/domain/entity/Tuning.java | 26 ++++++++++ .../V5__modification_accessories.sql | 2 + 4 files changed, 105 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/entity/Accessory.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/entity/Tuning.java create mode 100644 src/main/resources/db/migration/V5__modification_accessories.sql diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Accessory.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Accessory.java new file mode 100644 index 0000000..8c4b6b9 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Accessory.java @@ -0,0 +1,48 @@ +package com.onixbyte.deltaforceguide.domain.entity; + +import java.util.ArrayList; +import java.util.List; + +public class Accessory { + + private String slotName; + + private String accessoryName; + + private List tunings = new ArrayList<>(); + + public Accessory() { + } + + public String getSlotName() { + return slotName; + } + + public void setSlotName(String slotName) { + this.slotName = slotName; + } + + public String getAccessoryName() { + return accessoryName; + } + + public void setAccessoryName(String accessoryName) { + this.accessoryName = accessoryName; + } + + public List getTunings() { + return tunings; + } + + public void setTunings(List tunings) { + this.tunings = tunings; + } + + public void addTuning(Tuning tuning) { + this.tunings.add(tuning); + } + + public void removeTuning(Tuning tuning) { + this.tunings.remove(tuning); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java index 6ed3ec6..ed145b5 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Modification.java @@ -1,17 +1,7 @@ package com.onixbyte.deltaforceguide.domain.entity; import io.hypersistence.utils.hibernate.type.json.JsonType; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.ForeignKey; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Index; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; +import jakarta.persistence.*; import org.hibernate.annotations.Type; import java.util.ArrayList; @@ -41,9 +31,13 @@ public class Modification { private String code; @Type(JsonType.class) - @Column(name = "tags", columnDefinition = "json") + @Column(name = "tags", columnDefinition = "jsonb") private List tags = new ArrayList<>(); + @Type(JsonType.class) + @Column(name = "accessories", columnDefinition = "jsonb") + private List accessories = new ArrayList<>(); + @Column(name = "note", columnDefinition = "TEXT") private String note; @@ -93,6 +87,22 @@ public class Modification { this.tags = tags; } + public List getAccessories() { + return accessories; + } + + public void setAccessories(List accessories) { + this.accessories = accessories; + } + + public void addAccessory(Accessory modificationAccessory) { + this.accessories.add(modificationAccessory); + } + + public void removeAccessory(Accessory modificationAccessory) { + this.accessories.remove(modificationAccessory); + } + public String getNote() { return note; } @@ -128,6 +138,7 @@ public class Modification { private String name; private String code; private List tags; + private List accessories; private String note; private String author; private String videoUrl; @@ -157,6 +168,11 @@ public class Modification { return this; } + public Builder accessories(List accessories) { + this.accessories = accessories; + return this; + } + public Builder note(String note) { this.note = note; return this; @@ -179,6 +195,7 @@ public class Modification { modification.name = this.name; modification.code = this.code; modification.tags = this.tags == null ? new ArrayList<>() : this.tags; + modification.accessories = this.accessories == null ? new ArrayList<>() : this.accessories; modification.note = this.note; modification.author = this.author; modification.videoUrl = this.videoUrl; diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Tuning.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Tuning.java new file mode 100644 index 0000000..4ab9879 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/Tuning.java @@ -0,0 +1,26 @@ +package com.onixbyte.deltaforceguide.domain.entity; + +public class Tuning { + + private String tuningName; + private Double tuningValue; + + public Tuning() { + } + + public String getTuningName() { + return tuningName; + } + + public void setTuningName(String tuningName) { + this.tuningName = tuningName; + } + + public Double getTuningValue() { + return tuningValue; + } + + public void setTuningValue(Double tuningValue) { + this.tuningValue = tuningValue; + } +} diff --git a/src/main/resources/db/migration/V5__modification_accessories.sql b/src/main/resources/db/migration/V5__modification_accessories.sql new file mode 100644 index 0000000..1450826 --- /dev/null +++ b/src/main/resources/db/migration/V5__modification_accessories.sql @@ -0,0 +1,2 @@ +ALTER TABLE modification + ADD accessories JSONB NOT NULL DEFAULT '[]'; \ No newline at end of file From 93dbd857e09289775885fb58570ee57585af1b78 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Tue, 21 Apr 2026 14:20:45 +0800 Subject: [PATCH 12/25] feat: add update and delete operations for Firearm, including error handling --- .../controller/FirearmController.java | 13 +++++++++- .../service/FirearmService.java | 26 ++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java index 2f723fe..817291e 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java @@ -48,5 +48,16 @@ public class FirearmController { public FirearmResponse addFirearm(@Validated @RequestBody FirearmRequest request) { return firearmService.addFirearm(request); } -} + @Operation(description = "更新指定武器的数据") + @PutMapping("/{id}") + public FirearmResponse updateFirearm(@PathVariable Long id, @Validated @RequestBody FirearmRequest request) { + return firearmService.updateFirearm(id, request); + } + + @Operation(description = "删除指定武器的数据") + @DeleteMapping("/{id}") + public void deleteFirearm(@PathVariable Long id) { + firearmService.deleteFirearm(id); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java b/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java index dc7f090..3b69c15 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java +++ b/src/main/java/com/onixbyte/deltaforceguide/service/FirearmService.java @@ -5,6 +5,7 @@ import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.domain.entity.Firearm; import com.onixbyte.deltaforceguide.enumeration.FirearmType; +import com.onixbyte.deltaforceguide.exeption.BizException; import com.onixbyte.deltaforceguide.repository.FirearmRepository; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -52,5 +53,28 @@ public class FirearmService { return FirearmResponse.from(firearm); } -} + @Transactional + public FirearmResponse updateFirearm(Long id, FirearmRequest request) { + var firearm = firearmRepository.findById(id) + .orElseThrow(() -> new BizException(HttpStatus.NOT_FOUND, "Firearm not found: " + id)); + + firearm.setName(request.name()); + firearm.setType(request.type()); + firearm.setLevel(request.level()); + firearm.setCalibre(request.calibre()); + firearm.setFireRate(request.fireRate()); + firearm.setArmourDamage(request.armourDamage()); + firearm.setBodyDamage(request.bodyDamage()); + firearm.setReview(request.review()); + + return FirearmResponse.from(firearmRepository.save(firearm)); + } + + @Transactional + public void deleteFirearm(Long id) { + Firearm firearm = firearmRepository.findById(id) + .orElseThrow(() -> new BizException(HttpStatus.NOT_FOUND, "Firearm not found: " + id)); + firearmRepository.delete(firearm); + } +} From 5ce8a994a40cbbca0cafe9037d02ea8b0c9cb89d Mon Sep 17 00:00:00 2001 From: zihluwang Date: Tue, 21 Apr 2026 23:39:05 +0800 Subject: [PATCH 13/25] feat: add modification creation and deletion endpoints, including batch operations and request DTOs --- .../controller/ModificationController.java | 38 +++++ .../domain/dto/AccessoryRequest.java | 20 +++ .../dto/ModificationBatchCreateRequest.java | 13 ++ .../dto/ModificationBatchDeleteRequest.java | 13 ++ .../domain/dto/ModificationRequest.java | 33 ++++ .../domain/dto/TuningRequest.java | 13 ++ .../service/ModificationService.java | 150 +++++++++++++++++- 7 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryRequest.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchCreateRequest.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchDeleteRequest.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationRequest.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningRequest.java diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java index 5f3b1c6..5b77c01 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java @@ -1,18 +1,26 @@ package com.onixbyte.deltaforceguide.controller; +import com.onixbyte.deltaforceguide.domain.dto.ModificationBatchDeleteRequest; +import com.onixbyte.deltaforceguide.domain.dto.ModificationBatchCreateRequest; +import com.onixbyte.deltaforceguide.domain.dto.ModificationRequest; import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.service.ModificationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import jakarta.validation.constraints.Max; import jakarta.validation.constraints.Min; import jakarta.validation.constraints.Positive; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Sort; import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -49,4 +57,34 @@ public class ModificationController { public ModificationResponse queryById(@PathVariable Long id) { return modificationService.queryById(id); } + + @Operation(description = "创建改装") + @PostMapping + public ModificationResponse create(@Valid @RequestBody ModificationRequest request) { + return modificationService.create(request); + } + + @Operation(description = "批量创建改装") + @PostMapping("/batch") + public List batchCreate(@Valid @RequestBody ModificationBatchCreateRequest request) { + return modificationService.batchCreate(request.modifications()); + } + + @Operation(description = "修改指定改装") + @PutMapping("/{id}") + public ModificationResponse update(@PathVariable Long id, @Valid @RequestBody ModificationRequest request) { + return modificationService.update(id, request); + } + + @Operation(description = "删除指定改装") + @DeleteMapping("/{id}") + public void delete(@PathVariable Long id) { + modificationService.delete(id); + } + + @Operation(description = "批量删除改装") + @DeleteMapping("/batch-delete") + public void batchDelete(@Valid @RequestBody ModificationBatchDeleteRequest request) { + modificationService.batchDelete(request.ids()); + } } diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryRequest.java new file mode 100644 index 0000000..29fa638 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryRequest.java @@ -0,0 +1,20 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; + +import java.util.ArrayList; +import java.util.List; + +public record AccessoryRequest( + @NotBlank(message = "插槽名称不能为空") + String slotName, + @NotBlank(message = "配件名称不能为空") + String accessoryName, + List<@Valid TuningRequest> tunings +) { + public List tunings() { + return tunings == null ? new ArrayList<>() : tunings; + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchCreateRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchCreateRequest.java new file mode 100644 index 0000000..cdb3d93 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchCreateRequest.java @@ -0,0 +1,13 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; + +import java.util.List; + +public record ModificationBatchCreateRequest( + @NotEmpty(message = "批量创建列表不能为空") + List<@Valid ModificationRequest> modifications +) { +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchDeleteRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchDeleteRequest.java new file mode 100644 index 0000000..7e46400 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationBatchDeleteRequest.java @@ -0,0 +1,13 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Positive; + +import java.util.List; + +public record ModificationBatchDeleteRequest( + @NotEmpty(message = "批量删除ID列表不能为空") + List<@Positive(message = "ID必须为正数") Long> ids +) { +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationRequest.java new file mode 100644 index 0000000..c602dbd --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationRequest.java @@ -0,0 +1,33 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; + +import java.util.ArrayList; +import java.util.List; + +public record ModificationRequest( + @NotNull(message = "武器ID不能为空") + @Positive(message = "武器ID必须为正数") + Long firearmId, + @NotBlank(message = "改装名称不能为空") + String name, + @NotBlank(message = "改装代码不能为空") + String code, + List<@NotBlank(message = "标签不能为空") String> tags, + List<@Valid AccessoryRequest> accessories, + String note, + String author, + String videoUrl +) { + public List tags() { + return tags == null ? new ArrayList<>() : tags; + } + + public List accessories() { + return accessories == null ? new ArrayList<>() : accessories; + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningRequest.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningRequest.java new file mode 100644 index 0000000..414becd --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningRequest.java @@ -0,0 +1,13 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record TuningRequest( + @NotBlank(message = "调校项名称不能为空") + String tuningName, + @NotNull(message = "调校值不能为空") + Double tuningValue +) { +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/ModificationService.java b/src/main/java/com/onixbyte/deltaforceguide/service/ModificationService.java index 4da45d3..39e5ec0 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/service/ModificationService.java +++ b/src/main/java/com/onixbyte/deltaforceguide/service/ModificationService.java @@ -1,8 +1,15 @@ package com.onixbyte.deltaforceguide.service; +import com.onixbyte.deltaforceguide.domain.dto.AccessoryRequest; +import com.onixbyte.deltaforceguide.domain.dto.ModificationRequest; import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; +import com.onixbyte.deltaforceguide.domain.dto.TuningRequest; +import com.onixbyte.deltaforceguide.domain.entity.Accessory; +import com.onixbyte.deltaforceguide.domain.entity.Firearm; import com.onixbyte.deltaforceguide.domain.entity.Modification; +import com.onixbyte.deltaforceguide.domain.entity.Tuning; +import com.onixbyte.deltaforceguide.repository.FirearmRepository; import com.onixbyte.deltaforceguide.repository.ModificationRepository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -13,16 +20,27 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.server.ResponseStatusException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; +import java.util.Set; @Service public class ModificationService { private final ModificationRepository modificationRepository; + private final FirearmRepository firearmRepository; private final ObjectMapper objectMapper; - public ModificationService(ModificationRepository modificationRepository, ObjectMapper objectMapper) { + public ModificationService( + ModificationRepository modificationRepository, + FirearmRepository firearmRepository, + ObjectMapper objectMapper + ) { this.modificationRepository = modificationRepository; + this.firearmRepository = firearmRepository; this.objectMapper = objectMapper; } @@ -58,4 +76,134 @@ public class ModificationService { public List findAllTags(Long firearmId) { return modificationRepository.findAllTags(firearmId); } + + @Transactional + public ModificationResponse create(ModificationRequest request) { + Firearm firearm = firearmRepository.findById(request.firearmId()) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Firearm not found: " + request.firearmId())); + + Modification modification = toEntity(request, firearm); + return ModificationResponse.from(modificationRepository.save(modification)); + } + + @Transactional + public List batchCreate(List requests) { + Set firearmIds = requests.stream() + .map(ModificationRequest::firearmId) + .collect(java.util.stream.Collectors.toCollection(LinkedHashSet::new)); + + Map firearmMap = new HashMap<>(); + firearmRepository.findAllById(firearmIds).forEach(firearm -> firearmMap.put(firearm.getId(), firearm)); + + if (firearmMap.size() != firearmIds.size()) { + List missingFirearmIds = firearmIds.stream() + .filter(id -> !firearmMap.containsKey(id)) + .toList(); + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Firearm not found: " + missingFirearmIds); + } + + List modifications = requests.stream() + .map(request -> toEntity(request, firearmMap.get(request.firearmId()))) + .toList(); + return modificationRepository.saveAll(modifications) + .stream() + .map(ModificationResponse::from) + .toList(); + } + + @Transactional + public ModificationResponse update(Long id, ModificationRequest request) { + Modification modification = modificationRepository.findById(id) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Modification not found: " + id)); + Firearm firearm = firearmRepository.findById(request.firearmId()) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Firearm not found: " + request.firearmId())); + + modification.setFirearm(firearm); + modification.setName(request.name()); + modification.setCode(request.code()); + modification.setTags(safeTags(request.tags())); + modification.setAccessories(toAccessories(request.accessories())); + modification.setNote(request.note()); + modification.setAuthor(request.author()); + modification.setVideoUrl(request.videoUrl()); + + return ModificationResponse.from(modificationRepository.save(modification)); + } + + @Transactional + public void delete(Long id) { + Modification modification = modificationRepository.findById(id) + .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Modification not found: " + id)); + modificationRepository.delete(modification); + } + + @Transactional + public void batchDelete(List ids) { + Set uniqueIds = new LinkedHashSet<>(ids); + List modifications = modificationRepository.findAllById(uniqueIds); + + if (modifications.size() != uniqueIds.size()) { + Set foundIds = modifications.stream() + .map(Modification::getId) + .collect(java.util.stream.Collectors.toSet()); + List missingIds = uniqueIds.stream() + .filter(id -> !foundIds.contains(id)) + .toList(); + throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Modification not found: " + missingIds); + } + + modificationRepository.deleteAllInBatch(modifications); + } + + private Modification toEntity(ModificationRequest request, Firearm firearm) { + return Modification.builder() + .firearm(firearm) + .name(request.name()) + .code(request.code()) + .tags(safeTags(request.tags())) + .accessories(toAccessories(request.accessories())) + .note(request.note()) + .author(request.author()) + .videoUrl(request.videoUrl()) + .build(); + } + + private List safeTags(List tags) { + return tags == null ? new ArrayList<>() : tags; + } + + private List toAccessories(List accessoryRequests) { + if (accessoryRequests == null) { + return new ArrayList<>(); + } + + return accessoryRequests.stream() + .map(this::toAccessory) + .toList(); + } + + private Accessory toAccessory(AccessoryRequest request) { + Accessory accessory = new Accessory(); + accessory.setSlotName(request.slotName()); + accessory.setAccessoryName(request.accessoryName()); + accessory.setTunings(toTunings(request.tunings())); + return accessory; + } + + private List toTunings(List tuningRequests) { + if (tuningRequests == null) { + return new ArrayList<>(); + } + + return tuningRequests.stream() + .map(this::toTuning) + .toList(); + } + + private Tuning toTuning(TuningRequest request) { + Tuning tuning = new Tuning(); + tuning.setTuningName(request.tuningName()); + tuning.setTuningValue(request.tuningValue()); + return tuning; + } } From 353c05339e4bc47b14068d8bf0ba8fe88489c333 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Wed, 22 Apr 2026 16:35:39 +0800 Subject: [PATCH 14/25] feat: refactor batch delete endpoint to use request parameters and update SQL schema for firearm table --- .../deltaforceguide/controller/ModificationController.java | 6 +++--- src/main/resources/db/migration/V3__bullet_and_damages.sql | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java index 5b77c01..1d3f90c 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java @@ -1,6 +1,5 @@ package com.onixbyte.deltaforceguide.controller; -import com.onixbyte.deltaforceguide.domain.dto.ModificationBatchDeleteRequest; import com.onixbyte.deltaforceguide.domain.dto.ModificationBatchCreateRequest; import com.onixbyte.deltaforceguide.domain.dto.ModificationRequest; import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse; @@ -84,7 +83,8 @@ public class ModificationController { @Operation(description = "批量删除改装") @DeleteMapping("/batch-delete") - public void batchDelete(@Valid @RequestBody ModificationBatchDeleteRequest request) { - modificationService.batchDelete(request.ids()); + @Validated + public void batchDelete(@RequestParam List<@Positive Long> ids) { + modificationService.batchDelete(ids); } } diff --git a/src/main/resources/db/migration/V3__bullet_and_damages.sql b/src/main/resources/db/migration/V3__bullet_and_damages.sql index 97ac135..ae0fabf 100644 --- a/src/main/resources/db/migration/V3__bullet_and_damages.sql +++ b/src/main/resources/db/migration/V3__bullet_and_damages.sql @@ -1,4 +1,5 @@ -- 创建新表 +DROP TABLE IF EXISTS firearm_new; CREATE TABLE firearm_new ( id BIGSERIAL NOT NULL, @@ -20,10 +21,10 @@ SELECT id, name, type, level, - calibre, + '', + 0, + 0, 0, - armour_damage, - body_damage, review FROM firearm; From 384e17e79c771df5ab5dec2b2afa426cffe55109 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Thu, 23 Apr 2026 16:10:05 +0800 Subject: [PATCH 15/25] feat: add AccessoryResponse and TuningResponse DTOs for accessory and tuning data representation --- .../domain/dto/AccessoryResponse.java | 22 +++++++++++++++++++ .../domain/dto/ModificationResponse.java | 4 ++++ .../domain/dto/TuningResponse.java | 16 ++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryResponse.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningResponse.java diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryResponse.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryResponse.java new file mode 100644 index 0000000..421410d --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/AccessoryResponse.java @@ -0,0 +1,22 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import com.onixbyte.deltaforceguide.domain.entity.Accessory; + +import java.util.List; + +public record AccessoryResponse( + String slotName, + String accessoryName, + List tunings +) { + public static AccessoryResponse from(Accessory accessory) { + return new AccessoryResponse( + accessory.getSlotName(), + accessory.getAccessoryName(), + accessory.getTunings() == null + ? List.of() + : accessory.getTunings().stream().map(TuningResponse::from).toList() + ); + } +} + diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationResponse.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationResponse.java index 7eb6384..c4d4492 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationResponse.java +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/ModificationResponse.java @@ -10,6 +10,7 @@ public record ModificationResponse( String name, String code, List tags, + List accessories, String note, String author, String videoUrl @@ -21,6 +22,9 @@ public record ModificationResponse( modification.getName(), modification.getCode(), modification.getTags(), + modification.getAccessories() == null + ? List.of() + : modification.getAccessories().stream().map(AccessoryResponse::from).toList(), modification.getNote(), modification.getAuthor(), modification.getVideoUrl() diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningResponse.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningResponse.java new file mode 100644 index 0000000..3f6febf --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/TuningResponse.java @@ -0,0 +1,16 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import com.onixbyte.deltaforceguide.domain.entity.Tuning; + +public record TuningResponse( + String tuningName, + Double tuningValue +) { + public static TuningResponse from(Tuning tuning) { + return new TuningResponse( + tuning.getTuningName(), + tuning.getTuningValue() + ); + } +} + From 7fda77370e4f9a3ae8f8cf624650c307703e8510 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Thu, 23 Apr 2026 16:24:41 +0800 Subject: [PATCH 16/25] chore: update artefactVersion to 1.2.0 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b5a5b32..1235085 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -artefactVersion = 1.1.0 \ No newline at end of file +artefactVersion = 1.2.0 \ No newline at end of file From 70ae945cd2cd3e53499cfe17f463bd1f3c450958 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Thu, 14 May 2026 23:56:48 +0800 Subject: [PATCH 17/25] chore: add CLAUDE.md with coding standards and build commands Co-Authored-By: Claude Opus 4.7 --- CLAUDE.md | 109 ++++++++++++++++++ build.gradle | 37 ++++++ settings.gradle | 1 + .../domain/entity/FirearmTypeConverter.java | 20 ++++ 4 files changed, 167 insertions(+) create mode 100644 CLAUDE.md create mode 100644 build.gradle create mode 100644 settings.gradle create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java diff --git a/CLAUDE.md b/CLAUDE.md new file mode 100644 index 0000000..5767357 --- /dev/null +++ b/CLAUDE.md @@ -0,0 +1,109 @@ +# CLAUDE.md + +This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository. + +## Coding Standards + +- **Style**: Follow the Google Java Coding Style as the foundation. +- **Indentation**: Use 4 spaces — no tabs. +- **Line length**: Maximum 100 characters per line. +- **Comments**: All code comments must use British English spelling (e.g. "colour" not "color", "behaviour" not "behavior", "serialise" not "serialize", "analyse" not "analyze", "traveller" not "traveler"). + +## Build & Test Commands + +```bash +# Build the project (skip tests) +./gradlew build -x test + +# Run all tests +./gradlew test + +# Run a single test class +./gradlew test --tests "com.onixbyte.deltaforceguide.service.PasswordEncoderTest" + +# Run a specific test method +./gradlew test --tests "com.onixbyte.deltaforceguide.service.PasswordEncoderTest.generatePassword" + +# Build the full JAR +./gradlew bootJar +``` + +The project uses Gradle with Java 21 (Amazon Corretto). Tests use JUnit 5 with the Spring Boot test framework, H2 in-memory database for test runtime, and Spring Security test support. Tests require an active `dev` profile. + +## Code Architecture + +**Delta Force Guide Server** — A REST API backend for managing Delta Force game firearm builds/modifications. + +### Package structure + +``` +com.onixbyte.deltaforceguide +├── client/ # External service clients (TokenClient for JWT) +├── config/ # Spring beans: Security, CORS, Cache/Redis, Jackson, MyBatis, Spring Data +├── controller/ # REST controllers (Firearm, Modification, Tag, Auth) +├── domain/ +│ ├── converter/ # JPA attribute converters (FirearmTypeConverter) +│ ├── dto/ # Request/response records (FirearmRequest, ModificationResponse, etc.) +│ └── entity/ # JPA entities (Firearm, Modification, User, Accessory, Tuning) +├── enumeration/ # Enums (FirearmType) +├── exeption/ # BizException (custom runtime exception with HTTP status) +├── filter/ # TokenAuthenticationFilter (JWT auth via OncePerRequestFilter) +├── manager/ # Thin @Transactional wrappers around repositories +├── mapper/ # MyBatis mappers (configured but currently unused) +├── properties/ # @ConfigurationProperties records (Cors, Token, Cookie) +├── repository/ # Spring Data JPA repositories +├── security/ +│ ├── authentication/ # Custom UsernamePasswordAuthentication impl +│ └── provider/ # UsernamePasswordAuthenticationProvider +├── service/ # Business logic layer (FirearmService, ModificationService, AuthService, etc.) +├── shared/ # Constants and utility classes (CookieName, CredentialProvider, JacksonModules) +└── utils/ # Helpers (DateTimeUtil) +``` + +### Key design decisions + +- **JPA + native queries**: Most CRUD uses Spring Data JPA. Native queries (in `ModificationRepository`) handle JSONB tag filtering with Postgres `@>` operator. +- **Custom auth flow**: JWT tokens in httpOnly cookies (`AccessToken`). Spring Security with a custom `UsernamePasswordAuthenticationProvider` and `TokenAuthenticationFilter`. Tokens are auto-renewed within 5 min of expiry. +- **JSONB storage**: `Modification.tags` and `Modification.accessories` (including nested `Tuning` objects) are stored as JSONB columns using Hypersistence Utils `JsonType`. +- **Manager layer**: `UserManager` and `UserCredentialManager` sit between service and repository, adding `@Transactional` boundaries without mixing concerns. +- **DTOs as Java records**: All request/response objects are immutable records with static `from()` factory methods for entity→DTO conversion. +- **Flyway migrations**: SQL migrations in `src/main/resources/db/migration/` — V2 (init), V3 (bullet/damage fields), V4 (user), V5 (accessories JSONB column). + +### Data model + +- `firearm` table: id, name, type (int→FirearmType enum), level, calibre, fire_rate, armour_damage, body_damage, review +- `modification` table: id, firearm_id (FK→firearm), name, code, tags (jsonb), accessories (jsonb), note, author, video_url +- `app_user` table: id, username, email +- `user_credential` table: user_id, provider, credential (hashed) + +### API endpoints + +| Path | Methods | Auth | +|---|---|---| +| `/firearms` | GET, POST | GET public, POST requires auth | +| `/firearms/{id}` | GET, PUT, DELETE | GET public, PUT/DELETE requires auth | +| `/modifications` | GET, POST | GET public, POST requires auth | +| `/modifications/{id}` | GET, PUT, DELETE | GET public, PUT/DELETE requires auth | +| `/modifications/batch` | POST | Requires auth | +| `/modifications/batch-delete` | DELETE | Requires auth | +| `/tags` | GET | Public | +| `/auth/login` | POST | Public | +| `/auth/logout` | POST | Authenticated | + +### Commit convention + +Conventional commits: `feat:`, `chore:`, `fix:`. Messages are in English, present tense imperative style. + +### External dependencies + +- **DB**: PostgreSQL (via Flyway migrations), H2 in test +- **Cache**: Redis (via Spring Cache + RedisTemplate with GenericJackson2JsonRedisSerializer) +- **Auth**: java-jwt (auth0), BCrypt +- **Docs**: springdoc-openapi (Swagger UI) on dev profile +- **Onixbyte internal libs**: version-catalogue, tuple, common-toolbox, math-toolbox, identity-generator, captcha, regions +- **AWS**: S3 SDK + +### Profiles + +- `dev`: Enables Swagger UI, connects to dev DB/Redis at `dfguide.onixbyte.cn`. Config in `config/application-dev.yaml`. +- Default profile: Used for production, no Swagger, connects to production datasource. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..b1aeb5f --- /dev/null +++ b/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.13' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.onixbyte' +version = '0.0.1-SNAPSHOT' +description = 'delta-force-guide-server' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-cache' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-data-redis' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.16' + runtimeOnly 'org.postgresql:postgresql' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..3da6727 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'delta-force-guide-server' diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java new file mode 100644 index 0000000..03f7574 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java @@ -0,0 +1,20 @@ +package com.onixbyte.deltaforceguide.domain.entity; + +import com.onixbyte.deltaforceguide.enumeration.FirearmType; +import jakarta.persistence.AttributeConverter; +import jakarta.persistence.Converter; + +@Converter(autoApply = false) +public class FirearmTypeConverter implements AttributeConverter { + + @Override + public Integer convertToDatabaseColumn(FirearmType attribute) { + return attribute == null ? null : attribute.getCode(); + } + + @Override + public FirearmType convertToEntityAttribute(Integer dbData) { + return FirearmType.fromCode(dbData); + } +} + From 559ae349662874e84558d0d883a7084a2fc90222 Mon Sep 17 00:00:00 2001 From: zihluwang Date: Thu, 14 May 2026 23:58:25 +0800 Subject: [PATCH 18/25] chore: remove legacy Groovy Gradle files and relocated converter build.gradle and settings.gradle superseded by build.gradle.kts and settings.gradle.kts. FirearmTypeConverter moved to domain/converter/ package. Co-Authored-By: Claude Opus 4.7 --- build.gradle | 37 ------------------- settings.gradle | 1 - .../domain/entity/FirearmTypeConverter.java | 20 ---------- 3 files changed, 58 deletions(-) delete mode 100644 build.gradle delete mode 100644 settings.gradle delete mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java diff --git a/build.gradle b/build.gradle deleted file mode 100644 index b1aeb5f..0000000 --- a/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -plugins { - id 'java' - id 'org.springframework.boot' version '3.5.13' - id 'io.spring.dependency-management' version '1.1.7' -} - -group = 'com.onixbyte' -version = '0.0.1-SNAPSHOT' -description = 'delta-force-guide-server' - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -repositories { - mavenCentral() -} - -dependencies { - implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-data-redis' - implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.16' - runtimeOnly 'org.postgresql:postgresql' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.security:spring-security-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' -} - -tasks.named('test') { - useJUnitPlatform() -} diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 3da6727..0000000 --- a/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -rootProject.name = 'delta-force-guide-server' diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java b/src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java deleted file mode 100644 index 03f7574..0000000 --- a/src/main/java/com/onixbyte/deltaforceguide/domain/entity/FirearmTypeConverter.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.onixbyte.deltaforceguide.domain.entity; - -import com.onixbyte.deltaforceguide.enumeration.FirearmType; -import jakarta.persistence.AttributeConverter; -import jakarta.persistence.Converter; - -@Converter(autoApply = false) -public class FirearmTypeConverter implements AttributeConverter { - - @Override - public Integer convertToDatabaseColumn(FirearmType attribute) { - return attribute == null ? null : attribute.getCode(); - } - - @Override - public FirearmType convertToEntityAttribute(Integer dbData) { - return FirearmType.fromCode(dbData); - } -} - From 0ae23fa0cb62ff9a7828d3536b00dd5a8a21d2ef Mon Sep 17 00:00:00 2001 From: siujamo Date: Fri, 15 May 2026 10:41:46 +0800 Subject: [PATCH 19/25] chore: add Claude Code local files to .gitignore --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 329367c..0babb7f 100644 --- a/.gitignore +++ b/.gitignore @@ -143,6 +143,13 @@ test/ gradle-app.setting .gradletasknamecache +### Claude Code +.claude/settings.local.json +.claude/memory/ +.claude/plans/ +.claude/worktrees/ +.claude/scheduled_tasks.json + # Eclipse Gradle plugin generated files # Eclipse Core .project From 130d360556c66b9ca4a15a68716c59b83d0f387f Mon Sep 17 00:00:00 2001 From: siujamo Date: Fri, 15 May 2026 11:32:31 +0800 Subject: [PATCH 20/25] feat: add daily password endpoint with Redis caching --- CLAUDE.md | 2 +- .../config/SecurityConfig.java | 3 +- .../controller/DailyPasswordController.java | 27 +++++++ .../domain/dto/DailyPassword.java | 7 ++ .../domain/dto/DailyPasswordData.java | 14 ++++ .../domain/dto/DailyPasswordMetadata.java | 7 ++ .../domain/dto/DailyPasswordResponse.java | 9 +++ .../manager/DailyPasswordManager.java | 76 +++++++++++++++++++ .../service/DailyPasswordService.java | 19 +++++ 9 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/controller/DailyPasswordController.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPassword.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordData.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordMetadata.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordResponse.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/manager/DailyPasswordManager.java create mode 100644 src/main/java/com/onixbyte/deltaforceguide/service/DailyPasswordService.java diff --git a/CLAUDE.md b/CLAUDE.md index 5767357..479eb65 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -65,7 +65,7 @@ com.onixbyte.deltaforceguide - **JPA + native queries**: Most CRUD uses Spring Data JPA. Native queries (in `ModificationRepository`) handle JSONB tag filtering with Postgres `@>` operator. - **Custom auth flow**: JWT tokens in httpOnly cookies (`AccessToken`). Spring Security with a custom `UsernamePasswordAuthenticationProvider` and `TokenAuthenticationFilter`. Tokens are auto-renewed within 5 min of expiry. - **JSONB storage**: `Modification.tags` and `Modification.accessories` (including nested `Tuning` objects) are stored as JSONB columns using Hypersistence Utils `JsonType`. -- **Manager layer**: `UserManager` and `UserCredentialManager` sit between service and repository, adding `@Transactional` boundaries without mixing concerns. +- **Strict layering**: The call chain must follow `Controller → Service → Manager → Repository/Mapper`. Skipping layers (e.g. Controller calling Manager directly, Service calling Repository directly) is not permitted. Each layer has a distinct responsibility: Controller handles HTTP concerns, Service contains business logic, Manager manages `@Transactional` boundaries and data access coordination, Repository/Mapper handles raw data access. - **DTOs as Java records**: All request/response objects are immutable records with static `from()` factory methods for entity→DTO conversion. - **Flyway migrations**: SQL migrations in `src/main/resources/db/migration/` — V2 (init), V3 (bullet/damage fields), V4 (user), V5 (accessories JSONB column). diff --git a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java index f77a522..ad9be0e 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java +++ b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java @@ -57,7 +57,8 @@ public class SecurityConfig { ).permitAll() .requestMatchers(HttpMethod.GET, "/firearms", "/firearms/*", - "/modifications", "/modifications/*" + "/modifications", "/modifications/*", + "/daily-passwords", "/daily-passwords/*" ).permitAll() .anyRequest().authenticated() ) diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/DailyPasswordController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/DailyPasswordController.java new file mode 100644 index 0000000..f817f66 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/DailyPasswordController.java @@ -0,0 +1,27 @@ +package com.onixbyte.deltaforceguide.controller; + +import com.onixbyte.deltaforceguide.domain.dto.DailyPasswordResponse; +import com.onixbyte.deltaforceguide.service.DailyPasswordService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "每日密码", description = "获取每日密码信息") +@RestController +@RequestMapping("/daily-passwords") +public class DailyPasswordController { + + private final DailyPasswordService dailyPasswordService; + + public DailyPasswordController(DailyPasswordService dailyPasswordService) { + this.dailyPasswordService = dailyPasswordService; + } + + @Operation(description = "获取当日的每日密码数据，该数据将被缓存一天") + @GetMapping + public DailyPasswordResponse getDailyPassword() { + return dailyPasswordService.getDailyPassword(); + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPassword.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPassword.java new file mode 100644 index 0000000..2a381ad --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPassword.java @@ -0,0 +1,7 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +public record DailyPassword( + String mapName, + String password +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordData.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordData.java new file mode 100644 index 0000000..c685542 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordData.java @@ -0,0 +1,14 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +import java.time.LocalDateTime; +import java.util.List; + +public record DailyPasswordData( + String updateDate, + Integer totalCount, + List passwords, + String source, + LocalDateTime lastUpdated, + Long timestamp +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordMetadata.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordMetadata.java new file mode 100644 index 0000000..a2fa36b --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordMetadata.java @@ -0,0 +1,7 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +public record DailyPasswordMetadata( + String version, + String author +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordResponse.java b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordResponse.java new file mode 100644 index 0000000..7d29a27 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/domain/dto/DailyPasswordResponse.java @@ -0,0 +1,9 @@ +package com.onixbyte.deltaforceguide.domain.dto; + +public record DailyPasswordResponse( + String status, + String message, + DailyPasswordData data, + DailyPasswordMetadata metadata +) { +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/manager/DailyPasswordManager.java b/src/main/java/com/onixbyte/deltaforceguide/manager/DailyPasswordManager.java new file mode 100644 index 0000000..3ec28f9 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/manager/DailyPasswordManager.java @@ -0,0 +1,76 @@ +package com.onixbyte.deltaforceguide.manager; + +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; +import com.onixbyte.deltaforceguide.domain.dto.DailyPasswordResponse; +import com.onixbyte.deltaforceguide.exeption.BizException; +import com.onixbyte.deltaforceguide.shared.JacksonModules; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestClient; + +import java.time.Duration; +import java.time.LocalDate; +import java.util.Objects; + +@Component +public class DailyPasswordManager { + + private static final String CACHE_KEY_PREFIX = "daily-password:"; + + private final RestClient restClient; + private final RedisTemplate redisTemplate; + + @Autowired + public DailyPasswordManager( + RestClient.Builder restClientBuilder, + RedisTemplate redisTemplate + ) { + var snakeCaseMapper = new ObjectMapper(); + snakeCaseMapper.setPropertyNamingStrategy( + PropertyNamingStrategies.SnakeCaseStrategy.INSTANCE); + snakeCaseMapper.configure( + DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + snakeCaseMapper.registerModule(JacksonModules.DATE_TIME_MODULE); + + this.restClient = restClientBuilder + .baseUrl("https://tmini.net/api") + .messageConverters(converters -> { + converters.removeIf( + MappingJackson2HttpMessageConverter.class::isInstance); + converters.add( + new MappingJackson2HttpMessageConverter(snakeCaseMapper)); + }) + .build(); + this.redisTemplate = redisTemplate; + } + + public DailyPasswordResponse getDailyPassword() { + var key = CACHE_KEY_PREFIX + LocalDate.now(); + + var cached = redisTemplate.opsForValue().get(key); + if (cached != null) { + return (DailyPasswordResponse) cached; + } + + var response = restClient.get() + .uri((uriBuilder) -> uriBuilder + .path("/sjzmm") + .queryParam("ckey", "") + .queryParam("type", "json") + .build()) + .retrieve() + .body(DailyPasswordResponse.class); + + if (Objects.isNull(response)) { + throw new BizException(HttpStatus.INTERNAL_SERVER_ERROR, "暂无每日密码数据。"); + } + + redisTemplate.opsForValue().set(key, response, Duration.ofDays(1L)); + return response; + } +} diff --git a/src/main/java/com/onixbyte/deltaforceguide/service/DailyPasswordService.java b/src/main/java/com/onixbyte/deltaforceguide/service/DailyPasswordService.java new file mode 100644 index 0000000..3ad3d4e --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/service/DailyPasswordService.java @@ -0,0 +1,19 @@ +package com.onixbyte.deltaforceguide.service; + +import com.onixbyte.deltaforceguide.domain.dto.DailyPasswordResponse; +import com.onixbyte.deltaforceguide.manager.DailyPasswordManager; +import org.springframework.stereotype.Service; + +@Service +public class DailyPasswordService { + + private final DailyPasswordManager dailyPasswordManager; + + public DailyPasswordService(DailyPasswordManager dailyPasswordManager) { + this.dailyPasswordManager = dailyPasswordManager; + } + + public DailyPasswordResponse getDailyPassword() { + return dailyPasswordManager.getDailyPassword(); + } +} From 6d869d514510b1086a5092a863931ab4baec6d3e Mon Sep 17 00:00:00 2001 From: siujamo Date: Fri, 15 May 2026 11:35:26 +0800 Subject: [PATCH 21/25] docs: improve API endpoints table formatting in CLAUDE.md --- CLAUDE.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 479eb65..3e567dd 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -78,17 +78,17 @@ com.onixbyte.deltaforceguide ### API endpoints -| Path | Methods | Auth | -|---|---|---| -| `/firearms` | GET, POST | GET public, POST requires auth | -| `/firearms/{id}` | GET, PUT, DELETE | GET public, PUT/DELETE requires auth | -| `/modifications` | GET, POST | GET public, POST requires auth | -| `/modifications/{id}` | GET, PUT, DELETE | GET public, PUT/DELETE requires auth | -| `/modifications/batch` | POST | Requires auth | -| `/modifications/batch-delete` | DELETE | Requires auth | -| `/tags` | GET | Public | -| `/auth/login` | POST | Public | -| `/auth/logout` | POST | Authenticated | +| Path | Methods | Auth | +|-------------------------------|------------------|--------------------------------------| +| `/firearms` | GET, POST | GET public, POST requires auth | +| `/firearms/{id}` | GET, PUT, DELETE | GET public, PUT/DELETE requires auth | +| `/modifications` | GET, POST | GET public, POST requires auth | +| `/modifications/{id}` | GET, PUT, DELETE | GET public, PUT/DELETE requires auth | +| `/modifications/batch` | POST | Requires auth | +| `/modifications/batch-delete` | DELETE | Requires auth | +| `/tags` | GET | Public | +| `/auth/login` | POST | Public | +| `/auth/logout` | POST | Authenticated | ### Commit convention From 20d2edc9b132c1e35d6983aaa29acadb1b379986 Mon Sep 17 00:00:00 2001 From: siujamo Date: Fri, 15 May 2026 11:41:14 +0800 Subject: [PATCH 22/25] feat: use @RequiresAuth annotation instead of manual path listing in security config --- .../config/SecurityConfig.java | 20 +------------------ .../controller/AuthController.java | 2 ++ .../controller/FirearmController.java | 4 ++++ .../controller/ModificationController.java | 6 ++++++ .../security/annotation/RequiresAuth.java | 14 +++++++++++++ 5 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/onixbyte/deltaforceguide/security/annotation/RequiresAuth.java diff --git a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java index ad9be0e..8e8cc50 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java +++ b/src/main/java/com/onixbyte/deltaforceguide/config/SecurityConfig.java @@ -10,7 +10,6 @@ import com.onixbyte.deltaforceguide.security.provider.UsernamePasswordAuthentica import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.HttpMethod; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.ProviderManager; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; @@ -43,24 +42,7 @@ public class SecurityConfig { .sessionManagement((customiser) -> customiser .sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .authorizeHttpRequests((customiser) -> customiser - .requestMatchers("/error", "/error/**").permitAll() - .requestMatchers("/captcha", "/captcha/**").permitAll() - .requestMatchers("/auth/logout").authenticated() - .requestMatchers("/auth/**").permitAll() - .requestMatchers( - "/swagger-ui.html", - "/swagger-ui", - "/swagger-ui/**", - "/v3/api-docs", - "/v3/api-docs.yaml", - "/v3/api-docs/swagger-config" - ).permitAll() - .requestMatchers(HttpMethod.GET, - "/firearms", "/firearms/*", - "/modifications", "/modifications/*", - "/daily-passwords", "/daily-passwords/*" - ).permitAll() - .anyRequest().authenticated() + .anyRequest().permitAll() ) .addFilterAfter(tokenAuthenticationFilter, ExceptionTranslationFilter.class) .build(); diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java index 6d7e4e5..86229aa 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/AuthController.java @@ -3,6 +3,7 @@ package com.onixbyte.deltaforceguide.controller; import com.onixbyte.deltaforceguide.domain.dto.LoginRequest; import com.onixbyte.deltaforceguide.domain.dto.UserResponse; import com.onixbyte.deltaforceguide.client.TokenClient; +import com.onixbyte.deltaforceguide.security.annotation.RequiresAuth; import com.onixbyte.deltaforceguide.service.AuthService; import com.onixbyte.deltaforceguide.service.CookieService; import com.onixbyte.deltaforceguide.shared.CookieName; @@ -45,6 +46,7 @@ public class AuthController { .body(UserResponse.from(user)); } + @RequiresAuth @Operation(description = "退出登录") @PostMapping("/logout") public ResponseEntity logout() { diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java index 817291e..7d95b69 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/FirearmController.java @@ -4,6 +4,7 @@ import com.onixbyte.deltaforceguide.domain.dto.FirearmRequest; import com.onixbyte.deltaforceguide.domain.dto.FirearmResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; import com.onixbyte.deltaforceguide.enumeration.FirearmType; +import com.onixbyte.deltaforceguide.security.annotation.RequiresAuth; import com.onixbyte.deltaforceguide.service.FirearmService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -44,17 +45,20 @@ public class FirearmController { return firearmService.queryById(id); } + @RequiresAuth @PostMapping public FirearmResponse addFirearm(@Validated @RequestBody FirearmRequest request) { return firearmService.addFirearm(request); } + @RequiresAuth @Operation(description = "更新指定武器的数据") @PutMapping("/{id}") public FirearmResponse updateFirearm(@PathVariable Long id, @Validated @RequestBody FirearmRequest request) { return firearmService.updateFirearm(id, request); } + @RequiresAuth @Operation(description = "删除指定武器的数据") @DeleteMapping("/{id}") public void deleteFirearm(@PathVariable Long id) { diff --git a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java index 1d3f90c..b7c7a8d 100644 --- a/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java +++ b/src/main/java/com/onixbyte/deltaforceguide/controller/ModificationController.java @@ -4,6 +4,7 @@ import com.onixbyte.deltaforceguide.domain.dto.ModificationBatchCreateRequest; import com.onixbyte.deltaforceguide.domain.dto.ModificationRequest; import com.onixbyte.deltaforceguide.domain.dto.ModificationResponse; import com.onixbyte.deltaforceguide.domain.dto.PageResponse; +import com.onixbyte.deltaforceguide.security.annotation.RequiresAuth; import com.onixbyte.deltaforceguide.service.ModificationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -57,30 +58,35 @@ public class ModificationController { return modificationService.queryById(id); } + @RequiresAuth @Operation(description = "创建改装") @PostMapping public ModificationResponse create(@Valid @RequestBody ModificationRequest request) { return modificationService.create(request); } + @RequiresAuth @Operation(description = "批量创建改装") @PostMapping("/batch") public List batchCreate(@Valid @RequestBody ModificationBatchCreateRequest request) { return modificationService.batchCreate(request.modifications()); } + @RequiresAuth @Operation(description = "修改指定改装") @PutMapping("/{id}") public ModificationResponse update(@PathVariable Long id, @Valid @RequestBody ModificationRequest request) { return modificationService.update(id, request); } + @RequiresAuth @Operation(description = "删除指定改装") @DeleteMapping("/{id}") public void delete(@PathVariable Long id) { modificationService.delete(id); } + @RequiresAuth @Operation(description = "批量删除改装") @DeleteMapping("/batch-delete") @Validated diff --git a/src/main/java/com/onixbyte/deltaforceguide/security/annotation/RequiresAuth.java b/src/main/java/com/onixbyte/deltaforceguide/security/annotation/RequiresAuth.java new file mode 100644 index 0000000..f022be3 --- /dev/null +++ b/src/main/java/com/onixbyte/deltaforceguide/security/annotation/RequiresAuth.java @@ -0,0 +1,14 @@ +package com.onixbyte.deltaforceguide.security.annotation; + +import org.springframework.security.access.prepost.PreAuthorize; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.METHOD, ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +@PreAuthorize("isAuthenticated()") +public @interface RequiresAuth { +} From 24b7913908ea1c68fb19247131430f65604b0d9e Mon Sep 17 00:00:00 2001 From: siujamo Date: Mon, 18 May 2026 17:07:34 +0800 Subject: [PATCH 23/25] chore: add GitLab CI pipeline with build, container registry push, and deploy stages --- .gitlab-ci.yml | 157 +++++++++++++++++++++++++++++++++++++++++++++++++ Dockerfile.ci | 7 +++ 2 files changed, 164 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100644 Dockerfile.ci diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..6994f62 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,157 @@ +stages: + - package + - build-image + - push + - deploy + +variables: + # ---------- Gradle ---------- + GRADLE_IMAGE: gradle:8.14.4-jdk21 + GRADLE_USER_HOME: ${CI_PROJECT_DIR}/.gradle + + # ---------- Docker ---------- + DOCKER_IMAGE: docker:27.5.1 + DOCKER_SERVICE: docker:27.5.1-dind + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" + + # ---------- Application ---------- + APP_NAME: delta-force-guide-server + + # ---------- Image tags ---------- + IMAGE_TAG: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA} + LATEST_TAG: ${CI_REGISTRY_IMAGE}:latest + + # ---------- CI Dockerfile ---------- + CI_DOCKERFILE: Dockerfile.ci + +cache: + key: ${CI_COMMIT_REF_SLUG} + paths: + - .gradle/wrapper + - .gradle/caches + policy: pull-push + +# ==================================================================== +# Reusable template for Docker jobs +# ==================================================================== +.docker: + image: ${DOCKER_IMAGE} + services: + - name: ${DOCKER_SERVICE} + command: ["--tls=false"] + variables: + DOCKER_HOST: tcp://docker:2375 + DOCKER_TLS_CERTDIR: "" + +# Trigger the pipeline for MRs, the default branch, and tags +workflow: + rules: + - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_COMMIT_TAG' + +# ==================================================================== +# Stage 1 — Package: build the JAR with Gradle +# ==================================================================== +package: + stage: package + image: ${GRADLE_IMAGE} + script: + - ./gradlew build + artifacts: + name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}" + paths: + - build/libs/*.jar + expire_in: 1 hour + +# ==================================================================== +# Stage 2 — Build Docker image using the pre-built JAR artifact +# ==================================================================== +build-image: + stage: build-image + extends: .docker + script: + # Resolve the actual JAR path + - JAR_FILE=$(ls build/libs/delta-force-guide-server-*.jar | head -1) + - echo "Packaging JAR: ${JAR_FILE}" + + # Build image with the CI-specific single-stage Dockerfile + - | + docker build \ + --build-arg JAR_FILE="${JAR_FILE}" \ + -f ${CI_DOCKERFILE} \ + -t ${IMAGE_TAG} \ + -t ${LATEST_TAG} \ + . + + # Save the image as a CI artefact for the next stage + - docker save ${IMAGE_TAG} ${LATEST_TAG} > image.tar + artifacts: + paths: + - image.tar + expire_in: 1 hour + needs: + - package + +# ==================================================================== +# Stage 3 — Push image to GitLab Container Registry +# ==================================================================== +push: + stage: push + extends: .docker + script: + - docker load < image.tar + - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} + - docker push ${IMAGE_TAG} + - docker push ${LATEST_TAG} + needs: + - build-image + rules: + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: '$CI_COMMIT_TAG' + +# ==================================================================== +# Stage 4 — Deploy on the target server via SSH +# ==================================================================== +deploy: + stage: deploy + image: alpine:latest + before_script: + - apk add --no-cache openssh-client + - eval "$(ssh-agent -s)" + - echo "${DEPLOY_SSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add - + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + script: + - | + ssh -o StrictHostKeyChecking=no ${DEPLOY_USER}@${DEPLOY_HOST} " + set -e + + echo '=== Pulling image ===' + echo ${CI_REGISTRY_PASSWORD} | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY} + docker pull ${IMAGE_TAG} + + echo '=== Stopping old container ===' + docker stop ${APP_NAME} || true + docker rm ${APP_NAME} || true + + echo '=== Starting new container ===' + docker run -d \ + --name ${APP_NAME} \ + --restart unless-stopped \ + -p ${DEPLOY_PORT:-8080}:8080 \ + ${IMAGE_TAG} + + echo '=== Cleaning up old images ===' + docker image prune -f + + echo '=== Deployment complete ===' + " + needs: + - push + environment: + name: production + url: http://${DEPLOY_HOST}:${DEPLOY_PORT:-8080} + rules: + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' diff --git a/Dockerfile.ci b/Dockerfile.ci new file mode 100644 index 0000000..5b0e97c --- /dev/null +++ b/Dockerfile.ci @@ -0,0 +1,7 @@ +FROM amazoncorretto:21-alpine +WORKDIR /app + +ARG JAR_FILE +COPY ${JAR_FILE} app.jar + +ENTRYPOINT ["java", "-jar", "app.jar"] From b94a09691df5590c3445dbeed6fd80a81b19f722 Mon Sep 17 00:00:00 2001 From: siujamo Date: Tue, 19 May 2026 10:38:11 +0800 Subject: [PATCH 24/25] chore: add GitHub Actions workflow for release-based build and deploy --- .github/workflows/build-and-deploy.yml | 127 +++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 .github/workflows/build-and-deploy.yml diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml new file mode 100644 index 0000000..5e09721 --- /dev/null +++ b/.github/workflows/build-and-deploy.yml @@ -0,0 +1,127 @@ +name: Build and Deploy + +on: + release: + types: [published] + +env: + APP_NAME: delta-force-guide-server + IMAGE_REGISTRY: ${{ vars.GITLAB_REGISTRY }} + IMAGE_NAME: ${{ vars.GITLAB_IMAGE_NAME }} + +jobs: + # ================================================================ + # Job 1 — Package: build the JAR with Gradle + # ================================================================ + package: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 21 (Corretto) + uses: actions/setup-java@v4 + with: + java-version: 21 + distribution: corretto + cache: gradle + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build with Gradle + run: ./gradlew build + + - name: Upload JAR artifact + uses: actions/upload-artifact@v4 + with: + name: app-jar + path: build/libs/delta-force-guide-server-*.jar + retention-days: 1 + + # ================================================================ + # Job 2 — Build & push Docker image to GitHub Container Registry + # ================================================================ + build-and-push: + needs: package + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - uses: actions/checkout@v4 + + - name: Download JAR artifact + uses: actions/download-artifact@v4 + with: + name: app-jar + path: build/libs + + - name: Resolve JAR file path + id: jar + run: echo "file=$(ls build/libs/delta-force-guide-server-*.jar | head -1)" >> "$GITHUB_OUTPUT" + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to GitLab Container Registry + uses: docker/login-action@v3 + with: + registry: ${{ env.IMAGE_REGISTRY }} + username: ${{ vars.GITLAB_REGISTRY_USER }} + password: ${{ secrets.GITLAB_REGISTRY_PASSWORD }} + + - name: Generate image tags + id: meta + run: | + echo "version=${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }}" >> "$GITHUB_OUTPUT" + echo "latest=${{ env.IMAGE_NAME }}:latest" >> "$GITHUB_OUTPUT" + + - name: Build and push Docker image + uses: docker/build-push-action@v6 + with: + context: . + file: Dockerfile.ci + build-args: JAR_FILE=${{ steps.jar.outputs.file }} + push: true + tags: | + ${{ steps.meta.outputs.version }} + ${{ steps.meta.outputs.latest }} + cache-from: type=gha + cache-to: type=gha,mode=max + + # ================================================================ + # Job 3 — Deploy on the target server via SSH + # ================================================================ + deploy: + needs: build-and-push + runs-on: ubuntu-latest + steps: + - name: Deploy via SSH + uses: appleboy/ssh-action@v1.2.0 + with: + host: ${{ secrets.DEPLOY_HOST }} + username: ${{ secrets.DEPLOY_USER }} + key: ${{ secrets.DEPLOY_SSH_KEY }} + script: | + set -e + + echo '=== Pulling image ===' + echo '${{ secrets.GITLAB_REGISTRY_PASSWORD }}' | docker login ${{ env.IMAGE_REGISTRY }} \ + -u ${{ vars.GITLAB_REGISTRY_USER }} --password-stdin + docker pull ${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }} + + echo '=== Stopping old container ===' + docker stop ${{ env.APP_NAME }} || true + docker rm ${{ env.APP_NAME }} || true + + echo '=== Starting new container ===' + docker run -d \ + --name ${{ env.APP_NAME }} \ + --restart unless-stopped \ + -p ${DEPLOY_PORT:-8080}:8080 \ + ${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }} + + echo '=== Cleaning up old images ===' + docker image prune -f + + echo '=== Deployment complete ===' From 491be4f4dd765f47ad95023d98d9c8be539b2bc9 Mon Sep 17 00:00:00 2001 From: siujamo Date: Mon, 25 May 2026 09:05:13 +0800 Subject: [PATCH 25/25] chore: simplify GitLab CI to release-only workflow with tag-triggered pipeline MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace the full CI pipeline (build → image → push → SSH deploy on every branch) with a focused release workflow: build JAR on tag push, package Docker image tagged with the release tag, and push to registry.onixbyte.cn. --- .gitlab-ci.yml | 191 +++++++++++++------------------------------------ 1 file changed, 48 insertions(+), 143 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6994f62..35ffefa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,157 +1,62 @@ +variables: + REGISTRY: registry.onixbyte.cn + IMAGE_NAME: delta-force-guide + GRADLE_OPTS: -Dorg.gradle.daemon=false + stages: + - build - package - - build-image - - push - deploy -variables: - # ---------- Gradle ---------- - GRADLE_IMAGE: gradle:8.14.4-jdk21 - GRADLE_USER_HOME: ${CI_PROJECT_DIR}/.gradle - - # ---------- Docker ---------- - DOCKER_IMAGE: docker:27.5.1 - DOCKER_SERVICE: docker:27.5.1-dind - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - - # ---------- Application ---------- - APP_NAME: delta-force-guide-server - - # ---------- Image tags ---------- - IMAGE_TAG: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA} - LATEST_TAG: ${CI_REGISTRY_IMAGE}:latest - - # ---------- CI Dockerfile ---------- - CI_DOCKERFILE: Dockerfile.ci - -cache: - key: ${CI_COMMIT_REF_SLUG} - paths: - - .gradle/wrapper - - .gradle/caches - policy: pull-push - -# ==================================================================== -# Reusable template for Docker jobs -# ==================================================================== -.docker: - image: ${DOCKER_IMAGE} - services: - - name: ${DOCKER_SERVICE} - command: ["--tls=false"] - variables: - DOCKER_HOST: tcp://docker:2375 - DOCKER_TLS_CERTDIR: "" - -# Trigger the pipeline for MRs, the default branch, and tags -workflow: - rules: - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - if: '$CI_COMMIT_TAG' - -# ==================================================================== -# Stage 1 — Package: build the JAR with Gradle -# ==================================================================== -package: - stage: package - image: ${GRADLE_IMAGE} +build: + stage: build + image: amazoncorretto:21-alpine + cache: + key: gradle + paths: + - .gradle/wrapper + - .gradle/caches + before_script: + - chmod +x gradlew script: - - ./gradlew build + - ./gradlew bootJar -x test artifacts: - name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}" paths: - build/libs/*.jar - expire_in: 1 hour - -# ==================================================================== -# Stage 2 — Build Docker image using the pre-built JAR artifact -# ==================================================================== -build-image: - stage: build-image - extends: .docker - script: - # Resolve the actual JAR path - - JAR_FILE=$(ls build/libs/delta-force-guide-server-*.jar | head -1) - - echo "Packaging JAR: ${JAR_FILE}" - - # Build image with the CI-specific single-stage Dockerfile - - | - docker build \ - --build-arg JAR_FILE="${JAR_FILE}" \ - -f ${CI_DOCKERFILE} \ - -t ${IMAGE_TAG} \ - -t ${LATEST_TAG} \ - . - - # Save the image as a CI artefact for the next stage - - docker save ${IMAGE_TAG} ${LATEST_TAG} > image.tar - artifacts: - paths: - - image.tar - expire_in: 1 hour - needs: - - package - -# ==================================================================== -# Stage 3 — Push image to GitLab Container Registry -# ==================================================================== -push: - stage: push - extends: .docker - script: - - docker load < image.tar - - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} - - docker push ${IMAGE_TAG} - - docker push ${LATEST_TAG} - needs: - - build-image + expire_in: 30 min rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - - if: '$CI_COMMIT_TAG' + - if: $CI_COMMIT_TAG + +package: + stage: package + image: docker:27 + services: + - docker:27-dind + needs: + - build + script: + - JAR_FILE=$(find build/libs -name '*.jar' | head -1) + - echo "Building Docker image for tag $CI_COMMIT_TAG with JAR $JAR_FILE" + - docker build + -f Dockerfile.ci + --build-arg JAR_FILE="$JAR_FILE" + -t "$REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG" + . + - docker tag "$REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG" "$REGISTRY/$IMAGE_NAME:latest" + rules: + - if: $CI_COMMIT_TAG -# ==================================================================== -# Stage 4 — Deploy on the target server via SSH -# ==================================================================== deploy: stage: deploy - image: alpine:latest - before_script: - - apk add --no-cache openssh-client - - eval "$(ssh-agent -s)" - - echo "${DEPLOY_SSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - script: - - | - ssh -o StrictHostKeyChecking=no ${DEPLOY_USER}@${DEPLOY_HOST} " - set -e - - echo '=== Pulling image ===' - echo ${CI_REGISTRY_PASSWORD} | docker login -u ${CI_REGISTRY_USER} --password-stdin ${CI_REGISTRY} - docker pull ${IMAGE_TAG} - - echo '=== Stopping old container ===' - docker stop ${APP_NAME} || true - docker rm ${APP_NAME} || true - - echo '=== Starting new container ===' - docker run -d \ - --name ${APP_NAME} \ - --restart unless-stopped \ - -p ${DEPLOY_PORT:-8080}:8080 \ - ${IMAGE_TAG} - - echo '=== Cleaning up old images ===' - docker image prune -f - - echo '=== Deployment complete ===' - " + image: docker:27 + services: + - docker:27-dind needs: - - push - environment: - name: production - url: http://${DEPLOY_HOST}:${DEPLOY_PORT:-8080} + - package + script: + - echo "Pushing image $REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG" + - docker login "$REGISTRY" -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" + - docker push "$REGISTRY/$IMAGE_NAME:$CI_COMMIT_TAG" + - docker push "$REGISTRY/$IMAGE_NAME:latest" rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - if: $CI_COMMIT_TAG