Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
550 commits
Select commit Hold shift + click to select a range
352d78b
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 29, 2025
24671f0
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 29, 2025
a23e5f8
모든 회원 정보 조회
YunHwa0905 Apr 29, 2025
57f23fe
모든 회원 정보 조회
YunHwa0905 Apr 29, 2025
0b82cdb
CI/CD 테스트
ByeongukYun Apr 29, 2025
2efc767
CI/CD 테스트
ByeongukYun Apr 29, 2025
9198979
Refactor: 관리지 회원가입 삭제
suminmmmmmmm Apr 29, 2025
c6d244a
Refactor: 관리지 회원가입 삭제
suminmmmmmmm Apr 29, 2025
e4fb974
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 29, 2025
9b03b39
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 29, 2025
10a446b
deploy.yml 수정
ByeongukYun Apr 29, 2025
fe9f275
deploy.yml 수정
ByeongukYun Apr 29, 2025
376ae8a
오류 수정
ByeongukYun Apr 29, 2025
8135ce5
오류 수정
ByeongukYun Apr 29, 2025
9ee75a9
Feat: favorite 즐겨찾기 API 추가
ha-yun Apr 29, 2025
85d4625
Feat: favorite 즐겨찾기 API 추가
ha-yun Apr 29, 2025
a0e26d7
Merge pull request #22 from ha-yun/main
ha-yun Apr 29, 2025
a1eb1e3
Merge pull request #22 from ha-yun/main
ha-yun Apr 29, 2025
c13767f
유저 서비스 통합 후 CI/CD 테스트
ByeongukYun Apr 29, 2025
f764133
유저 서비스 통합 후 CI/CD 테스트
ByeongukYun Apr 29, 2025
57b1289
유저 서비스 CI/CD 테스트
ByeongukYun Apr 29, 2025
e08fe9b
유저 서비스 CI/CD 테스트
ByeongukYun Apr 29, 2025
1a82863
gitignore 수정
ByeongukYun Apr 29, 2025
648ee2b
gitignore 수정
ByeongukYun Apr 29, 2025
2df5b1d
여러 파일 수정
ByeongukYun Apr 29, 2025
3872531
여러 파일 수정
ByeongukYun Apr 29, 2025
de0e4ec
deploy.yml 수정
ByeongukYun Apr 29, 2025
331684b
deploy.yml 수정
ByeongukYun Apr 29, 2025
888753b
application.properties 추적 중단
ByeongukYun Apr 29, 2025
7d6ff8d
application.properties 추적 중단
ByeongukYun Apr 29, 2025
20c7f02
Refactor: 변수명 수정정
suminmmmmmmm Apr 30, 2025
f96400e
Refactor: 변수명 수정정
suminmmmmmmm Apr 30, 2025
9a04f1c
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 30, 2025
6fc16ec
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 30, 2025
2226dea
Accommodation 컨트롤러 수정
ByeongukYun Apr 30, 2025
b0fdc98
Accommodation 컨트롤러 수정
ByeongukYun Apr 30, 2025
9066fc2
카페 수정
YunHwa0905 Apr 30, 2025
deef516
카페 수정
YunHwa0905 Apr 30, 2025
e351922
카페 수정
YunHwa0905 Apr 30, 2025
069e757
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun Apr 30, 2025
8efb64e
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun Apr 30, 2025
7c8504a
accommodation 관련 파일들 수정
ByeongukYun Apr 30, 2025
5222c32
accommodation 관련 파일들 수정
ByeongukYun Apr 30, 2025
abe778a
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
YunHwa0905 Apr 30, 2025
568dc1c
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
YunHwa0905 Apr 30, 2025
b7d28aa
Refactor: 지역이름,id 값 추가
suminmmmmmmm Apr 30, 2025
5e1fa37
Refactor: 지역이름,id 값 추가
suminmmmmmmm Apr 30, 2025
be9e4d3
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
YunHwa0905 Apr 30, 2025
ad23dd5
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
YunHwa0905 Apr 30, 2025
5049b62
카페 수정
YunHwa0905 Apr 30, 2025
1d94993
카페 수정
YunHwa0905 Apr 30, 2025
181132a
Refactor: 즐겨찾기 API 수정 & 관광지 API dto 수정
ha-yun Apr 30, 2025
aed0708
Refactor: 즐겨찾기 API 수정 & 관광지 API dto 수정
ha-yun Apr 30, 2025
570057f
Merge pull request #23 from ha-yun/main
ha-yun Apr 30, 2025
491c35c
Merge pull request #23 from ha-yun/main
ha-yun Apr 30, 2025
5279847
gateway tokenrelay 추가 중
ByeongukYun Apr 30, 2025
828c00a
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun Apr 30, 2025
2eb5421
push and 통합검색
YunHwa0905 Apr 29, 2025
c54beb9
전체 목록 조회
YunHwa0905 Apr 30, 2025
dc42591
전체 목록 조회
YunHwa0905 Apr 30, 2025
f4166a2
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun Apr 30, 2025
26249c3
deploy.yml 수정
ByeongukYun Apr 30, 2025
2b59c2f
deploy.yml 수정
ByeongukYun Apr 30, 2025
954a674
application.properties 수정
ByeongukYun Apr 30, 2025
5e399ea
충돌 해결
ByeongukYun Apr 30, 2025
6ad78de
Merge: searchplace & Feature#54
ha-yun Apr 30, 2025
0410592
Merge: 오류 해결
ha-yun Apr 30, 2025
a8d5772
Merege:오류 수정
ha-yun Apr 30, 2025
131ea4d
Merge branch 'Feature#54-유저-Gateway' into main
ha-yun Apr 30, 2025
81c3dfc
Merge pull request #24 from ha-yun/main
ha-yun Apr 30, 2025
0fe91ec
Merge: 빠진 코드 추가
ha-yun Apr 30, 2025
06d7322
Merge pull request #25 from ha-yun/main
ha-yun Apr 30, 2025
ebf54c1
Merge branch 'Feature#26-장소데이터가공' of https://github.com/SentryRookies…
suminmmmmmmm Apr 30, 2025
1e1064a
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 30, 2025
b502e92
Accommodation entity 수정
ByeongukYun Apr 30, 2025
1377ab7
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun Apr 30, 2025
8d3dae9
accommodation 관련 파일 수정
ByeongukYun Apr 30, 2025
bfa4338
attraction 관련 파일 수정
ByeongukYun Apr 30, 2025
0c51819
cafe id, name 수정
YunHwa0905 Apr 30, 2025
ae5289a
user-service ApplicationConfig 수정
ByeongukYun Apr 30, 2025
d5b2342
Refactor:weatheres 현재 날짜로 받아오게 수정
suminmmmmmmm Apr 30, 2025
ffd0bf9
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun Apr 30, 2025
a8fa3b4
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
suminmmmmmmm Apr 30, 2025
943f13a
코드 추가
suminmmmmmmm Apr 30, 2025
88e8fd3
Refactor: area dto name 수정
ha-yun May 7, 2025
f49dffb
Merge pull request #26 from ha-yun/main
ha-yun May 7, 2025
aad1639
gateway 수정
ByeongukYun May 7, 2025
4ffc566
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun May 7, 2025
a5c33c7
여러 파일 수정
ByeongukYun May 7, 2025
122f174
gateway 관련 파일 수정
ByeongukYun May 7, 2025
84294c0
build.gradle 수정
ByeongukYun May 7, 2025
ede888f
auth/signup 중복 제거
suminmmmmmmm May 7, 2025
8f90ceb
AdminSignup 파일 삭제
ByeongukYun May 7, 2025
fdb3308
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun May 7, 2025
487070b
주차장(es)데이터 현재 날짜로 받아오기
suminmmmmmmm May 7, 2025
8122827
gateway application.properties 수정
ByeongukYun May 7, 2025
2c9e3bc
Merge branch 'Feature#54-유저-Gateway' of https://github.com/SentryRook…
ByeongukYun May 7, 2025
838693b
Refactor: favorite API - 내부 api 호출 localhost에서 서버url로 변경
ha-yun May 7, 2025
e32b278
Merge pull request #27 from ha-yun/main
ha-yun May 7, 2025
bc97d91
Merge pull request #28 from SentryRookies/Feature#54-유저-Gateway
ha-yun May 7, 2025
ad2cd86
Refactor: favorite API - response name 저장 변수 수정 type+_name
ha-yun May 7, 2025
3e652ff
Merge pull request #29 from ha-yun/main
ha-yun May 7, 2025
a3d95a4
feat:fastAPI와 연결 후 리뷰 키워드 요약 호출 API 기능 추가
May 7, 2025
1f8ae00
Feat: user-CORS 설정 추가
ha-yun May 8, 2025
9640ab5
Merge pull request #31 from ha-yun/main
ha-yun May 8, 2025
0f00061
Merge pull request #32 from SentryRookies/Feature#54-유저-Gateway
ha-yun May 8, 2025
f9ee92b
Feat: gateway-cors 추가
ha-yun May 8, 2025
1b2d35b
Merge pull request #33 from ha-yun/main
ha-yun May 8, 2025
c698b70
Refactor: gateway-cors 에러 수정중
ha-yun May 8, 2025
2963a18
Merge pull request #34 from ha-yun/main
ha-yun May 8, 2025
1dcf73b
Refactor: gateway-cors 에러 수정중
ha-yun May 8, 2025
4c4288f
Merge pull request #35 from ha-yun/main
ha-yun May 8, 2025
68163db
Refactor: gateway-cors 에러 수정중
ha-yun May 8, 2025
d0c0844
Merge pull request #36 from ha-yun/main
ha-yun May 8, 2025
89e2715
Refactor: gateway-cors 에러 수정중
ha-yun May 8, 2025
7fd8bb6
Merge pull request #37 from ha-yun/main
ha-yun May 8, 2025
4e728fa
Refactor: cors오류-gateway properties파일 yml로 변경
ha-yun May 8, 2025
74911c8
Merge pull request #38 from ha-yun/main
ha-yun May 8, 2025
8746424
Refactor: cors오류-gateway properties파일 yml로 변경
ha-yun May 8, 2025
e2ae785
Merge pull request #39 from ha-yun/main
ha-yun May 8, 2025
8d3ef01
Refactor: cors오류-No 'Access-Control-Allow-Origin' header 수정중
ha-yun May 8, 2025
0b41913
Merge pull request #40 from ha-yun/main
ha-yun May 8, 2025
f4af0cb
Refactor: cors 중복 수정
ha-yun May 9, 2025
e61121d
Merge pull request #41 from ha-yun/main
ha-yun May 9, 2025
9e38fdf
Merge remote-tracking branch 'upstream/Ai'
ha-yun May 9, 2025
bf08c4f
Refactor: application properties 캐시제거
ha-yun May 9, 2025
22ee53e
Merge pull request #42 from ha-yun/main
ha-yun May 9, 2025
ec3cbce
Refactor: congestion 서버 로그 축소 & user 스프링 시큐리티 예외처리 커스텀 메세지 추가
ha-yun May 9, 2025
da4b248
Merge pull request #43 from ha-yun/main
ha-yun May 9, 2025
1117ce6
Merge pull request #44 from SentryRookies/Feature#54-유저-Gateway
ha-yun May 9, 2025
b70e85a
refresh token 관련 수정
YunHwa0905 May 9, 2025
5eea657
accesstoken 수정
YunHwa0905 May 9, 2025
5cca378
Refactor: gateway content-type 수정
ha-yun May 9, 2025
aded077
Merge pull request #45 from ha-yun/main
ha-yun May 9, 2025
3c11217
user_id가능
YunHwa0905 May 10, 2025
fa7b022
Merge remote develop branch
YunHwa0905 May 10, 2025
6c6fd0c
정보 조회 수정
YunHwa0905 May 10, 2025
9d55ebf
applicaion.properties 추적 중지
YunHwa0905 May 10, 2025
b4e2ec6
회원탈퇴 memberid로 수정
suminmmmmmmm May 10, 2025
ee80873
Merge branch 'develop' of https://github.com/SentryRookies/Back-STARS…
suminmmmmmmm May 10, 2025
fc70a6a
Refactor: cors 배포된 프론트 url 추가
ha-yun May 10, 2025
042299d
Merge pull request #46 from ha-yun/main
ha-yun May 10, 2025
e6d0f2b
swagger-ui 추가
suminmmmmmmm May 10, 2025
62ffdab
Refactor: deploy.yml 수정
ha-yun May 10, 2025
0c9ebb6
Merge pull request #47 from ha-yun/main
ha-yun May 10, 2025
9d266ce
swagger-ui jwt 막힘 해결
suminmmmmmmm May 10, 2025
1b75a08
정보 조회 수정
YunHwa0905 May 10, 2025
98bf26e
경로 막힘 수정
suminmmmmmmm May 10, 2025
bdf8f73
swagger 에러 수정
suminmmmmmmm May 13, 2025
6c33842
swaggerui 에러 수정
suminmmmmmmm May 13, 2025
d1c0d39
swagger-ui 에러 수정
suminmmmmmmm May 13, 2025
ea8eaef
swagger 404
suminmmmmmmm May 13, 2025
6ed8a21
swgger오류
suminmmmmmmm May 13, 2025
92a4152
오류 수정
suminmmmmmmm May 13, 2025
7b81f50
수정
suminmmmmmmm May 13, 2025
2f2b37a
오류 수정
suminmmmmmmm May 13, 2025
ca3f36e
build.gradle 수정
ByeongukYun May 13, 2025
94e5fd0
place_id와 type를 반영했습니다
play-frog May 13, 2025
a829eea
place-service swagger-ui 추가
suminmmmmmmm May 13, 2025
c2b239e
추가 수정
suminmmmmmmm May 13, 2025
bd8e99f
Refactor: 통합검색 place_id 수정, 관광지 데이터(음식점으로 추정되는 id값 제외), external stre…
ha-yun May 13, 2025
da3243b
Merge pull request #48 from ha-yun/main
ha-yun May 13, 2025
805d491
Merge pull request #49 from SentryRookies/Feature#62-refactor-update-api
ha-yun May 13, 2025
0e58866
Refactor: @RestControllerAdvice 충돌 오류 수정
ha-yun May 13, 2025
7777cae
Merge pull request #50 from ha-yun/main
ha-yun May 13, 2025
7eed657
Merge pull request #51 from SentryRookies/Feature#62-refactor-update-api
ha-yun May 13, 2025
8ceb36a
Refactor: congestion sse구독 시 초기 데이터 추가
ha-yun May 13, 2025
9b3229b
Merge pull request #52 from ha-yun/main
ha-yun May 13, 2025
28efae7
Merge pull request #53 from SentryRookies/Feature#62-refactor-update-api
ha-yun May 13, 2025
75f2e57
Refactor: sse 오류(text/plain으로 전송되는 오류 수정중)
ha-yun May 13, 2025
9068bc0
Refactor: place attraction 관광지 api 수정중
ha-yun May 13, 2025
ca2c39c
Merge pull request #54 from ha-yun/main
ha-yun May 13, 2025
fd459c1
Refactor: SSE 초기 데이터 추가 시 발생하는 오류 수정중
ha-yun May 13, 2025
f6c32a0
Merge pull request #55 from ha-yun/main
ha-yun May 13, 2025
94742d9
Refactor: SSe 초기 데이터 추가시 발생하는 오류 수정
ha-yun May 13, 2025
89c41fd
Refactor: 관광지 데이터- 관광지 기준 가장 가까운 지역과 mapping, 2km넘어가면 제외
ha-yun May 13, 2025
940aa2a
Merge pull request #56 from ha-yun/main
ha-yun May 13, 2025
361f878
사고 실시간 데이터 추가
suminmmmmmmm May 14, 2025
75bcece
Refactoring: gateway 프론트 cors url 추가
ha-yun May 14, 2025
23b2f1d
Merge pull request #57 from ha-yun/main
ha-yun May 14, 2025
fd26995
사고 실시간 데이터 추가
suminmmmmmmm May 14, 2025
4227eb5
application 제거
ha-yun May 14, 2025
6dbb5a8
사고 실시간 데이터 중복 코드 제거
suminmmmmmmm May 14, 2025
23e518b
Refactor: congestion-alert 초기 데이터 추가
ha-yun May 14, 2025
7cc6549
Refactor: congestion alert 데이터 수정
ha-yun May 14, 2025
16c1da0
Feat: Congestion sse previouscache추가
ha-yun May 14, 2025
a992ebf
Merge branch 'Feature#62-refactor-update-api' into develop
ha-yun May 14, 2025
8ecc411
데이터 중복 처리 수정
suminmmmmmmm May 15, 2025
b27848f
실시간 데이터 오류 수정
suminmmmmmmm May 15, 2025
126951f
deploy.yml 수정
ByeongukYun May 15, 2025
1d10f9a
Refactor: external sse오류(초기데이터 전송 시) 수정
ha-yun May 16, 2025
8f3a27d
Feature: 통합검색 API lat,lon 변수 추가
ha-yun May 16, 2025
ee54b87
장소 추천 기능 파일 생성
ByeongukYun May 16, 2025
064dfd9
Merge branch 'feature/place-suggestion' of https://github.com/SentryR…
ByeongukYun May 16, 2025
3aca2f6
cafe 수정
YunHwa0905 May 16, 2025
1edc017
cafe 성능 수정
YunHwa0905 May 17, 2025
4f90a91
이전 여행지 추천 기록 기능 추가
ByeongukYun May 17, 2025
97198cf
cafe 성능 수정
YunHwa0905 May 17, 2025
9a04ade
SuggestController 수정
ByeongukYun May 17, 2025
f8feb37
cafe 성능 수정
YunHwa0905 May 17, 2025
6c42cc2
jipzin 의존성 추가
suminmmmmmmm May 17, 2025
ef4761a
Merge branch 'develop' of https://github.com/SentryRookies/Back-STARS…
suminmmmmmmm May 17, 2025
eaf42ff
zipkin 설정 수정
suminmmmmmmm May 17, 2025
712b9d9
zipkin 오류 수정
suminmmmmmmm May 17, 2025
4c99468
서울시 데이터 변경 사항 반영 완료
ByeongukYun May 17, 2025
9071bfc
Merge branch 'develop' of https://github.com/SentryRookies/Back-STARS…
ByeongukYun May 17, 2025
3db1610
리프레시 토큰 시간 변경
suminmmmmmmm May 17, 2025
e457e9b
zipkin 의존성 추가
suminmmmmmmm May 17, 2025
9c48436
Merge branch 'develop' of https://github.com/SentryRookies/Back-STARS…
ByeongukYun May 17, 2025
7154961
area 추가 수정, 추천 기능 추가
ByeongukYun May 17, 2025
d406844
fastapiurl 수정
ByeongukYun May 17, 2025
109cf09
Refactor: user 즐겨찾기 error exception 내용 수정
ha-yun May 17, 2025
5c8b6a8
Refactor: 지역별 장소 목록 조회 API 변수명 통일
ha-yun May 19, 2025
735837d
Feat: build.gradle logstash 추가
ha-yun May 19, 2025
e834e16
refresh토큰 코드 수정
suminmmmmmmm May 19, 2025
12b9da1
Refactor: deploy.yml 수정
ha-yun May 19, 2025
5968f19
elastic url 관련 코드 수정
ByeongukYun May 20, 2025
afca3b0
Merge branch 'feature/place-suggestion' into develop
ByeongukYun May 20, 2025
2599da6
elastic 변수 수정
ByeongukYun May 20, 2025
dee97f1
실시간 코드들 수정
ByeongukYun May 20, 2025
ec166ed
zipkin 관련 의존성 추가
suminmmmmmmm May 20, 2025
236366d
zipkin 관련 의존성 추가
suminmmmmmmm May 20, 2025
5602136
AI 여행지 추천 기능 수정
ByeongukYun May 20, 2025
e47eece
Merge branch 'develop' of https://github.com/SentryRookies/Back-STARS…
ByeongukYun May 20, 2025
9ead427
Refactor: 통합검색 API 응답 필드 추가
ha-yun May 20, 2025
0ea9d33
Refactor: 즐겨찾기 API-plcae rest통신 url을 .env파일을 통해 환경설정으로 분리
ha-yun May 20, 2025
2f0ac0f
Refactor: user 사용자 프로필 수정, 회원 전체 조회aPI member_id 누락 수정
ha-yun May 21, 2025
86362df
Refactor: 즐겨찾기 추가 API-잘못된 장소 type/id는 안들어가도록 수정
ha-yun May 21, 2025
053d2bb
Refactor: 행사 데이터- DB에 이미 있는 데이터 중 endDate가 지난 데이터 삭제
ha-yun May 22, 2025
32f1878
Refactor: place-행사 데이터 오류 수정
ha-yun May 23, 2025
cdd325a
Refactor: 즐겨찾기 추가 오류 수정중
ha-yun May 23, 2025
dfbb8ef
Refactor: 즐겨찾기 api - 내부 통신 로직 변경
ha-yun May 23, 2025
d96dd1e
로깅 관련 코드 수정
ByeongukYun May 26, 2025
1282179
JWTTokenProvider
YunHwa0905 May 26, 2025
6becebb
Refactor: place-로깅 관련 코드 수정 및 추가
ha-yun May 26, 2025
748621c
예외 처리(여행지 추천 기록 없는 경우)
ByeongukYun May 26, 2025
9cbf016
예외 처리(여행지 추천 기록 없는 경우) 2차 시도
ByeongukYun May 26, 2025
ba93cca
예외 처리(여행지 추천 기록 없는 경우) 3차 시도
ByeongukYun May 26, 2025
b940630
Refactor : 예외 처리(여행지 추천 기록 없는 경우) 3차 시도
ha-yun May 26, 2025
8df73df
Fix: 예외 처리(여행지 추천 기록 없는 경우)
ha-yun May 26, 2025
fc91acf
Refactor: gateway cors https url 추가
ha-yun May 27, 2025
e6109e5
회원탈퇴 수정
suminmmmmmmm May 28, 2025
26e95ae
Refactor: 즐겨찾기 조회 service 코드 수정
ha-yun May 28, 2025
9c75816
회원 탈퇴 시 추천 내역 삭제 적용
ByeongukYun May 28, 2025
cf52db0
Refactor: 행사 데이터 Lat null값일 때 저장 안되도록 수정
ha-yun May 29, 2025
cae24e5
Refactor: ai 리뷰요약 수정중
ha-yun May 30, 2025
621a041
Refactor: ai 리뷰요약 수정중
ha-yun May 30, 2025
776bc8b
Refactor: ai 리뷰요약 수정중
ha-yun May 30, 2025
2c2aaa5
Refactor: ai 리뷰요약 데이터 없을 시 발생하는 500에러 수정
ha-yun May 30, 2025
7dcf612
Refactor: 관광지 데이터 homepage_url 접속 가능한 링크만 저장
ha-yun May 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
256 changes: 256 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,256 @@
name: Backend Upload ECR

on:
push:
branches: [develop]
pull_request:
branches: [develop]


jobs:

external-info-service-build :
runs-on: ubuntu-latest
env:
IMAGE_TAG: 1.${{ github.run_number }}
steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ap-northeast-2

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
with:
mask-password: true

- name: 자바 설치
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'

- name: kubeconfig 설정
run: |
aws eks update-kubeconfig --region ap-northeast-2 --name one-cluster
echo "Step output: ${{ steps.set-ecr.outputs.registry }}"

- name: Build & Push external-info-service
env: # ecr 업로드 할 때 필요한 변수들 선언
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} # ecr 경로
run: |
cd external-info-service
echo "ECR_REGISTRY is: [$ECR_REGISTRY]"
echo "${{ secrets.BACKEND_ENV}}" > .env
gradle bootJar -x test
docker build -t $ECR_REGISTRY/external-info-service:$IMAGE_TAG .
docker tag $ECR_REGISTRY/external-info-service:$IMAGE_TAG $ECR_REGISTRY/external-info-service:latest

docker push $ECR_REGISTRY/external-info-service:$IMAGE_TAG
docker push $ECR_REGISTRY/external-info-service:latest

kubectl set image deployment/external-info-service external-info-service=$ECR_REGISTRY/external-info-service:$IMAGE_TAG -n backend
kubectl rollout status deployment/external-info-service -n backend

