Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Car 페이지 정보를 반환하는 메서드 수정 #81

Merged
merged 17 commits into from
Aug 12, 2024
Merged

[Fix] Car 페이지 정보를 반환하는 메서드 수정 #81

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
9948488
config: jwt 속성을 yml에 설정
Jul 29, 2024
e75815c
rebase: 원본 develop 브랜치와 병합
Jul 30, 2024
5fb3179
feat: 어드민 회원가입 요청 dto 구현
Aug 11, 2024
fd59180
feat: swagger controller 구현
Aug 11, 2024
a004d7d
feat: 어드민 회원가입 controller 메서드 구현
Aug 11, 2024
1e301e6
feat: 어드민 로그인 요청 dto 수정
Aug 11, 2024
07d1059
feat: 어드민 회원가입 기능 구현
Aug 11, 2024
43629c1
feat: 메서드 추가
Aug 11, 2024
60fabc2
feat: swagger, admin url 추가
Aug 11, 2024
4681d8d
feat: swagger 서버 주소 변경
Aug 11, 2024
336fc68
feat: cors 설정
Aug 11, 2024
3ba439a
feat: 특정 url에 대해서 인가 검사 하지 않도록 구현
Aug 11, 2024
d721ebc
refactor: CarVideoInfo 내부클래스 삭제
Aug 12, 2024
6b5d3a1
refactor: CarVideoInfo를 사용하지 않도록 변경
Aug 12, 2024
a3cbe12
refactor: TODO 삭제
Aug 12, 2024
9367e08
fix: 변수명 변경
Aug 12, 2024
d61b477
Merge branch 'develop' into feature/77
hyeokson Aug 12, 2024
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
4 changes: 2 additions & 2 deletions src/main/java/com/softeer/backend/fo_domain/mainpage/service/MainPageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ public MainPageCarResponseDto getCarPage(){
.imgContent(staticResourcesUtil.getData("CHARGING_IMAGE_CONTENT"))
.imgUrl(staticResourcesUtil.getData("charging_thumbnail_image"))
.backgroundImgUrl(staticResourcesUtil.getData("charging_background_image"))
.carDetailInfoList(Arrays.asList(carDetailInfo3_1, carDetailInfo3_2))
.carDetailInfoList(Arrays.asList(carDetailInfo4_1, carDetailInfo4_2))
.build();

MainPageCarResponseDto.CarDetailInfo carDetailInfo5_1 = MainPageCarResponseDto.CarDetailInfo.builder()
Expand All @@ -157,7 +157,7 @@ public MainPageCarResponseDto getCarPage(){
.imgContent(staticResourcesUtil.getData("SAFE_IMAGE_CONTENT"))
.imgUrl(staticResourcesUtil.getData("safe_thumbnail_image"))
.backgroundImgUrl(staticResourcesUtil.getData("safe_background_image"))
.carDetailInfoList(Arrays.asList(carDetailInfo4_1, carDetailInfo4_2))
.carDetailInfoList(Arrays.asList(carDetailInfo5_1, carDetailInfo5_2))
.build();

return MainPageCarResponseDto.builder()
Expand Down
Loading