shared-dg04-Won/smarketing-backend
2
0
Fork 0
mirror of https://github.com/won-ktds/smarketing-backend.git synced 2026-01-21 19:16:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge fix

Browse Source
This commit is contained in:
yuhalog 2025-06-17 10:55:01 +09:00
parent 143f93b9a0
commit d6c809d470
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
smarketing-java/ai-recommend/src/main/resources/application.yml
View File

@ -33,15 +33,12 @@ external:
api-key: ${PYTHON_AI_API_KEY:dummy-key} api-key: ${PYTHON_AI_API_KEY:dummy-key}
timeout: ${PYTHON_AI_TIMEOUT:30000} timeout: ${PYTHON_AI_TIMEOUT:30000}
<<<<<<< HEAD
azure: azure:
eventhub: eventhub:
namespace: ${AZURE_EVENTHUB_NAMESPACE} namespace: ${AZURE_EVENTHUB_NAMESPACE}
marketing-tip-hub: ${AZURE_EVENTHUB_MARKETING_TIP_HUB:marketing-tip-requests} marketing-tip-hub: ${AZURE_EVENTHUB_MARKETING_TIP_HUB:marketing-tip-requests}
consumer-group: ${AZURE_EVENTHUB_CONSUMER_GROUP:ai-recommend-service} consumer-group: ${AZURE_EVENTHUB_CONSUMER_GROUP:ai-recommend-service}
=======
>>>>>>> origin/main
management: management:
endpoints: endpoints:
web: web:

4
smarketing-java/build.gradle
View File

@ -47,13 +47,11 @@ subprojects {
testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.springframework.security:spring-security-test'
<<<<<<< HEAD
implementation 'com.azure:azure-messaging-eventhubs:5.18.0' implementation 'com.azure:azure-messaging-eventhubs:5.18.0'
implementation 'com.azure:azure-messaging-eventhubs-checkpointstore-blob:1.19.0' implementation 'com.azure:azure-messaging-eventhubs-checkpointstore-blob:1.19.0'
implementation 'com.azure:azure-identity:1.11.4' implementation 'com.azure:azure-identity:1.11.4'
=======
>>>>>>> origin/main
} }
tasks.named('test') { tasks.named('test') {

4
smarketing-java/store/src/main/java/com/won/smarketing/store/dto/MenuUpdateRequest.java
View File

@ -35,11 +35,9 @@ public class MenuUpdateRequest {
@Schema(description = "메뉴 설명", example = "진한 원두의 깊은 맛") @Schema(description = "메뉴 설명", example = "진한 원두의 깊은 맛")
private String description; private String description;
<<<<<<< HEAD
@Schema(description = "이미지") @Schema(description = "이미지")
@Size(max = 500, message = "이미지 URL은 500자 이하여야 합니다") @Size(max = 500, message = "이미지 URL은 500자 이하여야 합니다")
private MultipartFile image; private MultipartFile image;
=======
>>>>>>> origin/main
} }