place-service-build:
runs-on: ubuntu-latest
env:
IMAGE_TAG: 1.${{ github.run_number }}
steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ap-northeast-2

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
with:
mask-password: true

- name: 자바 설치
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'

- name: kubeconfig 설정
run: |
aws eks update-kubeconfig --region ap-northeast-2 --name one-cluster
echo "Step output: ${{ steps.set-ecr.outputs.registry }}"

- name: Build & Push place-service
env: # ecr 업로드 할 때 필요한 변수들 선언
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} # ecr 경로
run: |
cd place-service
echo "${{ secrets.BACKEND_ENV}}" > .env
gradle bootJar -x test
docker build -t $ECR_REGISTRY/place-service:$IMAGE_TAG .
docker tag $ECR_REGISTRY/place-service:$IMAGE_TAG $ECR_REGISTRY/place-service:latest

docker push $ECR_REGISTRY/place-service:$IMAGE_TAG
docker push $ECR_REGISTRY/place-service:latest

echo "태그 확인: place-service=$ECR_REGISTRY/place-service:$IMAGE_TAG"

kubectl set image deployment/place-service place-service=$ECR_REGISTRY/place-service:$IMAGE_TAG -n backend
kubectl rollout status deployment/place-service -n backend

congestion-service-build:
runs-on: ubuntu-latest
env:
IMAGE_TAG: 1.${{ github.run_number }}
steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ap-northeast-2

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
with:
mask-password: true

