Merge branch 'develop' into feature/analytics

analytics-service/.run/analytics-service.run.xml

@@ -39,7 +39,7 @@
           <entry key="JWT_REFRESH_TOKEN_VALIDITY" value="86400" />
 
           <!-- CORS Configuration -->
-          <entry key="CORS_ALLOWED_ORIGINS" value="http://localhost:*" />
+          <entry key="CORS_ALLOWED_ORIGINS" value="http://localhost:*,http://*.nip.io:*" />
 
           <!-- Logging Configuration -->
           <entry key="LOG_FILE" value="logs/analytics-service.log" />

analytics-service/Dockerfile

@@ -0,0 +1,24 @@
+# Multi-stage build for Spring Boot application
+FROM eclipse-temurin:21-jre-alpine AS builder
+WORKDIR /app
+COPY build/libs/*.jar app.jar
+RUN java -Djarmode=layertools -jar app.jar extract
+
+FROM eclipse-temurin:21-jre-alpine
+WORKDIR /app
+
+# Create non-root user
+RUN addgroup -S spring && adduser -S spring -G spring
+USER spring:spring
+
+# Copy layers from builder
+COPY --from=builder /app/dependencies/ ./
+COPY --from=builder /app/spring-boot-loader/ ./
+COPY --from=builder /app/snapshot-dependencies/ ./
+COPY --from=builder /app/application/ ./
+
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=60s --retries=3 \
+  CMD wget --no-verbose --tries=1 --spider http://localhost:8086/api/v1/analytics/actuator/health || exit 1
+
+ENTRYPOINT ["java", "org.springframework.boot.loader.launch.JarLauncher"]

analytics-service/src/main/resources/application.yml

@@ -80,6 +80,7 @@ server:
       charset: UTF-8
       enabled: true
       force: true
+    context-path: /api/v1/analytics
 
 # JWT
 jwt:
@@ -89,7 +90,11 @@ jwt:
 
 # CORS Configuration
 cors:
-  allowed-origins: ${CORS_ALLOWED_ORIGINS:http://localhost:*}
+  allowed-origins: ${CORS_ALLOWED_ORIGINS:http://localhost:8081,http://localhost:8082,http://localhost:8083,http://localhost:8084,http://kt-event-marketing.20.214.196.128.nip.io}
+  allowed-methods: ${CORS_ALLOWED_METHODS:GET,POST,PUT,DELETE,OPTIONS,PATCH}
+  allowed-headers: ${CORS_ALLOWED_HEADERS:*}
+  allow-credentials: ${CORS_ALLOW_CREDENTIALS:true}
+  max-age: ${CORS_MAX_AGE:3600}
 
 # Actuator
 management: