Develop

.gitignore

@@ -53,14 +53,8 @@ src/main/resources/application-secret.properties
 src/main/resources/application-prod.properties
 *.secret.properties
 
-keys
-keys/**
-
 src/main/resources/keys/private.pem
 **/private.pem
 
-gateway-config
-init
-
 src/main/resources/firebase/firebase-adminsdk.json
 docker-compose.yml

Dockerfile

@@ -1,20 +1,54 @@
-# Debian/Ubuntu 계열 JRE (amd64/arm64 모두 제공)
-FROM eclipse-temurin:17-jre-jammy
+############################
+# 1) Build stage (JDK)
+############################
+FROM eclipse-temurin:17-jdk-jammy AS build
+WORKDIR /workspace
 
-# spring 사용자/그룹 생성 (Debian 표준 명령)
+# Gradle wrapper & 설정 먼저 복사(캐시 잘 쓰기 위함)
+COPY gradlew gradle/ /workspace/
+COPY build.gradle* settings.gradle* /workspace/
+RUN chmod +x gradlew
+
+# 의존성 워밍업 (빌드캐시)
+RUN --mount=type=cache,target=/root/.gradle \
+    ./gradlew --no-daemon help || true
+
+# 나머지 소스 복사 후 빌드
+COPY . /workspace
+RUN --mount=type=cache,target=/root/.gradle \
+    ./gradlew --no-daemon clean bootJar -x test
+
+# 산출물 꺼내두기
+RUN JAR="$(ls build/libs/*.jar | head -n1)" && \
+    install -D "$JAR" /out/app.jar
+
+# ✅ 가드: user 레포의 메인 클래스가 JAR에 반드시 존재해야 함
+ARG MAIN_CLASS_PATH=com/tekcit/festival/FestivalServiceApplication.class
+RUN jar tf /out/app.jar | grep -q "$MAIN_CLASS_PATH" \
+ || (echo "ERROR: missing $MAIN_CLASS_PATH in built JAR; check project structure" >&2; exit 1)
+
+
+############################
+# 2) Runtime stage (JRE)
+############################
+FROM eclipse-temurin:17-jre-jammy AS runtime
+
+# 비루트 사용자 생성
 RUN groupadd -r spring \
  && useradd -r -g spring -d /home/spring -s /usr/sbin/nologin spring \
- && mkdir -p /app /home/spring
+ && mkdir -p /app /home/spring /etc/keys /etc/firebase \
+ && chown -R spring:spring /app /home/spring /etc/keys /etc/firebase
 
 WORKDIR /app
 