- name: 자바 설치
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'

- name: kubeconfig 설정
run: |
aws eks update-kubeconfig --region ap-northeast-2 --name one-cluster
echo "Step output: ${{ steps.set-ecr.outputs.registry }}"
- name: Build & Push congestion-service
env: # ecr 업로드 할 때 필요한 변수들 선언
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} # ecr 경로
run: |
cd congestion-service
echo "${{ secrets.BACKEND_ENV}}" > .env
gradle bootJar -x test
docker build -t $ECR_REGISTRY/congestion-service:$IMAGE_TAG .
docker tag $ECR_REGISTRY/congestion-service:$IMAGE_TAG $ECR_REGISTRY/congestion-service:latest

docker push $ECR_REGISTRY/congestion-service:$IMAGE_TAG
docker push $ECR_REGISTRY/congestion-service:latest

kubectl set image deployment/congestion-service congestion-service=$ECR_REGISTRY/congestion-service:$IMAGE_TAG -n backend
kubectl rollout status deployment/congestion-service -n backend

user-service-build:
runs-on: ubuntu-latest
env:
IMAGE_TAG: 1.${{ github.run_number }}
steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ap-northeast-2

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
with:
mask-password: true

- name: 자바 설치
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'

- name: kubeconfig 설정
run: |
aws eks update-kubeconfig --region ap-northeast-2 --name one-cluster
echo "Step output: ${{ steps.set-ecr.outputs.registry }}"
- name: Build & Push gateway
env: # ecr 업로드 할 때 필요한 변수들 선언
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} # ecr 경로
run: |
cd user-service
echo "${{ secrets.BACKEND_USER_ENV}}" > .env
gradle bootJar -x test
docker build -t $ECR_REGISTRY/user-service:$IMAGE_TAG .
docker tag $ECR_REGISTRY/user-service:$IMAGE_TAG $ECR_REGISTRY/user-service:latest

