diff --git a/security/src/main/kotlin/com/van1164/security/OAuthSuccessHandlerReactive.kt b/security/src/main/kotlin/com/van1164/security/OAuthSuccessHandlerReactive.kt index 813b4c3..c21655c 100644 --- a/security/src/main/kotlin/com/van1164/security/OAuthSuccessHandlerReactive.kt +++ b/security/src/main/kotlin/com/van1164/security/OAuthSuccessHandlerReactive.kt @@ -1,6 +1,6 @@ package com.van1164.security -import com.van1164.common.redis.RedisR2dbcService +import com.van1164.common.redis.RedisService import com.van1164.common.security.PrincipalDetails import com.van1164.common.util.Utils.logger import com.van1164.user.UserService @@ -16,7 +16,7 @@ import reactor.core.publisher.Mono @Component(value = "authenticationSuccessHandler") class OAuthSuccessHandlerReactive( val userService: UserService, - val redisService: RedisR2dbcService, + val redisService: RedisService, val jwtTokenProvider: JwtTokenProvider, ) : ServerAuthenticationSuccessHandler { override fun onAuthenticationSuccess( diff --git a/user/src/main/kotlin/com/van1164/user/UserService.kt b/user/src/main/kotlin/com/van1164/user/UserService.kt index a3993b8..721d6b3 100644 --- a/user/src/main/kotlin/com/van1164/user/UserService.kt +++ b/user/src/main/kotlin/com/van1164/user/UserService.kt @@ -7,7 +7,6 @@ import reactor.core.publisher.Mono @Service -@EnableR2dbcRepositories(basePackageClasses = [UserRepository::class]) class UserService( val userRepository: UserRepository ) { diff --git a/user/src/main/kotlin/com/van1164/user/config/UserConfig.kt b/user/src/main/kotlin/com/van1164/user/config/UserConfig.kt new file mode 100644 index 0000000..e208e85 --- /dev/null +++ b/user/src/main/kotlin/com/van1164/user/config/UserConfig.kt @@ -0,0 +1,4 @@ +package com.van1164.user.config + +class UserConfig { +} \ No newline at end of file diff --git a/util/build.gradle.kts b/util/build.gradle.kts index 8b602dc..bb4deaf 100644 --- a/util/build.gradle.kts +++ b/util/build.gradle.kts @@ -18,7 +18,6 @@ dependencies { testImplementation("org.jetbrains.kotlin:kotlin-test") implementation("org.springframework.boot:spring-boot-starter-data-redis-reactive") implementation("com.amazonaws:aws-java-sdk-s3:1.12.638") - implementation("org.springframework.boot:spring-boot-starter-data-jpa") } tasks.test { diff --git a/util/src/main/kotlin/com/van1164/common/config/R2dbcConfig.kt b/util/src/main/kotlin/com/van1164/common/config/R2dbcConfig.kt new file mode 100644 index 0000000..6ab2ff5 --- /dev/null +++ b/util/src/main/kotlin/com/van1164/common/config/R2dbcConfig.kt @@ -0,0 +1,4 @@ +package com.van1164.common.config + +class R2dbcConfig { +} \ No newline at end of file diff --git a/util/src/main/kotlin/com/van1164/common/domain/BaseEntity.kt b/util/src/main/kotlin/com/van1164/common/domain/BaseEntity.kt deleted file mode 100644 index ef8592f..0000000 --- a/util/src/main/kotlin/com/van1164/common/domain/BaseEntity.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.van1164.common.domain - -import jakarta.persistence.Column -import jakarta.persistence.EntityListeners -import jakarta.persistence.MappedSuperclass -import org.springframework.data.annotation.CreatedDate -import org.springframework.data.annotation.LastModifiedDate -import org.springframework.data.jpa.domain.support.AuditingEntityListener -import java.time.LocalDateTime - -@MappedSuperclass -@EntityListeners(AuditingEntityListener::class) -abstract class BaseEntity{ - @CreatedDate - @Column(nullable = false, updatable = false) - protected var createDtm: LocalDateTime = LocalDateTime.MIN - - @LastModifiedDate - @Column(nullable = false) - protected var modifyDtm: LocalDateTime = LocalDateTime.MIN -} \ No newline at end of file diff --git a/util/src/main/kotlin/com/van1164/common/domain/LiveStream.kt b/util/src/main/kotlin/com/van1164/common/domain/LiveStream.kt index b0d175f..0668d32 100644 --- a/util/src/main/kotlin/com/van1164/common/domain/LiveStream.kt +++ b/util/src/main/kotlin/com/van1164/common/domain/LiveStream.kt @@ -1,45 +1,27 @@ package com.van1164.common.domain import com.van1164.common.dto.StreamDTO -import jakarta.persistence.* import org.springframework.data.annotation.CreatedDate +import org.springframework.data.annotation.Id import java.time.LocalDateTime -import java.time.ZoneId -import java.util.* -@Entity -@Table(name = "live_stream") data class LiveStream( - - @Column(name = "title") var title : String, - @Column(name = "description") var description : String, - - @Column(name = "user_name") val userName : String, - - @Column(name = "stream_key") val streamKey : String, @CreatedDate - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "created_date", nullable = false) - val createdDate : LocalDateTime= LocalDateTime.now(), + val createdDate : LocalDateTime = LocalDateTime.now(), - @Column(name = "on_air") var onAir : Boolean = false, @Id - @org.springframework.data.annotation.Id - @GeneratedValue(strategy = GenerationType.AUTO) val id : Long? = null, - @Column(name = "good") var good : Int = 0, - @Column(name = "bad") var bad : Int = 0, ){ diff --git a/util/src/main/kotlin/com/van1164/common/domain/SubComment.kt b/util/src/main/kotlin/com/van1164/common/domain/SubComment.kt index 5188801..0a43c7d 100644 --- a/util/src/main/kotlin/com/van1164/common/domain/SubComment.kt +++ b/util/src/main/kotlin/com/van1164/common/domain/SubComment.kt @@ -1,40 +1,35 @@ package com.van1164.common.domain -import com.van1164.common.domain.comment.Comment -import jakarta.persistence.* -import lombok.ToString -import java.util.* - -@Entity -@Table(name = "sub_comment") -data class SubComment( - @Column(name = "message") - val message: String, - - @ManyToOne - @ToString.Exclude - @JoinColumn(name = "user_id") - val user: User, - - @ManyToOne - @ToString.Exclude - @JoinColumn(name = "comment_id") - val comment: Comment, - - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "created_at", nullable = false) - val createDate : Date, - - @Column(name = "good") - var good: Int = 0, - - @Column(name = "bad") - var bad: Int = 0, - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - @Column(name = "sub_comment_id") - val id: Long? = null -) +//@Entity +//@Table(name = "sub_comment") +//data class SubComment( +// @Column(name = "message") +// val message: String, +// +// @ManyToOne +// @ToString.Exclude +// @JoinColumn(name = "user_id") +// val user: User, +// +// @ManyToOne +// @ToString.Exclude +// @JoinColumn(name = "comment_id") +// val comment: Comment, +// +// +// @Temporal(TemporalType.TIMESTAMP) +// @Column(name = "created_at", nullable = false) +// val createDate : Date, +// +// @Column(name = "good") +// var good: Int = 0, +// +// @Column(name = "bad") +// var bad: Int = 0, +// +// @Id +// @GeneratedValue(strategy = GenerationType.AUTO) +// @Column(name = "sub_comment_id") +// val id: Long? = null +//) diff --git a/util/src/main/kotlin/com/van1164/common/domain/User.kt b/util/src/main/kotlin/com/van1164/common/domain/User.kt deleted file mode 100644 index 663ad91..0000000 --- a/util/src/main/kotlin/com/van1164/common/domain/User.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.van1164.common.domain - -import com.van1164.common.dto.OAuthProvider -import com.van1164.common.dto.Role -import jakarta.persistence.* -import java.util.* - - -@Entity -@Table(name = "user") -data class User( - - @Id - @Column(name = "user_id") - val userId: String, - - @Column(name = "name") - val name: String, - - @Column(name ="email") - val email : String, - - @Column(name = "provider", nullable = false) - val provider : OAuthProvider, - - @Column(name ="password") - val password : String = "oAuthPassword", - - @Column(name ="role") - val role : Role = Role.USER, - - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "created_at", nullable = false) - val createDate : Date = Date.from(Date().toInstant()), - - @Column(name = "on_air") - var onAir: Boolean = false, -) diff --git a/util/src/main/kotlin/com/van1164/common/domain/UserR2dbc.kt b/util/src/main/kotlin/com/van1164/common/domain/UserR2dbc.kt index 267aacc..1b5731b 100644 --- a/util/src/main/kotlin/com/van1164/common/domain/UserR2dbc.kt +++ b/util/src/main/kotlin/com/van1164/common/domain/UserR2dbc.kt @@ -2,12 +2,12 @@ package com.van1164.common.domain import com.van1164.common.dto.OAuthProvider import com.van1164.common.dto.Role -import jakarta.persistence.Table import org.springframework.data.annotation.CreatedDate import org.springframework.data.annotation.Id +//import org.springframework.data.relational.core.mapping.Table import java.time.LocalDateTime -@Table(name = "user_r2dbc") +//@Table(name = "user_r2dbc") data class UserR2dbc( val userId: String, diff --git a/util/src/main/kotlin/com/van1164/common/domain/Video.kt b/util/src/main/kotlin/com/van1164/common/domain/Video.kt deleted file mode 100644 index 43f96a6..0000000 --- a/util/src/main/kotlin/com/van1164/common/domain/Video.kt +++ /dev/null @@ -1,47 +0,0 @@ -package com.van1164.common.domain - -import com.van1164.common.domain.comment.Comment -import jakarta.persistence.* -import lombok.ToString -import org.springframework.data.annotation.CreatedDate -import org.springframework.data.annotation.Transient -import java.util.* - -@Entity -@Table(name = "video") -data class Video( - - @Column(name = "title") - var title : String, - - @Id - @org.springframework.data.annotation.Id - @Column(name = "video_id") - var id : String, - - @Column(name = "user_id") - val userName : String, - - @Column(name = "thumbnail_url") - var thumbNailUrl : String?, - - - - @Column(name = "comments") - @ToString.Exclude - @OneToMany(mappedBy = "id", fetch = FetchType.LAZY) - @Transient - val commentList : MutableList = mutableListOf(), - - - @Column - var good : Int = 0, - - @Column - var bad : Int = 0, - - @CreatedDate - @Temporal(TemporalType.TIMESTAMP) - @Column(name = "created_at", nullable = false) - val createDate : Date = Date.from(Date().toInstant()), -) diff --git a/util/src/main/kotlin/com/van1164/common/domain/VideoLike.kt b/util/src/main/kotlin/com/van1164/common/domain/VideoLike.kt index 6b36e29..421d26e 100644 --- a/util/src/main/kotlin/com/van1164/common/domain/VideoLike.kt +++ b/util/src/main/kotlin/com/van1164/common/domain/VideoLike.kt @@ -1,9 +1,7 @@ package com.van1164.common.domain import org.springframework.data.annotation.Id -import org.springframework.data.relational.core.mapping.Table -@Table("video_like") data class VideoLike( val videoId : Long, diff --git a/util/src/main/kotlin/com/van1164/common/domain/VideoView.kt b/util/src/main/kotlin/com/van1164/common/domain/VideoView.kt index 9e4aadf..d15bfa2 100644 --- a/util/src/main/kotlin/com/van1164/common/domain/VideoView.kt +++ b/util/src/main/kotlin/com/van1164/common/domain/VideoView.kt @@ -1,9 +1,8 @@ package com.van1164.common.domain import org.springframework.data.annotation.Id -import org.springframework.data.relational.core.mapping.Table -@Table("video_view") + data class VideoView( val videoId : Long, diff --git a/util/src/main/kotlin/com/van1164/common/domain/comment/CommentBad.kt b/util/src/main/kotlin/com/van1164/common/domain/comment/CommentBad.kt index 7243077..e9c1d1e 100644 --- a/util/src/main/kotlin/com/van1164/common/domain/comment/CommentBad.kt +++ b/util/src/main/kotlin/com/van1164/common/domain/comment/CommentBad.kt @@ -1,9 +1,7 @@ package com.van1164.common.domain.comment import org.springframework.data.annotation.Id -import org.springframework.data.relational.core.mapping.Table -@Table("comment_bad") data class CommentBad( val commentId : Long, diff --git a/util/src/main/kotlin/com/van1164/common/domain/comment/CommentLike.kt b/util/src/main/kotlin/com/van1164/common/domain/comment/CommentLike.kt index 3d44565..c949973 100644 --- a/util/src/main/kotlin/com/van1164/common/domain/comment/CommentLike.kt +++ b/util/src/main/kotlin/com/van1164/common/domain/comment/CommentLike.kt @@ -1,9 +1,7 @@ package com.van1164.common.domain.comment import org.springframework.data.annotation.Id -import org.springframework.data.relational.core.mapping.Table -@Table("comment_like") data class CommentLike( val commentId : Long, diff --git a/util/src/main/kotlin/com/van1164/common/redis/RedisConfig.kt b/util/src/main/kotlin/com/van1164/common/redis/RedisConfig.kt index e152d66..3e9f744 100644 --- a/util/src/main/kotlin/com/van1164/common/redis/RedisConfig.kt +++ b/util/src/main/kotlin/com/van1164/common/redis/RedisConfig.kt @@ -65,6 +65,7 @@ class RedisConfig { redisTemplate.connectionFactory = redisConnectionFactory() redisTemplate.keySerializer = StringRedisSerializer() redisTemplate.valueSerializer = StringRedisSerializer() + redisTemplate.setEnableTransactionSupport(true) redisTemplate.afterPropertiesSet() return redisTemplate } diff --git a/util/src/main/kotlin/com/van1164/common/redis/RedisR2dbcRepository.kt b/util/src/main/kotlin/com/van1164/common/redis/RedisR2dbcRepository.kt deleted file mode 100644 index c080bb7..0000000 --- a/util/src/main/kotlin/com/van1164/common/redis/RedisR2dbcRepository.kt +++ /dev/null @@ -1,43 +0,0 @@ -package com.van1164.common.redis - -import com.fasterxml.jackson.databind.ObjectMapper -import org.springframework.data.redis.core.ReactiveRedisTemplate -import org.springframework.stereotype.Repository -import reactor.core.publisher.Mono -import java.time.Duration - - -@Repository -class RedisR2dbcRepository( - private val redisTemplate : ReactiveRedisTemplate, - private val mapper: ObjectMapper -) { - - fun increment(key: String): Mono { - return redisTemplate.opsForValue().increment(key) - } - - fun decrement(key: String): Mono { - return redisTemplate.opsForValue().decrement(key) - } - - - fun save(key : String, value : String, duration: Duration): Mono { - return redisTemplate.opsForValue().set(key,value, duration) - } - - fun load(key:String): Mono { - return redisTemplate.opsForValue().get(key) - } - - fun load(key : String, type : Class): Mono { - return redisTemplate.opsForValue() - .get(key) - .map { value-> mapper.readValue(value,type) } - } - - fun removeRtmp(streamKey: String): Mono { - return redisTemplate.opsForValue().getAndDelete(streamKey) - } - -} \ No newline at end of file diff --git a/util/src/main/kotlin/com/van1164/common/redis/RedisR2dbcService.kt b/util/src/main/kotlin/com/van1164/common/redis/RedisR2dbcService.kt deleted file mode 100644 index b2cfc1b..0000000 --- a/util/src/main/kotlin/com/van1164/common/redis/RedisR2dbcService.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.van1164.common.redis - -import com.fasterxml.jackson.databind.ObjectMapper -import com.van1164.common.domain.UserR2dbc -import com.van1164.util.JWT_PREFIX -import com.van1164.util.RTMP_ING_PREFIX -import com.van1164.util.RTMP_PREFIX -import org.springframework.stereotype.Service -import reactor.core.publisher.Mono -import java.time.Duration - - -@Service -class RedisR2dbcService ( - private val redisRepository: RedisR2dbcRepository, - private val mapper: ObjectMapper -) { - - fun saveRtmp(streamKey : String): Mono { - return redisRepository.save(RTMP_PREFIX + streamKey,"off", Duration.ofMinutes(10)) - } - - fun loadRtmp(streamKey: String): Mono { - return redisRepository.load(RTMP_PREFIX + streamKey) - } - - fun loadRtmpAndRemove(streamKey: String): Mono { - return redisRepository.removeRtmp(RTMP_PREFIX + streamKey) - } - - - fun saveJwt(jwt: String, user: UserR2dbc): Mono { - return redisRepository.save(JWT_PREFIX +jwt,mapper.writeValueAsString(user), Duration.ofHours(3)) - } - - fun loadByJwt(jwt: String): Mono { - return redisRepository.load(JWT_PREFIX +jwt, UserR2dbc::class.java) - } - - fun saveRtmpIng(key: String): Mono { - return redisRepository.save(RTMP_ING_PREFIX + key,"live", Duration.ofHours(12)) - } - - fun doneRtmpIng(streamKey: String): Mono { - return redisRepository.removeRtmp(RTMP_ING_PREFIX +streamKey) - } - - - -} \ No newline at end of file diff --git a/util/src/main/kotlin/com/van1164/common/redis/RedisRepository.kt b/util/src/main/kotlin/com/van1164/common/redis/RedisRepository.kt index fe99905..b8f58f9 100644 --- a/util/src/main/kotlin/com/van1164/common/redis/RedisRepository.kt +++ b/util/src/main/kotlin/com/van1164/common/redis/RedisRepository.kt @@ -1,29 +1,46 @@ package com.van1164.common.redis import com.fasterxml.jackson.databind.ObjectMapper -import org.springframework.data.redis.core.RedisTemplate +import org.springframework.data.redis.core.ReactiveRedisTemplate import org.springframework.stereotype.Repository +import reactor.core.publisher.Mono import java.time.Duration + @Repository -class RedisRepository(private val redisTemplate: RedisTemplate, - private val mapper: ObjectMapper) { +class RedisRepository( + private val redisTemplate : ReactiveRedisTemplate, + private val mapper: ObjectMapper +) { + + fun remove(key : String): Mono { + return redisTemplate.delete(key) + } + + fun increment(key: String): Mono { + return redisTemplate.opsForValue().increment(key) + } + + fun decrement(key: String): Mono { + return redisTemplate.opsForValue().decrement(key) + } - //val redisTemplate by lazy { RedisConfig().redisTemplate() } - fun save(key : String, value : String, duration: Duration){ - redisTemplate.opsForValue().set(key,value, duration) + fun save(key : String, value : String, duration: Duration): Mono { + return redisTemplate.opsForValue().set(key,value, duration) } - fun load(key:String): String? { + fun load(key:String): Mono { return redisTemplate.opsForValue().get(key) } - fun load(key : String, type : Class): T? { - return mapper.readValue(redisTemplate.opsForValue().get(key), type) + fun load(key : String, type : Class): Mono { + return redisTemplate.opsForValue() + .get(key) + .map { value-> mapper.readValue(value,type) } } - fun removeRtmp(streamKey: String): String? { + fun removeRtmp(streamKey: String): Mono { return redisTemplate.opsForValue().getAndDelete(streamKey) } diff --git a/util/src/main/kotlin/com/van1164/common/redis/RedisService.kt b/util/src/main/kotlin/com/van1164/common/redis/RedisService.kt index 992349b..d492cf2 100644 --- a/util/src/main/kotlin/com/van1164/common/redis/RedisService.kt +++ b/util/src/main/kotlin/com/van1164/common/redis/RedisService.kt @@ -1,49 +1,58 @@ package com.van1164.common.redis +import com.fasterxml.jackson.databind.ObjectMapper +import com.van1164.common.domain.UserR2dbc import com.van1164.util.JWT_PREFIX import com.van1164.util.RTMP_ING_PREFIX import com.van1164.util.RTMP_PREFIX -import com.fasterxml.jackson.databind.ObjectMapper -import com.van1164.common.domain.User +import com.van1164.util.SUBSCRIBE_PREFIX import org.springframework.stereotype.Service +import reactor.core.publisher.Mono import java.time.Duration @Service -class RedisService( +class RedisService ( private val redisRepository: RedisRepository, private val mapper: ObjectMapper ) { - fun saveRtmp(streamKey : String){ - redisRepository.save(RTMP_PREFIX + streamKey,"off",Duration.ofMinutes(10)) + fun saveRtmp(streamKey : String): Mono { + return redisRepository.save(RTMP_PREFIX + streamKey,"off", Duration.ofMinutes(10)) } - fun loadRtmp(streamKey: String): String? { + fun loadRtmp(streamKey: String): Mono { return redisRepository.load(RTMP_PREFIX + streamKey) } - fun loadRtmpAndRemove(streamKey: String): String? { + fun loadRtmpAndRemove(streamKey: String): Mono { return redisRepository.removeRtmp(RTMP_PREFIX + streamKey) } - fun saveJwt(jwt: String, user: User) { - redisRepository.save(JWT_PREFIX +jwt,mapper.writeValueAsString(user),Duration.ofHours(3)) + fun saveJwt(jwt: String, user: UserR2dbc): Mono { + return redisRepository.save(JWT_PREFIX +jwt,mapper.writeValueAsString(user), Duration.ofHours(3)) } - fun loadByJwt(jwt: String): User? { - return redisRepository.load(JWT_PREFIX +jwt, User::class.java) + fun loadByJwt(jwt: String): Mono { + return redisRepository.load(JWT_PREFIX +jwt, UserR2dbc::class.java) } - fun saveRtmpIng(key: String) { - redisRepository.save(RTMP_ING_PREFIX + key,"live",Duration.ofHours(12)) + fun saveRtmpIng(key: String): Mono { + return redisRepository.save(RTMP_ING_PREFIX + key,"live", Duration.ofHours(12)) } - fun doneRtmpIng(streamKey: String) { - redisRepository.removeRtmp(RTMP_ING_PREFIX +streamKey) + fun doneRtmpIng(streamKey: String): Mono { + return redisRepository.removeRtmp(RTMP_ING_PREFIX +streamKey) } + fun increaseSubscribe(userId:String): Mono { + return redisRepository.increment(SUBSCRIBE_PREFIX + userId) + } + + fun decreaseSubscribe(userId: String): Mono { + return redisRepository.decrement(SUBSCRIBE_PREFIX + userId) + } } \ No newline at end of file diff --git a/util/src/main/kotlin/com/van1164/common/util/Constant.kt b/util/src/main/kotlin/com/van1164/common/util/Constant.kt index f6d7f12..6312592 100644 --- a/util/src/main/kotlin/com/van1164/common/util/Constant.kt +++ b/util/src/main/kotlin/com/van1164/common/util/Constant.kt @@ -8,4 +8,5 @@ const val RTMP_ING_PREFIX = "RTMP_ING::" const val JWT_PREFIX = "JWT::" const val COMMENT_LIKE_PREFIX = "COMMENT_LIKE::" const val VIDEO_LIKE_PREFIX = "VIDEO_LIKE::" -const val VIDEO_VIEW_PREFIX = "VIDEO_VIEW::" \ No newline at end of file +const val VIDEO_VIEW_PREFIX = "VIDEO_VIEW::" +const val SUBSCRIBE_PREFIX = "SUBSCRIBE::" \ No newline at end of file diff --git a/video/src/main/kotlin/com/van1164/video/like/VideoLikeService.kt b/video/src/main/kotlin/com/van1164/video/like/VideoLikeService.kt index a776a92..4a07a74 100644 --- a/video/src/main/kotlin/com/van1164/video/like/VideoLikeService.kt +++ b/video/src/main/kotlin/com/van1164/video/like/VideoLikeService.kt @@ -1,7 +1,7 @@ package com.van1164.video.like import com.van1164.common.domain.VideoLike -import com.van1164.common.redis.RedisR2dbcRepository +import com.van1164.common.redis.RedisRepository import com.van1164.util.VIDEO_LIKE_PREFIX import org.springframework.http.ResponseEntity import org.springframework.stereotype.Service @@ -11,7 +11,7 @@ import reactor.kotlin.core.publisher.toMono @Service class VideoLikeService( private val videoLikeRepository: VideoLikeRepository, - private val redisR2dbcRepository: RedisR2dbcRepository + private val redisRepository: RedisRepository ) { fun videoLike(userName: String, videoId: Long): Mono> { @@ -19,7 +19,7 @@ class VideoLikeService( .flatMap { videoLikeRepository.save(it) }.flatMap { - redisR2dbcRepository.increment(VIDEO_LIKE_PREFIX+videoId) + redisRepository.increment(VIDEO_LIKE_PREFIX+videoId) } .map { ResponseEntity.ok(it) diff --git a/video/src/main/kotlin/com/van1164/video/view/service/VideoViewService.kt b/video/src/main/kotlin/com/van1164/video/view/service/VideoViewService.kt index 2907a28..13b3b14 100644 --- a/video/src/main/kotlin/com/van1164/video/view/service/VideoViewService.kt +++ b/video/src/main/kotlin/com/van1164/video/view/service/VideoViewService.kt @@ -1,7 +1,7 @@ package com.van1164.video.view.service import com.van1164.common.domain.VideoView -import com.van1164.common.redis.RedisR2dbcRepository +import com.van1164.common.redis.RedisRepository import com.van1164.util.VIDEO_VIEW_PREFIX import com.van1164.video.view.repository.VideoViewRepository import org.springframework.http.ResponseEntity @@ -12,7 +12,7 @@ import reactor.kotlin.core.publisher.toMono @Service class VideoViewService( private val videoViewRepository: VideoViewRepository, - private val redisR2dbcRepository: RedisR2dbcRepository + private val redisRepository: RedisRepository ) { fun videoView(userId:String, videoId:Long): Mono> { @@ -21,7 +21,7 @@ class VideoViewService( videoViewRepository.save(it) } .flatMap { - redisR2dbcRepository.increment(VIDEO_VIEW_PREFIX + it.videoId) + redisRepository.increment(VIDEO_VIEW_PREFIX + it.videoId) } .map { ResponseEntity.ok(it)