176 Commits

Author SHA1 Message Date
John Hanzu Kim
c2244293ff
Update deploy.yaml.template 2025-06-17 17:15:01 +09:00
John Hanzu Kim
37a69d8834
Update deploy.yaml.template 2025-06-17 17:07:16 +09:00
John Hanzu Kim
e70821edfe
Update Jenkinsfile 2025-06-17 17:04:38 +09:00
John Hanzu Kim
135264dd95
Update Jenkinsfile 2025-06-17 17:03:00 +09:00
John Hanzu Kim
a87032e7a6
Update Jenkinsfile 2025-06-17 16:52:51 +09:00
John Hanzu Kim
fd5ede7a4d
Update deploy.yaml.template 2025-06-17 16:47:16 +09:00
John Hanzu Kim
26f82f79b3
Update deploy.yaml.template 2025-06-17 16:41:30 +09:00
John Hanzu Kim
04b46ebedc
Update deploy.yaml.template 2025-06-17 16:40:17 +09:00
John Hanzu Kim
1faf5ced89
Update Jenkinsfile 2025-06-17 16:38:13 +09:00
John Hanzu Kim
3380ece0af
Update deploy_env_vars 2025-06-17 16:17:37 +09:00
박서은
1d0f16134b Merge branch 'marketing-contents' 2025-06-17 15:31:17 +09:00
박서은
378d148032 change ip 2025-06-17 15:30:59 +09:00
yuhalog
b5b71e142e Merge branch 'main' of https://github.com/won-ktds/smarketing-backend 2025-06-17 15:14:12 +09:00
yuhalog
4c5cfcbbc7 fix: build 2025-06-17 15:13:45 +09:00
박서은
71cd2ef9cf Merge branch 'main' into marketing-contents 2025-06-17 15:09:31 +09:00
박서은
2a7393f17b update contents table id key 2025-06-17 15:09:21 +09:00
박서은
d77f6843ff add content api 2025-06-17 15:08:46 +09:00
yuhalog
a8c945ac9d
fix: Update PythonAiPosterGenerator.java 2025-06-17 15:08:26 +09:00
yuhalog
70ea983da4 refactor: actuator health 2025-06-17 14:43:23 +09:00
yuhalog
14c5164c41 feat: Marketing Tip Summary 2025-06-17 14:05:21 +09:00
박서은
f9a5007cfd fix prompt 2025-06-17 13:51:20 +09:00
yuhalog
e2d98e4dc9 add : SecurityConfig - actuator url 2025-06-17 13:31:38 +09:00
OhSeongRak
f3fc5bc39e refactor: container('azure-cli') - wait 명령어 수정 2025-06-17 13:25:18 +09:00
OhSeongRak
e50e4b4da4 refactor: Jenkinsfile - Check Changes 변경 2025-06-17 13:18:49 +09:00
OhSeongRak
1cfbcadba9 refactor: key 변수 수정 2025-06-17 13:14:42 +09:00
OhSeongRak
b5edce9ed0 refactor: key 변수 수정 2025-06-17 13:09:41 +09:00
John Hanzu Kim
e60a50aaac
Update deploy.yaml.template 2025-06-17 13:02:47 +09:00
OhSeongRak
6373c894dc refactor: Dockerfile - 경로 수정 2025-06-17 12:56:05 +09:00
OhSeongRak
b2aa6341e7 refactor: Jenkinsfile - 경로 수정 2025-06-17 11:32:12 +09:00
OhSeongRak
e3d368fcb4 refactor: Jenkinsfile - Check Changes 변경 2025-06-17 11:29:39 +09:00
OhSeongRak
8562c15062 refactor: Jenkinsfile - Dockerfile 경로 수정 2025-06-17 11:27:39 +09:00
OhSeongRak
ec8d0e0aea refactor: Jenkinsfile - Dockerfile 경로 수정 2025-06-17 11:24:37 +09:00
yuhalog
f7f1e08b49 add: actuator 설정 2025-06-17 11:20:35 +09:00
OhSeongRak
96e3372d08 refactor: Jenkinsfile - deploy_env_vars 경로 변경 2025-06-17 11:19:32 +09:00
박서은
4eb060df23 Merge branch 'main' of https://github.com/won-ktds/smarketing-backend 2025-06-17 11:17:28 +09:00
박서은
b7fa318ba9 delete unused import 2025-06-17 11:17:12 +09:00
OhSeongRak
3eefd5c984 Merge branch 'main' of https://github.com/won-ktds/smarketing-backend 2025-06-17 11:16:34 +09:00
OhSeongRak
2e1a7b589e refactor: Jenkinsfile - Check Changes 추가 2025-06-17 11:15:12 +09:00
박서은
d94915f15d delete unused import 2025-06-17 11:13:27 +09:00
OhSeongRak
9d30b7491c refactor: Jenkinsfile 변경 - Check Change 추가 2025-06-17 11:04:20 +09:00
박서은
4b0f6e25c6 Merge branch 'marketing-contents' 2025-06-17 10:59:57 +09:00
yuhalog
e5b9d03f26
Merge pull request #9 from won-ktds/main-fix
Main fix
2025-06-17 10:58:11 +09:00
yuhalog
e90de9ada1 Merge branch 'main' of https://github.com/won-ktds/smarketing-backend into main-fix 2025-06-17 10:56:04 +09:00
yuhalog
d6c809d470 fix: merge fix 2025-06-17 10:55:01 +09:00
박서은
42f59b5a08 add image column 2025-06-17 10:53:17 +09:00
yuhalog
143f93b9a0 fix: git merge error fix 2025-06-17 10:47:15 +09:00
yuhalog
c939561083 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	smarketing-ai/app.py
#	smarketing-ai/deployment/manifest/deployment.yaml
#	smarketing-ai/deployment/manifest/secret.yaml
#	smarketing-ai/deployment/manifest/service.yaml
#	smarketing-ai/models/request_models.py
#	smarketing-ai/services/sns_content_service.py
#	smarketing-java/ai-recommend/src/main/java/com/won/smarketing/recommend/application/service/MarketingTipService.java
#	smarketing-java/ai-recommend/src/main/resources/application.yml
#	smarketing-java/build.gradle
#	smarketing-java/store/src/main/java/com/won/smarketing/store/dto/MenuUpdateRequest.java
2025-06-17 10:45:45 +09:00
OhSeongRak
ae29756681 refactor: Jenkinsfile 변경 2025-06-17 10:41:14 +09:00
yuhalog
af8d41686b Merge remote-tracking branch 'origin/ai-recommend' 2025-06-17 10:37:34 +09:00
OhSeongRak
8f91c42a17 Merge remote-tracking branch 'origin/main' 2025-06-17 10:35:18 +09:00