ls -lh build/libs

docker push $ECR_REGISTRY/user-service:$IMAGE_TAG
docker push $ECR_REGISTRY/user-service:latest

kubectl set image deployment/user-service user-service=$ECR_REGISTRY/user-service:$IMAGE_TAG -n backend
kubectl rollout status deployment/user-service -n backend


gateway-build:
runs-on: ubuntu-latest
env:
IMAGE_TAG: 1.${{ github.run_number }}
steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_KEY }}
aws-region: ap-northeast-2

- name: Login to Amazon ECR
id: login-ecr
uses: aws-actions/amazon-ecr-login@v1
with:
mask-password: true

- name: 자바 설치
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17'

- name: kubeconfig 설정
run: |
aws eks update-kubeconfig --region ap-northeast-2 --name one-cluster
echo "Step output: ${{ steps.set-ecr.outputs.registry }}"
- name: Build & Push gateway
env: # ecr 업로드 할 때 필요한 변수들 선언
ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }} # ecr 경로
run: |
cd gateway
echo "${{ secrets.BACKEND_ENV}}" > .env
gradle bootJar -x test
docker build -t $ECR_REGISTRY/gateway:$IMAGE_TAG .
docker tag $ECR_REGISTRY/gateway:$IMAGE_TAG $ECR_REGISTRY/gateway:latest

