content-service 将 comment 相关代码放到 app.data 包

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/CommentController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/CommentController.java

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.content.app.vod.controller;
+package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.content.api.dto.comment.CommentSbtDto;
 import cn.reghao.tnb.content.api.dto.comment.UserReply;
-import cn.reghao.tnb.content.app.vod.service.CommentService;
+import cn.reghao.tnb.content.app.data.service.CommentService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/DanmakuController.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/DanmakuController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.vod.controller;
+package cn.reghao.tnb.content.app.data.controller;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.content.api.dto.DanmakuSbtDto;
-import cn.reghao.tnb.content.app.vod.service.DanmakuService;
+import cn.reghao.tnb.content.app.data.service.DanmakuService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/UserComment.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/entity/UserComment.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.vod.model.po;
+package cn.reghao.tnb.content.app.data.model.entity;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.common.auth.UserContext;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/model/po/UserDanmaku.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/entity/UserDanmaku.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.vod.model.po;
+package cn.reghao.tnb.content.app.data.model.entity;
 
 import cn.reghao.jutil.jdk.db.BaseObject;
 import cn.reghao.tnb.content.api.dto.DanmakuSbtDto;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/CommentService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/CommentService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.vod.service;
+package cn.reghao.tnb.content.app.data.service;
 
 import cn.reghao.jutil.jdk.db.PageList;
 import cn.reghao.jutil.tool.id.SnowFlake;
@@ -7,7 +7,7 @@ import cn.reghao.tnb.common.auth.UserContext;
 import cn.reghao.tnb.content.api.dto.comment.CommentData;
 import cn.reghao.tnb.content.app.vod.db.mapper.VideoPostMapper;
 import cn.reghao.tnb.content.app.vod.db.mongo.UserCommentMongo;
-import cn.reghao.tnb.content.app.vod.model.po.UserComment;
+import cn.reghao.tnb.content.app.data.model.entity.UserComment;
 import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import cn.reghao.tnb.user.api.dto.UserCard;
 import cn.reghao.tnb.message.api.dto.UserMessageDto;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/service/DanmakuService.java → content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/DanmakuService.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.vod.service;
+package cn.reghao.tnb.content.app.data.service;
 
 import cn.reghao.jutil.jdk.result.Result;
 import cn.reghao.jutil.tool.id.SnowFlake;
@@ -8,7 +8,7 @@ import cn.reghao.tnb.account.api.iface.AccountQuery;
 import cn.reghao.tnb.common.util.ConstantId;
 import cn.reghao.tnb.content.api.dto.DanmakuSbtDto;
 import cn.reghao.tnb.content.app.vod.db.mongo.UserDanmakuMongo;
-import cn.reghao.tnb.content.app.vod.model.po.UserDanmaku;
+import cn.reghao.tnb.content.app.data.model.entity.UserDanmaku;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/controller/CrawledDataController.java

@@ -4,7 +4,7 @@ import cn.reghao.jutil.web.WebResult;
 import cn.reghao.tnb.content.api.dto.comment.CommentSbtDto;
 import cn.reghao.tnb.content.api.dto.spider.CrawledVideo;
 import cn.reghao.tnb.content.app.vod.service.CrawledDataService;
-import cn.reghao.tnb.content.app.vod.service.CommentService;
+import cn.reghao.tnb.content.app.data.service.CommentService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.validation.annotation.Validated;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mongo/UserCommentMongo.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.db.mongo;
 
 import cn.reghao.jutil.jdk.db.BaseCrud;
 import cn.reghao.jutil.jdk.db.BaseQuery;
-import cn.reghao.tnb.content.app.vod.model.po.UserComment;
+import cn.reghao.tnb.content.app.data.model.entity.UserComment;
 import com.mongodb.MongoBulkWriteException;
 import com.mongodb.client.model.InsertManyOptions;
 import com.mongodb.client.result.DeleteResult;

content/content-service/src/main/java/cn/reghao/tnb/content/app/vod/db/mongo/UserDanmakuMongo.java

@@ -2,7 +2,7 @@ package cn.reghao.tnb.content.app.vod.db.mongo;
 
 import cn.reghao.jutil.jdk.db.BaseCrud;
 import cn.reghao.jutil.jdk.db.BaseQuery;
-import cn.reghao.tnb.content.app.vod.model.po.UserDanmaku;
+import cn.reghao.tnb.content.app.data.model.entity.UserDanmaku;
 import cn.reghao.tnb.content.api.dto.DanmakuRetVo;
 import com.mongodb.MongoBulkWriteException;
 import com.mongodb.client.model.InsertManyOptions;

content/content-service/src/test/java/cn/reghao/tnb/content/app/vod/service/UnitTest.java

@@ -1,9 +1,9 @@
 package cn.reghao.tnb.content.app.vod.service;
 
 import cn.reghao.jutil.jdk.text.TextFile;
+import cn.reghao.tnb.content.app.data.service.CommentService;
 import cn.reghao.tnb.content.app.vod.db.mapper.VideoPostMapper;
 import cn.reghao.tnb.content.app.vod.db.mongo.UserCommentMongo;
-import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -11,7 +11,6 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;