feat: (#60)

1. update springboot version
2. support websocket
3. redo interactive action handlers

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.3</version>
+        <version>3.0.6</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.jerry</groupId>
@@ -51,13 +51,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <scope>runtime</scope>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-configuration-processor</artifactId>
@@ -82,10 +75,10 @@
         <!--knife4j-->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <!--在引用时请在maven中央仓库搜索2.X最新版本号-->
-            <version>2.0.8</version>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
+            <version>4.4.0</version>
         </dependency>
+
         <!--validation-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -108,9 +101,16 @@
         <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-spring-boot-starter</artifactId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
             <version>1.37.0</version>
         </dependency>
+        <!-- Sa-Token 整合 jwt -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-jwt</artifactId>
+            <version>1.37.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-neo4j</artifactId>
@@ -128,19 +128,26 @@
         <dependency>
             <groupId>ognl</groupId>
             <artifactId>ognl</artifactId>
-            <version>3.1.12</version>
+            <version>3.4.2</version>
         </dependency>
         <!--    短信 sdk    -->
         <dependency>
             <groupId>com.apistd.uni</groupId>
             <artifactId>uni-sdk</artifactId>
             <version>0.0.4</version>
         </dependency>
+        <!--    七牛云 SDK    -->
         <dependency>
             <groupId>com.qiniu</groupId>
             <artifactId>qiniu-java-sdk</artifactId>
             <version>7.11.0</version>
         </dependency>
+        <!--    websocket    -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

src/main/java/com/jerry/pilipala/application/dto/CommentDTO.java

@@ -1,9 +1,9 @@
 package com.jerry.pilipala.application.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
 
 @Data
 @Accessors(chain = true)

src/main/java/com/jerry/pilipala/application/dto/DanmakuDTO.java

@@ -1,17 +1,15 @@
 package com.jerry.pilipala.application.dto;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+
 
 @Data
 @Accessors(chain = true)
 public class DanmakuDTO {
-    // 用户ID
-    @NotBlank(message = "弹幕作者不得为空")
-    private String author;
     @NotNull(message = "弹幕颜色不得为空")
     private Integer color;
     // 稿件ID

src/main/java/com/jerry/pilipala/application/dto/EmailLoginDTO.java

@@ -1,8 +1,8 @@
 package com.jerry.pilipala.application.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 
 @Data
 public class EmailLoginDTO {

src/main/java/com/jerry/pilipala/application/dto/LoginDTO.java

@@ -1,8 +1,8 @@
 package com.jerry.pilipala.application.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 
 @Data
 public class LoginDTO {

src/main/java/com/jerry/pilipala/application/dto/RoleSaveDTO.java

@@ -1,10 +1,10 @@
 package com.jerry.pilipala.application.dto;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data

src/main/java/com/jerry/pilipala/application/dto/UserUpdateDTO.java

@@ -1,9 +1,8 @@
 package com.jerry.pilipala.application.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 public class UserUpdateDTO {
     @NotBlank(message = "昵称不得为空")

src/main/java/com/jerry/pilipala/application/dto/VideoPostDTO.java

@@ -1,9 +1,9 @@
 package com.jerry.pilipala.application.dto;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data

src/main/java/com/jerry/pilipala/domain/common/services/RedisLimitManager.java

@@ -5,13 +5,13 @@
 import com.jerry.pilipala.infrastructure.common.response.StandardResponse;
 import com.jerry.pilipala.infrastructure.enums.LimitType;
 import com.jerry.pilipala.infrastructure.utils.RequestUtil;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

src/main/java/com/jerry/pilipala/domain/interactive/entity/BarrageInteractiveParam.java

@@ -0,0 +1,14 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+import com.jerry.pilipala.application.dto.DanmakuDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class BarrageInteractiveParam extends BaseInteractiveParam {
+    private Long cid;
+    private DanmakuDTO danmaku;
+}

src/main/java/com/jerry/pilipala/domain/interactive/entity/BaseInteractiveParam.java

@@ -0,0 +1,11 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+public class BaseInteractiveParam {
+    protected String selfUid = "unknown";
+}

src/main/java/com/jerry/pilipala/domain/interactive/entity/CommentInteractiveParam.java

@@ -0,0 +1,14 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+import com.jerry.pilipala.application.dto.CommentDTO;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class CommentInteractiveParam extends BaseInteractiveParam {
+    private Long cid;
+    private CommentDTO comment;
+}

src/main/java/com/jerry/pilipala/domain/interactive/entity/DeleteCommentInteractiveParam.java

@@ -0,0 +1,13 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class DeleteCommentInteractiveParam extends BaseInteractiveParam {
+    private Long cid;
+    private String commentId;
+}

src/main/java/com/jerry/pilipala/domain/interactive/entity/FollowInteractiveParam.java

@@ -0,0 +1,12 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class FollowInteractiveParam extends BaseInteractiveParam {
+    private String upUid;
+}

src/main/java/com/jerry/pilipala/domain/interactive/entity/PlayInteractiveParam.java

@@ -0,0 +1,14 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class PlayInteractiveParam extends BaseInteractiveParam {
+    private Long cid;
+    private String authorUid;
+    private Boolean valid;
+}

src/main/java/com/jerry/pilipala/domain/interactive/entity/UpdateTimeInteractiveParam.java

@@ -0,0 +1,15 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class UpdateTimeInteractiveParam extends BaseInteractiveParam {
+    private String bvId;
+    private Long cid;
+    private Integer time;
+    private String playActionId;
+}

src/main/java/com/jerry/pilipala/domain/interactive/entity/VodInteractiveParam.java

@@ -0,0 +1,12 @@
+package com.jerry.pilipala.domain.interactive.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class VodInteractiveParam extends BaseInteractiveParam {
+    private Long cid;
+}

src/main/java/com/jerry/pilipala/domain/interactive/handler/CoinInteractiveActionHandler.java

@@ -1,13 +1,14 @@
 package com.jerry.pilipala.domain.interactive.handler;
 
+import com.jerry.pilipala.domain.interactive.entity.BaseInteractiveParam;
+import com.jerry.pilipala.domain.interactive.entity.VodInteractiveParam;
 import com.jerry.pilipala.domain.vod.entity.mongo.interactive.VodInteractiveAction;
 import com.jerry.pilipala.infrastructure.enums.redis.VodCacheKeyEnum;
 import com.jerry.pilipala.infrastructure.enums.video.VodInteractiveActionEnum;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import java.util.Map;
 import java.util.Objects;
 
 @Component
@@ -18,10 +19,11 @@ public CoinInteractiveActionHandler(MongoTemplate mongoTemplate,
     }
 
     @Override
-    public VodInteractiveAction trigger(Map<String, Object> params) {
-        super.trigger(params);
-        String cid = params.get("cid").toString();
-        String uid = params.get("uid").toString();
+    public VodInteractiveAction handle(BaseInteractiveParam interactiveParam) {
+        super.handle(interactiveParam);
+        VodInteractiveParam param = (VodInteractiveParam) interactiveParam;
+        String cid = param.getCid().toString();
+        String uid = param.getSelfUid();
 
         String coinSetKey = VodCacheKeyEnum.SetKey.COIN_SET.concat(uid);
         if (Objects.nonNull(redisTemplate.opsForZSet().score(coinSetKey, cid))) {

src/main/java/com/jerry/pilipala/domain/interactive/handler/CollectInteractiveActionHandler.java

@@ -1,13 +1,14 @@
 package com.jerry.pilipala.domain.interactive.handler;
 
+import com.jerry.pilipala.domain.interactive.entity.BaseInteractiveParam;
+import com.jerry.pilipala.domain.interactive.entity.VodInteractiveParam;
 import com.jerry.pilipala.domain.vod.entity.mongo.interactive.VodInteractiveAction;
 import com.jerry.pilipala.infrastructure.enums.redis.VodCacheKeyEnum;
 import com.jerry.pilipala.infrastructure.enums.video.VodInteractiveActionEnum;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
-import java.util.Map;
 import java.util.Objects;
 
 @Component
@@ -18,10 +19,11 @@ public CollectInteractiveActionHandler(MongoTemplate mongoTemplate,
     }
 
     @Override
-    public VodInteractiveAction trigger(Map<String, Object> params) {
-        VodInteractiveAction interactiveAction = super.trigger(params);
+    public VodInteractiveAction handle(BaseInteractiveParam interactiveParam) {
+        VodInteractiveAction interactiveAction = super.handle(interactiveParam);
+        VodInteractiveParam param = (VodInteractiveParam) interactiveParam;
+        String cid = param.getCid().toString();
 
-        String cid = params.get("cid").toString();
         // 是取消收藏事件，点赞数 - 1，set 移除 uid
         String uid = interactiveAction.getUid();
         String collectSet = VodCacheKeyEnum.SetKey.COLLECT_SET.concat(String.valueOf(uid));