Merge pull request #253 from EAT-SSU/develop

[Release] v2.0.8 릴리즈

Author: yongjun0511

.github/workflows/deploy.yml

@@ -83,6 +83,9 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/eatssu-prod
             sudo docker run -d -p 9000:9000 \
+            --log-driver=json-file \
+            --log-opt max-size=20m \
+            --log-opt max-file=5 \
             -e EATSSU_DB_URL_PROD="${{ secrets.EATSSU_DB_URL_PROD }}" \
             -e EATSSU_DB_USERNAME="${{ secrets.EATSSU_DB_USERNAME }}" \
             -e EATSSU_DB_PASSWORD="${{ secrets.EATSSU_DB_PASSWORD }}" \
@@ -107,6 +110,9 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/eatssu-dev
             sudo docker run -d -p 9000:9000 \
+            --log-driver=json-file \
+            --log-opt max-size=20m \
+            --log-opt max-file=5 \
             -e EATSSU_DB_URL_DEV="${{ secrets.EATSSU_DB_URL_DEV }}" \
             -e EATSSU_DB_USERNAME="${{ secrets.EATSSU_DB_USERNAME }}" \
             -e EATSSU_DB_PASSWORD="${{ secrets.EATSSU_DB_PASSWORD }}" \

.gitignore

@@ -45,4 +45,8 @@ out/
 ### env file ###
 .env
 
-/src/main/resources/application-local.yml
+/src/main/resources/application-local.yml
+
+### DS File ###
+.DS_Store
+*/.DS_Store

Dockerfile

@@ -22,4 +22,4 @@ COPY --from=builder /home/gradle/project/build/libs/*.jar app.jar
 EXPOSE 9000
 
 # 애플리케이션 실행
-ENTRYPOINT ["java", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

build.gradle

@@ -80,6 +80,7 @@ def generated = 'src/main/generated'
 
 tasks.withType(JavaCompile) {
     options.getGeneratedSourceOutputDirectory().set(file(generated))
+    options.compilerArgs += ['-parameters']
 }
 
 sourceSets {
@@ -88,4 +89,4 @@ sourceSets {
 
 clean {
     delete file('src/main/generated')
-}
+}

src/main/java/ssu/eatssu/domain/auth/dto/AppleLoginRequest.java

@@ -1,9 +1,11 @@
 package ssu.eatssu.domain.auth.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "애플 로그인 및 회원가입")
 public record AppleLoginRequest(
+        @LogMask
         @Schema(description = "identityToken", example = "eyJraWQiOiJXNldjT0tCIiwiYWxnIjoi...")
         String identityToken
 ) {

src/main/java/ssu/eatssu/domain/auth/dto/KakaoLoginRequest.java

@@ -3,14 +3,17 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "카카오 로그인 및 회원가입")
 public record KakaoLoginRequest(
+        @LogMask
         @NotBlank(message = "이메일을 입력해주세요.")
         @Email(message = "올바른 이메일 주소를 입력해주세요.")
         @Schema(description = "이메일", example = "test@email.com")
         String email,
 
+        @LogMask
         @Schema(description = "providerId", example = "10378247832195")
         String providerId
 ) {

src/main/java/ssu/eatssu/domain/auth/dto/ValidRequest.java

@@ -2,9 +2,11 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "유효한 토큰 확인")
 public record ValidRequest(
+        @LogMask
         @NotBlank(message = "토큰을 입력해주세요")
         @Schema(description = "토큰", example = "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ7XCJpZFwiOjcsXCJlbWFpbFwiOlwidGVzdEBlbWFpbC5jb21cIixcInJvbGVcIjpcIlJPTEVfVVNFUlwifSIsImF1dGgiOiJST0xFX1VTRVIiLCJleHAiOjE3NDQzNzQ0MjB9.mhIWYX_Vj3xW1eXuVflbzpH6vLTcC9b1twbIcqovVjDVnS7tjegu3nQHGXUsUa_WG2DIAtJMFZT_Q1XcVq1jPw")
         String token

src/main/java/ssu/eatssu/domain/auth/infrastructure/SecurityConfig.java

@@ -14,7 +14,6 @@
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import ssu.eatssu.domain.auth.security.JwtAuthenticationFilter;
 import ssu.eatssu.domain.auth.security.JwtTokenProvider;
-import ssu.eatssu.domain.slack.service.SlackErrorNotifier;
 import ssu.eatssu.global.handler.JwtAccessDeniedHandler;
 import ssu.eatssu.global.handler.JwtAuthenticationEntryPoint;
 

src/main/java/ssu/eatssu/domain/auth/security/JwtAuthenticationFilter.java

@@ -15,8 +15,6 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.filter.GenericFilterBean;
 
-
-
 import java.io.IOException;
 import java.util.List;
 

src/main/java/ssu/eatssu/domain/inquiry/dto/CreateInquiryRequest.java

@@ -3,15 +3,18 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import ssu.eatssu.global.log.annotation.LogMask;
 
 @Schema(title = "문의 남기기")
 @NoArgsConstructor
 @Getter
 public class CreateInquiryRequest {
 
     @Schema(description = "답장 받을 이메일", example = "sandy1017@gmail.com")
+    @LogMask
     private String email;
 
     @Schema(description = "문의 내용", example = "어쩌고 저쩌고 문의 남깁니다")
+    @LogMask
     private String content;
 }