1.将 content-service 中依赖 mongodb 的相关代码迁移到 search-service, 删除 mongodb 依赖

2.更新 gateway 中的路由

content/content-service/pom.xml

@@ -92,11 +92,6 @@
             <version>5.5.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-mongodb</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-amqp</artifactId>

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

@@ -4,7 +4,6 @@ import cn.reghao.tnb.common.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.data.service.CommentService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.validation.annotation.Validated;
@@ -19,11 +18,9 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/api/content/post/video")
 public class CrawledDataController {
     private final CrawledDataService crawledDataService;
-    private final CommentService commentService;
 
-    public CrawledDataController(CrawledDataService crawledDataService, CommentService commentService) {
+    public CrawledDataController(CrawledDataService crawledDataService) {
         this.crawledDataService = crawledDataService;
-        this.commentService = commentService;
     }
 
     @Operation(summary = "添加 bili 视频稿件", description = "N")
@@ -36,7 +33,7 @@ public class CrawledDataController {
     @Operation(summary = "添加 bili 视频评论", description = "N")
     @PostMapping("/bili/comment")
     public String addBiliVideoComment(@RequestBody CommentSbtDto commentSbtDto) {
-        commentService.saveBiliComment(commentSbtDto);
+        //commentService.saveBiliComment(commentSbtDto);
         return WebResult.success();
     }
 

content/content-service/src/main/resources/application-cluster.yml

@@ -8,12 +8,6 @@ spring:
     discovery:
       enabled: true
   data:
-    mongodb:
-      host: 192.168.0.211
-      database: "tnb_content_tdb"
-      authentication-database: admin
-      username: test
-      password: Test@123456
     redis:
       database: 0
       host: 192.168.0.211

content/content-service/src/main/resources/application-dev.yml

@@ -9,12 +9,6 @@ spring:
     discovery:
       enabled: true
   data:
-    mongodb:
-      host: 127.0.0.1
-      database: "tnb_content_rdb"
-      authentication-database: admin
-      username: dev
-      password: Dev@123456
     redis:
       database: 0
       host: 127.0.0.1

content/content-service/src/main/resources/application-test.yml

@@ -7,12 +7,6 @@ spring:
     discovery:
       enabled: true
   data:
-    mongodb:
-      host: 192.168.0.209
-      database: "tnb_content_tdb"
-      authentication-database: admin
-      username: test
-      password: Test@123456
     redis:
       database: 0
       host: 192.168.0.209

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

@@ -1,31 +0,0 @@
-package cn.reghao.tnb.content.app.vod.service;
-
-import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.tnb.content.app.ContentApplication;
-import cn.reghao.tnb.content.app.data.db.mongo.RichTextMongo;
-import cn.reghao.tnb.content.app.data.model.po.RichText;
-import cn.reghao.tnb.content.app.data.model.vo.NewsPost;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.ActiveProfiles;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * @author reghao
- * @date 2025-07-30 14:59:06
- */
-@Slf4j
-@ActiveProfiles("dev")
-@SpringBootTest(classes = ContentApplication.class)
-public class RichTextTest {
-    @Autowired
-    RichTextMongo richTextMongo;
-    @Test
-    public void getRichTextTest() {
-    }
-}

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

@@ -1,124 +0,0 @@
-package cn.reghao.tnb.content.app.vod.service;
-
-import cn.reghao.jutil.jdk.io.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 org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * @author reghao
- * @date 2025-05-29 09:16:31
- */
-@RunWith(MockitoJUnitRunner.class)
-public class UnitTest {
-    @Mock
-    private UserCommentMongo userCommentMongo;
-    //@Mock
-    private VideoPostMapper videoPostMapper;
-    @InjectMocks
-    CommentService commentService;
-
-    @Test
-    public void unitTest() {
-        String videoId = "abcdefg";
-        Mockito.when(userCommentMongo.countByPostId(videoId)).thenReturn(1024L);
-        long total = commentService.countPostComment(videoId);
-        System.out.println();
-    }
-
-    @Test
-    public void vodTest() {
-        TextFile textFile = new TextFile();
-
-        String filePath = "/home/reghao/Downloads/1_fyt91.txt";
-        List<String> existList = new ArrayList<>();
-        List<String> notexistList = new ArrayList<>();
-        List<String> list = new ArrayList<>();
-        for (String line : textFile.read(filePath)) {
-            if (line.startsWith("exist")) {
-                existList.add(line);
-
-                /*String videoIdsStr = line.split(" videoId ")[1];
-                String[] videoIds = videoIdsStr.replace("[", "")
-                        .replace("]", "")
-                        .split(", ");
-
-                for (String videoId : videoIds) {
-                    VideoPost videoPost = videoPostMapper.findByVideoId(videoId);
-                    long publishBy = videoPost.getPublishBy();
-                }*/
-            } else if (line.startsWith("notexist")) {
-                notexistList.add(line);
-            } else {
-                list.add(line);
-            }
-        }
-
-        textFile.write("/home/reghao/Downloads/1_fyt91.txt_exist", existList);
-        textFile.write("/home/reghao/Downloads/1_fyt91.txt_notexist", notexistList);
-        textFile.write("/home/reghao/Downloads/1_fyt91.txt_list", list);
-    }
-
-    @Test
-    public void vodTest1() {
-        TextFile textFile = new TextFile();
-
-        String filePath = "/home/reghao/Downloads/3.txt";
-        String text = textFile.readFile(filePath);
-        String[] tags = text.replace("[", "")
-                .replace("]", "")
-                .split(", ");
-
-        Set<String> set1 = new HashSet<>();
-        Set<String> set2 = new HashSet<>();
-        String regex = "^[a-z0-9A-Z]+$";
-        for (String tag : tags) {
-            if (tag.equals("tnb")) {
-                set2.add(tag);
-                continue;
-            }
-
-            if (tag.matches(regex)) {
-                set1.add(tag);
-            } else {
-                set2.add(tag);
-            }
-        }
-
-        System.out.println();
-    }
-
-    private void test1() {
-        TextFile textFile = new TextFile();
-
-        String filePath = "/home/reghao/Downloads/1_fyt91.txt_notexist";
-        List<String> existList = new ArrayList<>();
-        List<String> notexistList = new ArrayList<>();
-        List<String> list = new ArrayList<>();
-
-        Set<String> set = new HashSet<>();
-        for (String line : textFile.read(filePath)) {
-            String line1 = line.replace("notexist ", "");
-            set.add(line1);
-        }
-
-        filePath = "/home/reghao/Downloads/1_fytgc.txt_notexist";
-        for (String line : textFile.read(filePath)) {
-            String line1 = line.replace("notexist ", "");
-            if (set.contains(line1)) {
-                System.out.println(line);
-            }
-        }
-    }
-}

gateway/src/main/resources/application.yml

@@ -98,12 +98,6 @@ spring:
             - Path=/api/search/**
           filters:
             - StripPrefix=0
-        - id: comment-router
-          uri: lb://content-service
-          predicates:
-            - Path=/api/comment/**
-          filters:
-            - StripPrefix=0
         - id: mall-router
           uri: lb://content-service
           predicates:
@@ -193,6 +187,12 @@ spring:
           uri: lb://search-service
           predicates:
             - Path=/api/blog/**
+        - id: comment-router
+          uri: lb://content-service
+          predicates:
+            - Path=/api/comment/**
+          filters:
+            - StripPrefix=0
 #    gateway:
 #      globalcors:
 #        cors-configurations:

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/ArticleController.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/controller/ArticleController.java

@@ -1,13 +1,13 @@
-package cn.reghao.tnb.content.app.data.controller;
+package cn.reghao.tnb.search.app.comment.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.data.model.dto.ArticlePublishSbt;
-import cn.reghao.tnb.content.app.data.model.po.ArticlePost;
-import cn.reghao.tnb.content.app.data.model.vo.AnswerCard;
-import cn.reghao.tnb.content.app.data.model.vo.ArticleHeader;
-import cn.reghao.tnb.content.app.data.service.ArticlePostService;
+import cn.reghao.tnb.search.app.comment.model.dto.ArticlePublishSbt;
+import cn.reghao.tnb.search.app.comment.model.po.ArticlePost;
+import cn.reghao.tnb.search.app.comment.model.vo.AnswerCard;
+import cn.reghao.tnb.search.app.comment.model.vo.ArticleHeader;
+import cn.reghao.tnb.search.app.comment.service.ArticlePostService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Tag(name = "文章接口")
 @RestController
-@RequestMapping("/api/content/article")
+@RequestMapping("/api/search1/article")
 public class ArticleController {
     private final ArticlePostService articleService;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/controller/ArticlePostController.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/controller/ArticlePostController.java

@@ -1,14 +1,14 @@
-package cn.reghao.tnb.content.app.data.controller;
+package cn.reghao.tnb.search.app.comment.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.common.auth.AuthUser;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.data.model.dto.ArticlePublishSbt;
-import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleContent;
-import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleScope;
-import cn.reghao.tnb.content.app.data.model.po.ArticlePost;
-import cn.reghao.tnb.content.app.data.service.ArticlePostService;
+import cn.reghao.tnb.search.app.comment.model.dto.ArticlePublishSbt;
+import cn.reghao.tnb.search.app.comment.model.dto.UpdateArticleContent;
+import cn.reghao.tnb.search.app.comment.model.dto.UpdateArticleScope;
+import cn.reghao.tnb.search.app.comment.model.po.ArticlePost;
+import cn.reghao.tnb.search.app.comment.service.ArticlePostService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.http.MediaType;
@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Tag(name = "文章贴接口")
 @RestController
-@RequestMapping("/api/content/post/article")
+@RequestMapping("/api/search1/post/article")
 public class ArticlePostController {
     private final ArticlePostService articleService;
 

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

@@ -1,11 +1,11 @@
-package cn.reghao.tnb.content.app.data.controller;
+package cn.reghao.tnb.search.app.comment.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.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.data.service.CommentService;
+import cn.reghao.tnb.search.app.comment.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/data/controller/DanmakuController.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/controller/DanmakuController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.data.controller;
+package cn.reghao.tnb.search.app.comment.controller;
 
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.tnb.common.web.WebResult;
 import cn.reghao.tnb.content.api.dto.DanmakuSbtDto;
-import cn.reghao.tnb.content.app.data.service.DanmakuService;
+import cn.reghao.tnb.search.app.comment.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/data/controller/NewsPostController.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/controller/NewsPostController.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.data.controller;
+package cn.reghao.tnb.search.app.comment.controller;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.tnb.common.web.WebResult;
-import cn.reghao.tnb.content.app.data.model.vo.NewsPost;
-import cn.reghao.tnb.content.app.data.service.NewsPostService;
+import cn.reghao.tnb.search.app.comment.model.vo.NewsPost;
+import cn.reghao.tnb.search.app.comment.service.NewsPostService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Tag(name = "新闻稿件接口")
 @RestController
-@RequestMapping("/api/content/post/news")
+@RequestMapping("/api/search1/post/news")
 public class NewsPostController {
     private final NewsPostService newsPostService;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/db/mongo/ArticlePostMongo.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/db/mongo/ArticlePostMongo.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.data.db.mongo;
+package cn.reghao.tnb.search.app.comment.db.mongo;
 
 import cn.reghao.jutil.jdk.web.db.BaseCrud;
 import cn.reghao.jutil.jdk.web.db.BaseQuery;
-import cn.reghao.tnb.content.app.data.model.po.ArticlePost;
+import cn.reghao.tnb.search.app.comment.model.po.ArticlePost;
 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/data/db/mongo/RichTextMongo.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/db/mongo/RichTextMongo.java

@@ -1,10 +1,10 @@
-package cn.reghao.tnb.content.app.data.db.mongo;
+package cn.reghao.tnb.search.app.comment.db.mongo;
 
 import cn.reghao.jutil.jdk.web.db.BaseCrud;
 import cn.reghao.jutil.jdk.web.db.BaseQuery;
 import cn.reghao.jutil.jdk.web.db.PageList;
-import cn.reghao.tnb.content.app.data.model.po.RichText;
-import cn.reghao.tnb.content.app.data.model.vo.NewsPost;
+import cn.reghao.tnb.search.app.comment.model.po.RichText;
+import cn.reghao.tnb.search.app.comment.model.vo.NewsPost;
 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/UserCommentMongo.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/db/mongo/UserCommentMongo.java

@@ -1,8 +1,8 @@
-package cn.reghao.tnb.content.app.vod.db.mongo;
+package cn.reghao.tnb.search.app.comment.db.mongo;
 
 import cn.reghao.jutil.jdk.web.db.BaseCrud;
 import cn.reghao.jutil.jdk.web.db.BaseQuery;
-import cn.reghao.tnb.content.app.data.model.entity.UserComment;
+import cn.reghao.tnb.search.app.comment.model.po.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 → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/db/mongo/UserDanmakuMongo.java

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

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/ArticlePublishSbt.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/dto/ArticlePublishSbt.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.model.dto;
+package cn.reghao.tnb.search.app.comment.model.dto;
 
 import lombok.Getter;
 import lombok.NoArgsConstructor;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateArticleContent.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/dto/UpdateArticleContent.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.model.dto;
+package cn.reghao.tnb.search.app.comment.model.dto;
 
 import lombok.Getter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/dto/UpdateArticleScope.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/dto/UpdateArticleScope.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.model.dto;
+package cn.reghao.tnb.search.app.comment.model.dto;
 
 import cn.reghao.tnb.content.api.constant.PostScope;
 import cn.reghao.jutil.jdk.web.validator.ValidEnum;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/po/ArticlePost.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/po/ArticlePost.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.model.po;
+package cn.reghao.tnb.search.app.comment.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import cn.reghao.tnb.content.api.constant.PostScope;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/po/RichText.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/po/RichText.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.model.po;
+package cn.reghao.tnb.search.app.comment.model.po;
 
 import cn.reghao.jutil.jdk.web.db.BaseObject;
 import lombok.AllArgsConstructor;

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

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

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

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

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/vo/AnswerCard.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/vo/AnswerCard.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.model.vo;
+package cn.reghao.tnb.search.app.comment.model.vo;
 
 import lombok.Getter;
 import lombok.Setter;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/vo/ArticleHeader.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/vo/ArticleHeader.java

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.model.vo;
+package cn.reghao.tnb.search.app.comment.model.vo;
 
 import lombok.AllArgsConstructor;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/model/vo/NewsPost.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/model/vo/NewsPost.java

@@ -1,7 +1,7 @@
-package cn.reghao.tnb.content.app.data.model.vo;
+package cn.reghao.tnb.search.app.comment.model.vo;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
-import cn.reghao.tnb.content.app.data.model.po.RichText;
+import cn.reghao.tnb.search.app.comment.model.po.RichText;
 import lombok.Getter;
 import lombok.Setter;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/ArticlePostService.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/service/ArticlePostService.java

@@ -1,22 +1,19 @@
-package cn.reghao.tnb.content.app.data.service;
+package cn.reghao.tnb.search.app.comment.service;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.string.IdGenerator;
 import cn.reghao.jutil.jdk.string.SnowFlake;
 import cn.reghao.tnb.common.auth.UserContext;
-import cn.reghao.tnb.content.app.data.db.mongo.RichTextMongo;
-import cn.reghao.tnb.content.app.data.model.dto.ArticlePublishSbt;
-import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleContent;
-import cn.reghao.tnb.content.app.data.model.dto.UpdateArticleScope;
-import cn.reghao.tnb.content.app.data.model.po.RichText;
-import cn.reghao.tnb.content.app.data.model.vo.AnswerCard;
-import cn.reghao.tnb.content.app.data.db.mongo.ArticlePostMongo;
-import cn.reghao.tnb.content.app.data.model.po.ArticlePost;
-import cn.reghao.tnb.content.app.data.model.vo.ArticleHeader;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.select.Elements;
+import cn.reghao.tnb.search.app.comment.db.mongo.RichTextMongo;
+import cn.reghao.tnb.search.app.comment.model.dto.ArticlePublishSbt;
+import cn.reghao.tnb.search.app.comment.model.dto.UpdateArticleContent;
+import cn.reghao.tnb.search.app.comment.model.dto.UpdateArticleScope;
+import cn.reghao.tnb.search.app.comment.model.po.RichText;
+import cn.reghao.tnb.search.app.comment.model.vo.AnswerCard;
+import cn.reghao.tnb.search.app.comment.db.mongo.ArticlePostMongo;
+import cn.reghao.tnb.search.app.comment.model.po.ArticlePost;
+import cn.reghao.tnb.search.app.comment.model.vo.ArticleHeader;
 import org.springframework.stereotype.Service;
 
 import java.util.List;

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

@@ -1,17 +1,13 @@
-package cn.reghao.tnb.content.app.data.service;
+package cn.reghao.tnb.search.app.comment.service;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.string.SnowFlake;
 import cn.reghao.tnb.account.api.iface.AccountQuery;
 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.data.model.entity.UserComment;
-import cn.reghao.tnb.content.app.vod.model.po.VideoPost;
-import cn.reghao.tnb.message.api.constant.MsgType;
+import cn.reghao.tnb.search.app.comment.db.mongo.UserCommentMongo;
+import cn.reghao.tnb.search.app.comment.model.po.UserComment;
 import cn.reghao.tnb.user.api.dto.UserCard;
-import cn.reghao.tnb.message.api.dto.UserMessageDto;
 import cn.reghao.tnb.user.api.iface.UserService;
 import cn.reghao.tnb.content.api.dto.comment.CommentSbtDto;
 import cn.reghao.tnb.content.api.dto.comment.ReplyUser;
@@ -35,12 +31,10 @@ public class CommentService {
 
     private final SnowFlake idGenerator;
     private final UserCommentMongo userCommentMongo;
-    private final VideoPostMapper videoPostMapper;
 
-    public CommentService(UserCommentMongo userCommentMongo, VideoPostMapper videoPostMapper) {
+    public CommentService(UserCommentMongo userCommentMongo) {
         this.idGenerator = new SnowFlake(1L, 1L);
         this.userCommentMongo = userCommentMongo;
-        this.videoPostMapper = videoPostMapper;
     }
 
     public void saveComment(CommentSbtDto commentSbtDto) {
@@ -64,7 +58,7 @@ public class CommentService {
         UserComment userComment = new UserComment(commentId, commentData, parentId);
         userCommentMongo.save(userComment);
 
-        VideoPost videoPost = videoPostMapper.findByVideoId(postId);
+        /*VideoPost videoPost = videoPostMapper.findByVideoId(postId);
         if (videoPost != null) {
             long publishBy = videoPost.getPublishBy();
             int msgType = MsgType.commentMsg.getValue();
@@ -72,7 +66,7 @@ public class CommentService {
             String content = "发表了新评论";
             UserMessageDto userMessageDto = new UserMessageDto(msgType, title, content, publishBy);
             //userService.sendUserMessage(userMessageDto);
-        }
+        }*/
     }
 
     @Deprecated

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

@@ -1,4 +1,4 @@
-package cn.reghao.tnb.content.app.data.service;
+package cn.reghao.tnb.search.app.comment.service;
 
 import cn.reghao.jutil.jdk.web.result.Result;
 import cn.reghao.jutil.jdk.string.SnowFlake;
@@ -7,8 +7,8 @@ import cn.reghao.tnb.account.api.dto.AuthedAccount;
 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.data.model.entity.UserDanmaku;
+import cn.reghao.tnb.search.app.comment.db.mongo.UserDanmakuMongo;
+import cn.reghao.tnb.search.app.comment.model.po.UserDanmaku;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;
 

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/service/NewsPostService.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/service/NewsPostService.java

@@ -1,15 +1,12 @@
-package cn.reghao.tnb.content.app.data.service;
+package cn.reghao.tnb.search.app.comment.service;
 
 import cn.reghao.jutil.jdk.web.db.PageList;
 import cn.reghao.jutil.jdk.string.SnowFlake;
-import cn.reghao.tnb.content.app.data.db.mongo.RichTextMongo;
-import cn.reghao.tnb.content.app.data.model.vo.NewsPost;
-import cn.reghao.tnb.content.app.data.model.po.RichText;
+import cn.reghao.tnb.search.app.comment.db.mongo.RichTextMongo;
+import cn.reghao.tnb.search.app.comment.model.po.RichText;
+import cn.reghao.tnb.search.app.comment.model.vo.NewsPost;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 /**
  * @author reghao
  * @date 2025-07-29 14:10:11

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/spider/TaskContext.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/spider/TaskContext.java

@@ -1,14 +1,13 @@
-package cn.reghao.tnb.content.app.data.spider;
+package cn.reghao.tnb.search.app.comment.spider;
 
 import cn.reghao.jutil.jdk.http.WebClient;
 import cn.reghao.jutil.jdk.http.WebRequest;
 import cn.reghao.jutil.jdk.thread.ThreadPoolWrapper;
-import cn.reghao.tnb.content.app.data.db.mongo.RichTextMongo;
-import cn.reghao.tnb.content.app.data.spider.task.GetNewsDetailTask;
-import cn.reghao.tnb.content.app.data.spider.task.GetNewsIndexTask;
+import cn.reghao.tnb.search.app.comment.db.mongo.RichTextMongo;
+import cn.reghao.tnb.search.app.comment.spider.task.GetNewsDetailTask;
+import cn.reghao.tnb.search.app.comment.spider.task.GetNewsIndexTask;
 import org.springframework.stereotype.Component;
 
-import jakarta.annotation.PostConstruct;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/spider/task/GetNewsDetailTask.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/spider/task/GetNewsDetailTask.java

@@ -1,9 +1,9 @@
-package cn.reghao.tnb.content.app.data.spider.task;
+package cn.reghao.tnb.search.app.comment.spider.task;
 
 import cn.reghao.jutil.jdk.http.WebRequest;
 import cn.reghao.jutil.jdk.http.WebResponse;
-import cn.reghao.tnb.content.app.data.db.mongo.RichTextMongo;
-import cn.reghao.tnb.content.app.data.model.po.RichText;
+import cn.reghao.tnb.search.app.comment.db.mongo.RichTextMongo;
+import cn.reghao.tnb.search.app.comment.model.po.RichText;
 import lombok.extern.slf4j.Slf4j;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;

content/content-service/src/main/java/cn/reghao/tnb/content/app/data/spider/task/GetNewsIndexTask.java → search/search-service/src/main/java/cn/reghao/tnb/search/app/comment/spider/task/GetNewsIndexTask.java

@@ -1,12 +1,12 @@
-package cn.reghao.tnb.content.app.data.spider.task;
+package cn.reghao.tnb.search.app.comment.spider.task;
 
 import cn.reghao.jutil.jdk.converter.DateTimeConverter;
 import cn.reghao.jutil.jdk.http.WebRequest;
 import cn.reghao.jutil.jdk.http.WebResponse;
 import cn.reghao.jutil.jdk.serializer.JsonConverter;
 import cn.reghao.jutil.jdk.string.SnowFlake;
-import cn.reghao.tnb.content.app.data.db.mongo.RichTextMongo;
-import cn.reghao.tnb.content.app.data.model.po.RichText;
+import cn.reghao.tnb.search.app.comment.db.mongo.RichTextMongo;
+import cn.reghao.tnb.search.app.comment.model.po.RichText;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;