shared-dg04-Won/smarketing-backend
2
0
Fork 0
mirror of https://github.com/won-ktds/smarketing-backend.git synced 2025-12-06 07:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
148 Commits 10 Branches 0 Tags
Commit Graph

148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
OhSeongRak
bbeb7b0936 refactor: secret 변경 2025-06-17 10:35:07 +09:00
박서은
b34277c9bd Merge remote-tracking branch 'origin/member' into marketing-contents 2025-06-17 10:33:05 +09:00
박서은
552c05c2d7 Merge remote-tracking branch 'origin/ai-recommend' into marketing-contents 2025-06-17 10:32:34 +09:00
John Hanzu Kim
9b42ff2e00
Update deploy.yaml.template 2025-06-17 10:30:07 +09:00
박서은
655efae5e3 Merge branch 'main' into marketing-contents 2025-06-17 10:21:53 +09:00
OhSeongRak
fa1f0a481a refactor: secret 변경 2025-06-17 10:20:47 +09:00
OhSeongRak
dc0660111e refactor: secret 변경 2025-06-17 10:19:59 +09:00
yuhalog
43f8cb7809 refactor: 토큰 만료 시간 변경 2025-06-17 10:19:53 +09:00
yuhalog
42095eb39e feat: marketing tip summary 2025-06-17 10:15:40 +09:00
John Hanzu Kim
eb08aed281
Update Jenkinsfile 2025-06-17 10:07:15 +09:00
OhSeongRak
44d7312a85 release 2025-06-17 10:05:16 +09:00
박서은
ddeaf0a017 Merge branch 'store' 2025-06-17 09:56:46 +09:00
박서은
3dd1d0d0ea delete multifile 2025-06-17 09:55:41 +09:00
박서은
faaf690db2 add python call 2025-06-17 09:54:49 +09:00
John Hanzu Kim
200b41189a
Update Jenkinsfile 2025-06-17 09:49:44 +09:00
John Hanzu Kim
b4f16e4350
Update Jenkinsfile 2025-06-17 09:41:04 +09:00
John Hanzu Kim
c7288ba805
Update deploy_env_vars 2025-06-17 09:36:38 +09:00
John Hanzu Kim
d244f040ad
Update Jenkinsfile 2025-06-17 09:36:26 +09:00
John Hanzu Kim
42c071fbf0
Update Dockerfile 2025-06-17 09:36:09 +09:00
John Hanzu Kim
1c461f65f4
Update Jenkinsfile 2025-06-16 18:08:52 +09:00
John Hanzu Kim
2d17e43ad2
Update Jenkinsfile 2025-06-16 17:55:37 +09:00
John Hanzu Kim
d6c0b04d31
Update Dockerfile 2025-06-16 17:47:11 +09:00
John Hanzu Kim
79b481585b
Update Jenkinsfile 2025-06-16 17:42:16 +09:00
John Hanzu Kim
a7a046bf43
Update Jenkinsfile 2025-06-16 17:37:45 +09:00
John Hanzu Kim
0d6f435f68
Create Dockerfile 2025-06-16 17:29:13 +09:00
John Hanzu Kim
845f3fdd03
Update deploy_env_vars 2025-06-16 17:20:52 +09:00
John Hanzu Kim
610915add9
Update Jenkinsfile 2025-06-16 17:16:49 +09:00
John Hanzu Kim
ad0d6bb197
Update Jenkinsfile 2025-06-16 17:12:53 +09:00