docker push $ECR_REGISTRY/gateway:$IMAGE_TAG
docker push $ECR_REGISTRY/gateway:latest

echo "태그 확인: gateway=$ECR_REGISTRY/gateway:$IMAGE_TAG"

kubectl set image deployment/gateway gateway=$ECR_REGISTRY/gateway:$IMAGE_TAG -n backend
kubectl rollout status deployment/gateway -n backend

34 changes: 29 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,45 @@
# Back-STARS
SK쉴더스 루키즈 최종프로젝트 백엔드 리포지토리 입니다.

> Gateway : port 8080<br>
> congestion : port 8081<br>
> place : port 8082<br>
> user : port 8083

<details>
<summary>로컬에서 postgreSQL 테스트</summary>

#### 로컬에서 postgreSQL 테스트
1. Docker 이미지 다운로드 및 컨테이너 실행
`docker pull postgres:latest`

2. PostgreSQL 컨테이너 실행
`docker run --name my-postgres -e POSTGRES_USER=admin -e POSTGRES_PASSWORD=admin -e POSTGRES_DB=star -p 5432:5432 -d postgres:latest`
`docker run --name my-postgres -e POSTGRES_USER=root -e POSTGRES_PASSWORD=admin -e POSTGRES_DB=stars_db -p 5432:5432 -d postgres:latest`

3. Spring Boot 애플리케이션 설정
- 이제, Spring Boot 애플리케이션에서 PostgreSQL과 연결 설정. application.properties에 PostgreSQL 데이터베이스 설정 추가
```
spring.datasource.url=jdbc:postgresql://localhost:5432/star
spring.datasource.username=admin
spring.datasource.url=jdbc:postgresql://localhost:5432/stars_db
spring.datasource.username=root
spring.datasource.password=admin
spring.datasource.driver-class-name=org.postgresql.Driver
spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect
spring.jpa.hibernate.ddl-auto=update
```
```
</details>


<details>
<summary>PostgreSQL과 프로젝트 같이 띄우는 법</summary>

1. 프로젝트 최상위 디렉토리 (/place-service, docker-compose.yml과 Dockerfile이 있는 위치)에서 docker compose up --build 실행
2. 빌드가 완료되면 자동으로 Spring 로고가 나오면서 실행됨
3. 다른 cmd 창에서 docker exec -it my_postgres bash 실행
4. psql -U root -d stars_db 실행하면 접속이 될 것임
5. 접속한 후 \dt 로 테이블 존재 확인 가능, select 문으로 데이터 확인 가능
+ select * from area; 로 결과를 본 후, q 를 눌러야 다시 명령창으로 돌아갈 수 있음

</details>

<summary>토큰 redis에 저장</summary>
-

Binary file removed auth-service/.gradle/8.13/checksums/checksums.lock
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed auth-service/.gradle/8.13/fileHashes/fileHashes.lock
Binary file not shown.
Empty file.
Binary file not shown.
2 changes: 0 additions & 2 deletions auth-service/.gradle/buildOutputCleanup/cache.properties

This file was deleted.

Empty file.
1 change: 0 additions & 1 deletion auth-service/bin/main/application.properties

This file was deleted.

Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions congestion-service/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ build/
!gradle/wrapper/gradle-wrapper.jar
!**/src/main/**/build/
!**/src/test/**/build/
.env
src/main/resources/application.properties

### STS ###
.apt_generated
Expand Down
44 changes: 44 additions & 0 deletions congestion-service/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# 멀티스테이징 도커 파일 구성

# 소스코드를 빌드
# 빌드의 결과물 jar -> 가동
# 실습, 위의 목적을 달성하는 도커 파일 생성

# 스테이지 1-> jar를 생성(빌드), 과도기적 이미지, 용량이 커도 무방
# 그레이들 빌드 도구와 자바가 세팅된 이미지로부터 이미지 구성
FROM gradle:7.6-jdk AS builder

# 워킹 디렉토리(리눅스 기반 설정) 지정
WORKDIR /app

# 호스트 OS에서 백엔드 원소스 전체 카피

COPY . .

# 빌드
RUN chmod +x ./gradlew
RUN ./gradlew clean build -x test --no-daemon


# 최종 산출물 : /app/build/libs/*SNAPSHOT.jar

# 스테이지 2 -> jar를 가동 -> 경량!! -> 배포속도가 상승
# JDK17이 설치된 경량 버전의 리눅스 준비
FROM openjdk:17-jdk-slim

# 컨테이너 내부에 작업디렉토리 지정
WORKDIR /app

# jar 복사
# 스테이지1으로부터 특정위치에 존재하는 산출물을 현재 컨테이너의 작업디렉토리 루트에 복사

COPY --from=builder /app/build/libs/*SNAPSHOT.jar ./congestion.jar
# 포트지정

# env 파일 추가
COPY .env .env

EXPOSE 8082

# 서버가동
CMD ["java", "-jar", "congestion.jar"]
Loading