shared-dg04-Won/smarketing-backend
2
0
Fork 0
mirror of https://github.com/won-ktds/smarketing-backend.git synced 2026-06-12 20:39:09 +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
Download Patch File Download Diff File Expand all files Collapse all files
smarketing-java/ai-recommend/src/main/resources/application.yml
-3
View File
@@ -33,15 +33,12 @@ external:
api-key: ${PYTHON_AI_API_KEY:dummy-key}
timeout: ${PYTHON_AI_TIMEOUT:30000}
<<<<<<< HEAD
azure:
eventhub:
namespace: ${AZURE_EVENTHUB_NAMESPACE}
marketing-tip-hub: ${AZURE_EVENTHUB_MARKETING_TIP_HUB:marketing-tip-requests}
consumer-group: ${AZURE_EVENTHUB_CONSUMER_GROUP:ai-recommend-service}
=======
>>>>>>> origin/main
management:
endpoints:
web: