klaus/sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: klaus:test
Branches Tags
klaus:test klaus:main
...
compare: klaus:38ef6e5583c4d0337a22ff5805f30ab8346a4f33
Branches Tags
klaus:main klaus:test

123 Commits
test ... 38ef6e5583

Author SHA1 Message Date
klaus
38ef6e5583 Merge pull request 'test' (#123) from test into main 
Reviewed-on: #123
 2024-02-05 02:12:10 +00:00
klaus
c0b15b5d94 Merge pull request '콘텐츠 업로드' (#122) from test into main 
Reviewed-on: #122
 2024-01-30 03:45:31 +00:00
klaus
2cfc067ea1 Merge pull request '콘텐츠 전체 리스트' (#121) from test into main 
Reviewed-on: #121
 2024-01-29 09:00:23 +00:00
klaus
a91db4f956 Merge pull request '콘텐츠 상단 고정 기능 추가' (#120) from test into main 
Reviewed-on: #120
 2024-01-29 02:45:41 +00:00
klaus
8a09780a02 Merge pull request 'test' (#119) from test into main 
Reviewed-on: #119
 2024-01-26 06:19:49 +00:00
klaus
45e8ec6505 Merge pull request '콘텐츠 정렬 기준' (#118) from test into main 
Reviewed-on: #118
 2024-01-24 15:03:06 +00:00
klaus
4554b85914 Merge pull request '회원가입 시 닉네임 validation 조건' (#117) from test into main 
Reviewed-on: #117
 2024-01-24 07:11:23 +00:00
klaus
8aa79c4a9c Merge pull request '콘텐츠 등록 - 태그 등록' (#116) from test into main 
Reviewed-on: #116
 2024-01-16 15:19:59 +00:00
klaus
c8d3210b57 Merge pull request 'test' (#115) from test into main 
Reviewed-on: #115
 2024-01-11 09:05:44 +00:00
klaus
2282a49563 Merge pull request 'test' (#114) from test into main 
Reviewed-on: #114
 2024-01-11 03:49:53 +00:00
klaus
b82fdfb2c8 Merge pull request '예약 업로드' (#113) from test into main 
Reviewed-on: #113
 2024-01-10 16:59:51 +00:00
klaus
2d17eac199 Merge pull request '19세 미만이 인증처리 되던 버그 수정' (#112) from test into main 
Reviewed-on: #112
 2024-01-08 10:07:21 +00:00
klaus
e482bc3aad Merge pull request '콘텐츠를 올린 크리에이터가 댓글을 삭제할 수 있도록 수정' (#111) from test into main 
Reviewed-on: #111
 2024-01-04 11:36:43 +00:00
klaus
ec022b74d1 Merge pull request '캔 쿠폰 조회 로직 수정' (#110) from test into main 
Reviewed-on: #110
 2024-01-04 09:59:20 +00:00
klaus
dc42c09ce3 Merge pull request '캔 쿠폰 조회' (#109) from test into main 
Reviewed-on: #109
 2024-01-03 15:48:09 +00:00
klaus
046a34d2a4 Merge pull request 'test' (#108) from test into main 
Reviewed-on: #108
 2024-01-03 15:19:42 +00:00
klaus
9ff6ec1888 Merge pull request '캔 쿠폰 시스템' (#107) from test into main 
Reviewed-on: #107
 2024-01-03 11:28:48 +00:00
klaus
d2950106ec Merge pull request '콘텐츠 랭킹 - 후원 순위 제거, 룰렛 아이템 개수 10로 변경' (#106) from test into main 
Reviewed-on: #106
 2023-12-26 12:50:09 +00:00
klaus
962f800d2e Merge pull request '팔로우 한 크리에이터 커뮤니티 게시물 조회 - 인증하지 않은 사람은 19금이 아닌 최신 게시물이 조회되도록 수정' (#105) from test into main 
Reviewed-on: #105
 2023-12-25 08:19:43 +00:00
klaus
962107e507 Merge pull request '팔로우 한 크리에이터 커뮤니티 게시물 조회 - 차단된 유저는 조회되지 않도록 수정' (#104) from test into main 
Reviewed-on: #104
 2023-12-21 19:28:10 +00:00
klaus
039bd11963 Merge pull request '커뮤니티 게시물 조회 - 차단된 유저는 조회되지 않도록 수정' (#103) from test into main 
Reviewed-on: #103
 2023-12-21 19:05:12 +00:00
klaus
5c250ea4ae Merge pull request '크리에이터 커뮤니티' (#102) from test into main 
Reviewed-on: #102
 2023-12-21 15:10:55 +00:00
klaus
e3405bcec6 Merge pull request 'test' (#101) from test into main 
Reviewed-on: #101
 2023-12-13 16:14:50 +00:00
klaus
0fd1c2235f Merge pull request '라이브 정산 - 정렬 순서 추가 (라이브 방 id, 구분)' (#100) from test into main 
Reviewed-on: #100
 2023-12-10 16:58:05 +00:00
klaus
b20c29b022 Merge pull request 'test' (#99) from test into main 
Reviewed-on: #99
 2023-12-10 12:34:51 +00:00
klaus
12d5dcd298 Merge pull request 'test' (#98) from test into main 
Reviewed-on: #98
 2023-12-10 09:02:29 +00:00
klaus
2c305dc6c6 Merge pull request 'test' (#97) from test into main 
Reviewed-on: #97
 2023-12-10 06:48:43 +00:00
klaus
62f76f7433 Merge pull request 'test' (#96) from test into main 
Reviewed-on: #96
 2023-12-07 01:46:33 +00:00
klaus
858ce524f9 Merge pull request 'test' (#95) from test into main 
Reviewed-on: #95
 2023-11-27 12:48:24 +00:00
klaus
3795fb4a40 Merge pull request 'test' (#94) from test into main 
Reviewed-on: #94
 2023-11-24 07:03:10 +00:00
klaus
0c01aeec50 Merge pull request '관리자 - 이벤트 배너 등록' (#93) from test into main 
Reviewed-on: #93
 2023-11-21 16:21:19 +00:00
klaus
892206744d Merge pull request '이벤트 배너, 팝업' (#92) from test into main 
Reviewed-on: #92
 2023-11-21 12:59:30 +00:00
klaus
9e2c1474db Merge pull request '메시지 보내기 유저 검색' (#91) from test into main 
Reviewed-on: #91
 2023-11-20 05:41:57 +00:00
klaus
16328f73d9 Merge pull request '크리에이터 관리자, 관리자 - 일자별 콘텐츠 후원 정산 API' (#90) from test into main 
Reviewed-on: #90
 2023-11-14 13:14:19 +00:00
klaus
e0d4f53cf4 Merge pull request 'test' (#89) from test into main 
Reviewed-on: #89
 2023-11-14 12:15:51 +00:00
klaus
e09a59c5b4 Merge pull request 'test' (#88) from test into main 
Reviewed-on: #88
 2023-11-14 11:09:14 +00:00
klaus
049e654535 Merge pull request '관리자 일자별 콘텐츠 후원 정산 - 크리에이터 순으로 정렬' (#87) from test into main 
Reviewed-on: #87
 2023-11-14 09:22:38 +00:00
klaus
c927dc4ecd Merge pull request '관리자 - 일자별 콘텐츠 후원 정산 페이지 추가' (#86) from test into main 
Reviewed-on: #86
 2023-11-14 09:03:35 +00:00
klaus
fe4ecd0ad8 Merge pull request '크리에이터 관리자 - 일자별 콘텐츠 정산 페이징 안되는 버그 수정' (#85) from test into main 
Reviewed-on: #85
 2023-11-14 05:17:58 +00:00
klaus
78d476fe80 Merge pull request '라이브 상세 - 시작 시간 dateformat yyyy.MM.dd E hh:mm a 로 복구' (#84) from test into main 
Reviewed-on: #84
 2023-11-14 03:31:54 +00:00
klaus
a11c8465d5 Merge pull request '크리에이터 관리자 - @JsonProperty 추가' (#83) from test into main 
Reviewed-on: #83
 2023-11-13 16:10:57 +00:00
klaus
366304a9b7 Merge pull request '크리에이터 관리자 - 정산 API 캐시 추가' (#82) from test into main 
Reviewed-on: #82
 2023-11-13 15:56:58 +00:00
klaus
4356663688 Merge pull request '크리에이터 관리자 - 콘텐츠 누적 매출 API' (#81) from test into main 
Reviewed-on: #81
 2023-11-13 15:23:53 +00:00
klaus
26b55e6fcf Merge pull request '콘텐츠 누적 매출 API - orderType 추가' (#80) from test into main 
Reviewed-on: #80
 2023-11-13 14:48:47 +00:00
klaus
0d743f7204 Merge pull request '콘텐츠 누적 매출 API 추가' (#79) from test into main 
Reviewed-on: #79
 2023-11-13 13:42:17 +00:00
klaus
6cbe113b3e Merge pull request '크리에이터 콘텐츠 정산 - API 추가' (#78) from test into main 
Reviewed-on: #78
 2023-11-13 10:03:02 +00:00
klaus
6409b69d6c Merge pull request '콘텐츠 정산 - 결과값에 JsonProperty 를 추가하여 데이터 파싱이 진행 되도록 수정' (#77) from test into main 
Reviewed-on: #77
 2023-11-10 13:19:06 +00:00
klaus
c5164c76fc Merge pull request '콘텐츠 정산 - group by 날짜 수정' (#76) from test into main 
Reviewed-on: #76
 2023-11-10 12:46:07 +00:00
klaus
baade8e138 Merge pull request 'test' (#75) from test into main 
Reviewed-on: #75
 2023-11-10 10:47:11 +00:00
klaus
b848d6b4e0 Merge pull request 'test' (#74) from test into main 
Reviewed-on: #74
 2023-11-09 11:18:20 +00:00
klaus
d8139d2ab0 Merge pull request '라이브 리스트, 라이브 상세' (#73) from test into main 
Reviewed-on: #73
 2023-11-07 16:48:25 +00:00
klaus
e96d8f7469 Merge pull request 'test' (#72) from test into main 
Reviewed-on: #72
 2023-11-07 16:23:11 +00:00
klaus
2acffd8afc Merge pull request '콘텐츠 메인 API - 캐싱을 적용하기 위해 AudioContentMainManageService 추가' (#71) from test into main 
Reviewed-on: #71
 2023-11-07 11:24:40 +00:00
klaus
3c8e72073c Merge pull request '콘텐츠 메인 API - @Transactional(readOnly = true) 추가' (#70) from test into main 
Reviewed-on: #70
 2023-11-07 08:47:47 +00:00
klaus
724d7a9d9b Merge pull request 'test' (#69) from test into main 
Reviewed-on: #69
 2023-11-07 08:21:56 +00:00
klaus
2da3b0db78 Merge pull request 'test' (#68) from test into main 
Reviewed-on: #68
 2023-11-06 09:26:36 +00:00
klaus
685ad7afaf Merge pull request '콘텐츠 메인 캐싱전략 수정' (#67) from test into main 
Reviewed-on: #67
 2023-11-06 08:46:55 +00:00
klaus
264cf75964 Merge pull request '콘텐츠 메인 - 큐레이션 개수 15개만 노출' (#66) from test into main 
Reviewed-on: #66
 2023-11-06 08:11:00 +00:00
klaus
c773dbc7b5 Merge pull request '콘텐츠 랭킹 - 후원 랭킹 조회 로직 수정' (#65) from test into main 
Reviewed-on: #65
 2023-11-04 14:24:46 +00:00
klaus
37cbc64f52 Merge pull request '본인인증' (#64) from test into main 
Reviewed-on: #64
 2023-11-03 07:48:02 +00:00
klaus
cb1dde17bb Merge pull request 'test' (#63) from test into main 
Reviewed-on: #63
 2023-11-02 12:18:29 +00:00
klaus
c29988acf4 Merge pull request '콘텐츠 주문 - 대여만 가능한 콘텐츠의 경우 소장으로 주문이 들어오더라도 대여로 처리되도록 로직 수정' (#62) from test into main 
Reviewed-on: #62
 2023-11-01 04:49:18 +00:00
klaus
eadbf56dae Merge pull request '정산테이블에 무료충전 코인도 반영되도록 수정' (#61) from test into main 
Reviewed-on: #61
 2023-10-28 08:42:29 +00:00
klaus
4b3b455135 Merge pull request '캔 사용 시 제휴보상 캔도 사용할 수 있도록 수정' (#60) from test into main 
Reviewed-on: #60
 2023-10-27 13:48:33 +00:00
klaus
e6ac177396 Merge pull request '충전내역 - 결제수단에 "제휴보상" 표시' (#59) from test into main 
Reviewed-on: #59
 2023-10-26 18:48:46 +00:00
klaus
3d0e29003f Merge pull request '충전내역 - 결제수단에 "제휴보상" 표시' (#58) from test into main 
Reviewed-on: #58
 2023-10-26 18:22:10 +00:00
klaus
78b9b00f77 Merge pull request '충전내역 - 결제수단에 "제휴보상" 표시' (#57) from test into main 
Reviewed-on: #57
 2023-10-26 18:02:16 +00:00
klaus
0ee7faa551 Merge pull request '카울리를 이용한 무료충전 테이블 adProfit 과 point 타입 int -> float 로 변경' (#56) from test into main 
Reviewed-on: #56
 2023-10-26 16:55:39 +00:00
klaus
e5fdced681 Merge pull request '콘텐츠 메인 캐싱 전략 변경' (#55) from test into main 
Reviewed-on: #55
 2023-10-26 16:14:37 +00:00
klaus
afb99fef64 Merge pull request 'GetAudioContentMainItem - adult를 isAdult로 변경, 캐시 제거' (#54) from test into main 
Reviewed-on: #54
 2023-10-24 11:39:56 +00:00
klaus
7dfaa36024 Merge pull request 'test' (#53) from test into main 
Reviewed-on: #53
 2023-10-24 10:42:10 +00:00
klaus
0496f665aa Merge pull request 'getAudioContentMainBannerList 부분 캐시 제거' (#52) from test into main 
Reviewed-on: #52
 2023-10-17 10:02:53 +00:00
klaus
0d19e1be74 Merge pull request 'audio content banner - lazy 옵션으로 인해 발생하는 com.fasterxml.jackson.databind.exc.InvalidDefinitionException 문제 수정' (#51) from test into main 
Reviewed-on: #51
 2023-10-17 09:47:44 +00:00
klaus
4aff0111aa Merge pull request '로딩 속도를 위해 @Cacheable 적용' (#50) from test into main 
Reviewed-on: #50
 2023-10-17 09:31:08 +00:00
klaus
63b3ba2bb2 Merge pull request '인기 콘텐츠 전체보기 집계날짜 수정' (#49) from test into main 
Reviewed-on: #49
 2023-10-16 13:59:28 +00:00
klaus
7444b41f60 Merge pull request '콘텐츠 메인 - 인기 콘텐츠 집계날짜 수정' (#48) from test into main 
Reviewed-on: #48
 2023-10-16 13:42:31 +00:00
klaus
8e90dbc8b6 Merge pull request '구매목록 - isActive 가 true 인 것만 조회되도록 수정' (#47) from test into main 
Reviewed-on: #47
 2023-10-16 03:30:10 +00:00
klaus
9f70722521 Merge pull request '탐색 인기 크리에이터 - 날짜 설명 글 수정' (#46) from test into main 
Reviewed-on: #46
 2023-10-14 21:43:48 +00:00
klaus
52fae596fa Merge pull request '콘텐츠 랭킹 데이터 전체보기 API - 페이징 추가' (#45) from test into main 
Reviewed-on: #45
 2023-10-14 21:20:19 +00:00
klaus
ccb67957bc Merge pull request '콘텐츠 랭킹 추가' (#44) from test into main 
Reviewed-on: #44
 2023-10-14 19:37:55 +00:00
klaus
fb82538d0d Merge pull request '캔 소비 - 콘텐츠 주문시 캔 소비내역에 콘텐츠 내용 추가' (#43) from test into main 
Reviewed-on: #43
 2023-10-14 11:33:59 +00:00
klaus
72ee39612e Merge pull request '탐색 - 인기 급상승 제거, 인기 크리에이터 섹션 추가' (#42) from test into main 
Reviewed-on: #42
 2023-10-13 15:41:25 +00:00
klaus
51fd5408dc Merge pull request 'test' (#41) from test into main 
Reviewed-on: #41
 2023-10-06 08:50:32 +00:00
klaus
3fae40fbef Merge pull request '콘텐츠 상세 - 댓글 수 로직 답글 포함하지 않도록 수정' (#40) from test into main 
Reviewed-on: #40
 2023-10-05 02:49:22 +00:00
klaus
0745890af0 Merge pull request 'test' (#39) from test into main 
Reviewed-on: #39
 2023-10-04 03:24:41 +00:00
klaus
4abe1730a7 Merge pull request '관리자 라이브 정산 API - 인원 추가' (#38) from test into main 
Reviewed-on: #38
 2023-10-03 12:10:51 +00:00
klaus
626f0e6989 Merge pull request '관리자 - 라이브 정산 API 추가' (#37) from test into main 
Reviewed-on: #37
 2023-10-03 09:28:04 +00:00
klaus
9f42d9d173 Merge pull request '라이브 시작 알림 - 알림 받을 유저 조회에서 에러가 발생하는 버그 수정' (#36) from test into main 
Reviewed-on: #36
 2023-10-02 13:00:11 +00:00
klaus
f90a93c4bc Merge pull request '후원순위 - 유료라이브 입장 캔 반영' (#35) from test into main 
Reviewed-on: #35
 2023-09-27 14:57:27 +00:00
klaus
8000ad6c6a Merge pull request 'test' (#34) from test into main 
Reviewed-on: #34
 2023-09-27 06:49:21 +00:00
klaus
1f1f1bea1a Merge pull request 'test' (#33) from test into main 
Reviewed-on: #33
 2023-09-27 05:28:04 +00:00
klaus
d95460c7cd Merge pull request '닉네임 변경 가격 100 캔으로 변경' (#32) from test into main 
Reviewed-on: #32
 2023-09-22 07:01:27 +00:00
klaus
a3d93d4b08 Merge pull request 'test' (#31) from test into main 
Reviewed-on: #31
 2023-09-19 06:32:22 +00:00
klaus
07a92af982 Merge pull request '라이브 시작시간 4시간이 지나도 라이브를 시작하지 않은 경우 자동취소로직 추가' (#30) from test into main 
Reviewed-on: #30
 2023-09-12 14:09:37 +00:00
klaus
f4618877d4 Merge pull request '주문목록 - 크리에이터 닉네임 추가' (#29) from test into main 
Reviewed-on: #29
 2023-09-08 16:29:30 +00:00
klaus
2b914fd222 Merge pull request 'test' (#28) from test into main 
Reviewed-on: #28
 2023-09-02 16:12:08 +00:00
klaus
109e42a5a3 Merge pull request 'test' (#27) from test into main 
Reviewed-on: #27
 2023-08-31 08:37:42 +00:00
klaus
fa515ad39c Merge pull request '관리자 캔 충전내역 - 애플 인 앱 결제에 PG결제가 같이 나오던 버그 수정' (#26) from test into main 
Reviewed-on: #26
 2023-08-30 10:02:32 +00:00
klaus
f09673a795 Merge pull request 'test' (#25) from test into main 
Reviewed-on: #25
 2023-08-30 08:10:29 +00:00
klaus
f71536c614 Merge pull request 'test' (#24) from test into main 
Reviewed-on: #24
 2023-08-30 07:24:14 +00:00
klaus
7bdddc7ae8 Merge pull request '후원 전체보기 - 하단 랭킹에 콘텐츠 후원도 포함' (#23) from test into main 
Reviewed-on: #23
 2023-08-29 15:22:09 +00:00
klaus
aa8926a624 Merge pull request '후원 전체보기 - 상단 캔 현황 을 후원 캔만 반영하도록 수정' (#22) from test into main 
Reviewed-on: #22
 2023-08-29 14:53:44 +00:00
klaus
be71e59be2 Merge pull request '무료 콘텐츠를 못올리는 버그 수정' (#21) from test into main 
Reviewed-on: #21
 2023-08-29 13:32:13 +00:00
klaus
4d7753378f Merge pull request 'test' (#20) from test into main 
Reviewed-on: #20
 2023-08-29 07:33:57 +00:00
klaus
60257c4ef4 Merge pull request 'test' (#19) from test into main 
Reviewed-on: #19
 2023-08-28 08:54:08 +00:00
klaus
1e0b79bf62 Merge pull request 'test' (#18) from test into main 
Reviewed-on: #18
 2023-08-27 12:28:42 +00:00
klaus
6883434d0d Merge pull request '유저 관심사, 라이브 관심사 - 연령제한 설정 추가' (#17) from test into main 
Reviewed-on: #17
 2023-08-25 08:38:51 +00:00
klaus
eda2193e64 Merge pull request 'test' (#16) from test into main 
Reviewed-on: #16
 2023-08-25 07:50:55 +00:00
klaus
99bf829c88 Merge pull request '첫 충전 이벤트 - 본인인증한 전체 계정 중 첫 충전 시에만 첫충전 이벤트 적용' (#15) from test into main 
Reviewed-on: #15
 2023-08-24 16:26:54 +00:00
klaus
5feafe1b48 Merge pull request 'test' (#14) from test into main 
Reviewed-on: #14
 2023-08-24 14:54:37 +00:00
klaus
c9292b7d04 Merge pull request 'test' (#13) from test into main 
Reviewed-on: #13
 2023-08-23 14:05:00 +00:00
klaus
ae7e1a91c1 Merge pull request '캔 충전로직 수정' (#12) from test into main 
Reviewed-on: #12
 2023-08-21 15:12:44 +00:00
klaus
3e1887e0d1 Merge pull request 'test' (#11) from test into main 
Reviewed-on: #11
 2023-08-21 13:19:03 +00:00
klaus
474646db47 Merge pull request '스피커 최대 10 -> 5명으로 수정' (#10) from test into main 
Reviewed-on: #10
 2023-08-20 20:40:23 +00:00
klaus
56f7b6c449 Merge pull request 'test' (#9) from test into main 
Reviewed-on: #9
 2023-08-20 19:22:23 +00:00
klaus
76b2b5f7e3 Merge pull request '캔 사용내역 - 후원을 콘텐츠 후원, 라이브 후원으로 분리' (#8) from test into main 
Reviewed-on: #8
 2023-08-20 15:46:30 +00:00
klaus
e918d809eb Merge pull request '충전내역 - 관리자 지급 추가' (#7) from test into main 
Reviewed-on: #7
 2023-08-20 15:08:35 +00:00
klaus
7af059e543 Merge pull request 'test' (#6) from test into main 
Reviewed-on: #6
 2023-08-20 14:45:39 +00:00
klaus
897726e1ec Merge pull request 'test' (#5) from test into main 
Reviewed-on: #5
 2023-08-19 17:47:16 +00:00
klaus
8b98a2dd07 Merge pull request '비밀번호 찾기 API 추가' (#4) from test into main 
Reviewed-on: #4
 2023-08-19 07:05:17 +00:00
klaus
cca75420f0 Merge pull request '큐레이션 - 조건 추가' (#3) from test into main 
Reviewed-on: #3
 2023-08-18 14:07:34 +00:00
klaus
86c627ed1d Merge pull request 'test' (#2) from test into main 
Reviewed-on: #2
 2023-08-18 12:54:09 +00:00
klaus
d55514e3a7 Merge pull request 'test' (#1) from test into main 
Reviewed-on: #1
 2023-08-16 02:30:36 +00:00
Expand all files Collapse all files

Diff Content Not Available