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

93 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Hanzu Kim
9b42ff2e00
Update deploy.yaml.template 2025-06-17 10:30:07 +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
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
OhSeongRak
2ea0e7bae1 refactor: 서비스 포트 변경 2025-06-16 16:03:33 +09:00
yuhalog
f8c0178e83 fix: import error 2025-06-16 16:02:41 +09:00
SeongRak Oh
cebf9e34ef
Merge pull request #8 from won-ktds/dev 
Dev
 2025-06-16 15:48:46 +09:00
SeongRak Oh
7748f96658
Merge pull request #7 from won-ktds/feature/local-to-azure 
Feature/local to azure
 2025-06-16 15:48:20 +09:00
OhSeongRak
81e70c872e refactor: 사용하지 않는 사진 삭제 2025-06-16 15:47:38 +09:00
OhSeongRak
7dda13856a feat: azure storage 서비스 생성 2025-06-16 15:47:25 +09:00
OhSeongRak
6504a36462 refactor: 홍보 포스터 저장소 azure storage로 변경 2025-06-16 15:46:38 +09:00
OhSeongRak
2be4dbc3f7 refactor: 사용하지 않는 서비스 삭제 2025-06-16 15:46:13 +09:00
yuhalog
aeab66ec39
Merge pull request #6 from won-ktds/ai-recommend 
feat: ai-recommend 마케팅 팁 생성
 2025-06-16 14:52:48 +09:00
yuhalog
6003eebb82 feat: request - add menu 2025-06-16 14:51:19 +09:00
yuhalog
39c1560de8 Merge branch 'main' of https://github.com/won-ktds/smarketing-backend into ai-recommend 
# Conflicts:
#	smarketing-ai/app.py
 2025-06-16 14:50:26 +09:00
unknown
55df795791 feat: marketing tip 2025-06-16 14:43:45 +09:00
SeongRak Oh
846285e4e5
Merge pull request #5 from won-ktds/dev 
Dev -> main
 2025-06-16 14:28:44 +09:00
SeongRak Oh
18c274142c
Merge pull request #4 from won-ktds/feature/generate-poster 
Feature/generate poster
 2025-06-16 14:28:23 +09:00
OhSeongRak
df89bb25ff refactor: 홍보 포스터 생성 프롬프트 수정 2025-06-16 14:26:29 +09:00
OhSeongRak
6910a1682d feat: 생성된 이미지 리스트 2025-06-16 14:26:12 +09:00
OhSeongRak
61a4837757 refactor: 이미지 생성 API 변경 (dall-e -> gpt) 2025-06-16 13:05:11 +09:00
unknown
b5d896aadf feat: marketing tip 2025-06-16 11:15:16 +09:00
OhSeongRak
53eccb3a2b refactor: deployment.yaml image repository 수정 2025-06-16 09:23:58 +09:00
OhSeongRak
b764e95e20 feat: manifest 파일 생성 2025-06-16 09:11:04 +09:00
OhSeongRak
1861cd5655 refactor: Dockerfile 이동 2025-06-16 09:00:58 +09:00
OhSeongRak
03c14f0faa refactor: app.py host & port 수정 2025-06-14 23:22:02 +09:00
OhSeongRak
acc2a3ff90 Merge remote-tracking branch 'origin/main' 2025-06-14 23:00:49 +09:00
OhSeongRak
ede8b94f42 refactor: Dockerfile 수정 2025-06-14 23:00:34 +09:00
SeongRak Oh
c558467a05
Merge pull request #3 from won-ktds/dev 
Dev to Main
 2025-06-13 17:20:49 +09:00
SeongRak Oh
3aaa27e0fc
Merge pull request #2 from won-ktds/feature/generate-poster 
Feature/generate poster
 2025-06-13 16:59:37 +09:00
OhSeongRak
5678ac3dea feat: 홍보 포스터 생성 버전3 2025-06-13 16:57:49 +09:00
OhSeongRak
b5a9cae32a refactor: 홍보 포스터 생성 서비스 버전 추가 2025-06-13 16:57:35 +09:00
OhSeongRak
96add68b74 fix: temp 파일 삭제 2025-06-13 16:56:54 +09:00
박서은
69964d970c add year sales 2025-06-13 15:16:23 +09:00
박서은
cc871cddab add img svc 2025-06-13 14:49:14 +09:00
박서은
d55f5a4a82 Merge branch 'main' into store 2025-06-13 10:29:19 +09:00
박서은
2893c4daf3 fix store 2025-06-13 10:27:22 +09:00
yuhalog
0b4c543b19
feat: 인증, 회원 기능 구현 
feat: member 기능 구현
 2025-06-12 17:51:20 +09:00
unknown
909e51cc4c feat: member 기능 수정 - 로그인, 로그아웃 토큰 ì‚, 회원 
로그아웃 토큰 ì - 로그그 아웃시 블랙리스트 토큰 적재 과정 삭제, 토큰 삭제만 처리하도록 수정
 2025-06-12 17:40:57 +09:00