From fb336357fb02d70c010d34a3effa28368b1341bf Mon Sep 17 00:00:00 2001 From: lsh9672 Date: Thu, 12 Jun 2025 15:52:50 +0900 Subject: [PATCH] Fix : common --- .../analytics/infra/config/RedisConfig.java | 6 ++-- analytics/src/main/resources/application.yml | 30 ++++++++++++++++++- build.gradle | 3 ++ .../com/ktds/hi/common/audit/AuditLog.java | 10 ++++++- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/analytics/src/main/java/com/ktds/hi/analytics/infra/config/RedisConfig.java b/analytics/src/main/java/com/ktds/hi/analytics/infra/config/RedisConfig.java index 5c52449..9c89b1c 100644 --- a/analytics/src/main/java/com/ktds/hi/analytics/infra/config/RedisConfig.java +++ b/analytics/src/main/java/com/ktds/hi/analytics/infra/config/RedisConfig.java @@ -31,13 +31,13 @@ import java.util.Map; @RequiredArgsConstructor public class RedisConfig { - @Value("${spring.redis.host}") + @Value("${spring.data.redis.host}") private String redisHost; - @Value("${spring.redis.port}") + @Value("${spring.data.redis.port}") private int redisPort; - @Value("${spring.redis.password:}") + @Value("${spring.data.redis.password:}") private String redisPassword; private final ObjectMapper objectMapper; diff --git a/analytics/src/main/resources/application.yml b/analytics/src/main/resources/application.yml index a3e0727..20cdc5d 100644 --- a/analytics/src/main/resources/application.yml +++ b/analytics/src/main/resources/application.yml @@ -44,6 +44,13 @@ ai-api: # api-key: ${CLAUDE_API_KEY:} # base-url: https://api.anthropic.com +# 외부 서비스 설정 +external: + services: + review: ${EXTERNAL_SERVICES_REVIEW:http://localhost:8082} + store: ${EXTERNAL_SERVICES_STORE:http://localhost:8081} + member: ${EXTERNAL_SERVICES_MEMBER:http://localhost:8080} + springdoc: api-docs: path: /api-docs @@ -54,4 +61,25 @@ management: endpoints: web: exposure: - include: health,info,metrics \ No newline at end of file + include: health,info,metrics + +# AI 서비스 설정 +ai: + azure: + cognitive: + endpoint: ${AI_AZURE_COGNITIVE_ENDPOINT:https://your-cognitive-service.cognitiveservices.azure.com} + key: ${AI_AZURE_COGNITIVE_KEY:your-cognitive-service-key} + openai: + api-key: ${AI_OPENAI_API_KEY:your-openai-api-key} + +# Azure Event Hub 설정 +azure: + eventhub: + connection-string: ${AZURE_EVENTHUB_CONNECTION_STRING:Endpoint=sb://your-eventhub.servicebus.windows.net/;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=your-key} + consumer-group: ${AZURE_EVENTHUB_CONSUMER_GROUP:analytics-consumer} + event-hubs: + review-events: ${AZURE_EVENTHUB_REVIEW_EVENTS:review-events} + ai-analysis-events: ${AZURE_EVENTHUB_AI_ANALYSIS_EVENTS:ai-analysis-events} + storage: + connection-string: ${AZURE_STORAGE_CONNECTION_STRING:DefaultEndpointsProtocol=https;AccountName=yourstorageaccount;AccountKey=your-storage-key;EndpointSuffix=core.windows.net} + container-name: ${AZURE_STORAGE_CONTAINER_NAME:eventhub-checkpoints} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 852bba6..2d38301 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,9 @@ subprojects { // Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + + // 맥 의존성 해결 + implementation 'io.netty:netty-resolver-dns-native-macos:4.1.68.Final:osx-aarch_64' // JWT implementation 'io.jsonwebtoken:jjwt-api:0.12.3' diff --git a/common/src/main/java/com/ktds/hi/common/audit/AuditLog.java b/common/src/main/java/com/ktds/hi/common/audit/AuditLog.java index 99d9c60..638ed75 100644 --- a/common/src/main/java/com/ktds/hi/common/audit/AuditLog.java +++ b/common/src/main/java/com/ktds/hi/common/audit/AuditLog.java @@ -1,6 +1,7 @@ package com.ktds.hi.common.audit; import jakarta.persistence.Entity; +import jakarta.persistence.EntityListeners; import jakarta.persistence.Id; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,6 +10,8 @@ import lombok.NoArgsConstructor; import java.time.LocalDateTime; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + /** * 감사 로그 엔티티 */ @@ -16,7 +19,8 @@ import java.time.LocalDateTime; @Entity @Builder @NoArgsConstructor - @AllArgsConstructor +@AllArgsConstructor +@EntityListeners(AuditingEntityListener.class) public class AuditLog { @Id @@ -30,4 +34,8 @@ public class AuditLog { private String userAgent; private String ipAddress; private LocalDateTime timestamp; + private LocalDateTime createdAt; + + + } \ No newline at end of file