-# 빌드 산출물 복사 (권한도 함께 설정)
-ARG JAR_FILE=build/libs/*.jar
-COPY --chown=spring:spring ${JAR_FILE} /app/app.jar
+# 빌드 산출물 복사
+COPY --from=build --chown=spring:spring /out/app.jar /app/app.jar
 
-# 비루트 실행
 USER spring
-
 EXPOSE 8080
+
+# 컨테이너 메모리 친화 옵션
 ENV JAVA_OPTS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=75"
+
+# 실행
 ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar /app/app.jar"]

build.gradle

@@ -33,6 +33,9 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-aop' // Slf4j 로그용 추가
 	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 
+	// prometheus
+	implementation 'io.micrometer:micrometer-registry-prometheus'
+
 	// MariaDB
 	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
 

src/main/java/com/tekcit/festival/FestivalServiceApplication.java

@@ -6,14 +6,14 @@
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
+import java.util.UUID;
+
 @SpringBootApplication
 @Slf4j
 @EnableJpaAuditing
 @EnableScheduling
 public class FestivalServiceApplication {
-
 	public static void main(String[] args) {
 		SpringApplication.run(FestivalServiceApplication.class, args);
 	}
-
 }

src/main/java/com/tekcit/festival/config/security/AuthDetails.java

@@ -0,0 +1,16 @@
+package com.tekcit.festival.config.security;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.springframework.security.web.authentication.WebAuthenticationDetails;
+
+public class AuthDetails extends WebAuthenticationDetails {
+    private final String userName;
+
+    public AuthDetails(HttpServletRequest request, String userName) {
+        super(request);
+        this.userName = userName;
+    }
+    public String getUserName() {
+        return userName;
+    }
+}

src/main/java/com/tekcit/festival/config/security/HeaderAuthenticationFilter.java

@@ -4,36 +4,19 @@
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.config.Customizer;
-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.http.SessionCreationPolicy;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
-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.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 // --- HeaderAuthenticationFilter를 SecurityConfig 내부에 정의하여 관리합니다. ---
@@ -55,7 +38,14 @@ protected void doFilterInternal(
 
         final String userIdHeader = trimToNull(request.getHeader("X-User-Id"));
         final String rolesHdr     = trimToNull(request.getHeader("X-User-Role"));
-
+        final String userNameHeader = trimToNull(request.getHeader("X-User-Name"));
+        String userName = "";
+        if(userNameHeader != null) {
+            userName = new String(
+                    java.util.Base64.getUrlDecoder().decode(userNameHeader),
+                    java.nio.charset.StandardCharsets.UTF_8
+            );
+        }
         Authentication current = SecurityContextHolder.getContext().getAuthentication();
         boolean isAnonymous = (current instanceof AnonymousAuthenticationToken);
         boolean canSetAuth = (current == null) || isAnonymous;
@@ -83,7 +73,7 @@ protected void doFilterInternal(
 
             UsernamePasswordAuthenticationToken auth =
                     new UsernamePasswordAuthenticationToken(String.valueOf(userId), null, authorities);
-            auth.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
+            auth.setDetails(new AuthDetails(request, userName));
             SecurityContextHolder.getContext().setAuthentication(auth);
 
             // principal을 **Long**으로 세팅
@@ -107,6 +97,9 @@ private static String trimToNull(String s) {
     protected boolean shouldNotFilter(HttpServletRequest request) {
         String path = request.getRequestURI();
         String method = request.getMethod();
-        return "OPTIONS".equals(method) || path.startsWith("/actuator");
+
+        return "OPTIONS".equals(method)
+                || path.startsWith("/actuator")
+                || path.startsWith("/api/users/statisticsList");
     }
 }

src/main/java/com/tekcit/festival/config/security/SecurityConfig.java

@@ -52,13 +52,15 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                 .logout(logout -> logout.disable())
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(auth -> auth
+                        .requestMatchers("/actuator/health/**", "/actuator/prometheus").permitAll()
                         .requestMatchers(
                                 "/api/users/signupUser",
                                 "/api/users/signupAdmin",
                                 "/api/users/findLoginId",
                                 "/api/users/findRegisteredEmail",
                                 "/api/users/resetPasswordEmail",
                                 "/api/users/login",
+                                "/api/users/login/confirm",
                                 "/api/auth/kakao/signupUser"
                         ).anonymous()
                         .requestMatchers(

src/main/java/com/tekcit/festival/config/security/WebClientConfig.java

@@ -1,24 +1,20 @@
 package com.tekcit.festival.config.security;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.reactive.function.client.WebClient;
 
 @Configuration
 public class WebClientConfig {
 
+    @Value("${booking.base.service.url}")
+    private String bookingBaseServiceUrl;
+
     @Bean
     public WebClient bookingWebClient() {
         return WebClient.builder()
-                .baseUrl("http://localhost:8082")
+                .baseUrl(bookingBaseServiceUrl)
                 .build();
     }
-
-    // 다른 외부 서비스 호출을 할 수 있음
-    // @Bean
-    // public WebClient anotherWebClient() {
-    //     return WebClient.builder()
-    //            .baseUrl("http://another-service-url")
-    //            .build();
-    // }
 }