fix: 依赖改名

.idea/mybatisx/templates.xml

@@ -67,8 +67,8 @@
             <option name="tableUIInfoList">
               <list>
                 <TableUIInfo>
-                  <option name="className" value="BrowingHistory" />
+                  <option name="className" value="TutorialTags" />
-                  <option name="tableName" value="browing_history" />
+                  <option name="tableName" value="tutorial_tags" />
                 </TableUIInfo>
               </list>
             </option>

commons/src/main/java/com/ivmiku/tutorial/response/AtNotifier.java

@@ -0,0 +1,14 @@
+package com.ivmiku.tutorial.response;
+
+import lombok.Data;
+
+/**
+ * 提醒用户实体
+ * @author Aurora
+ */
+@Data
+public class AtNotifier {
+    private String fromId;
+    private String toId;
+    private String postId;
+}

community-8073/pom.xml

@@ -41,11 +41,12 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
+        <!-- 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.28.0</version>
         </dependency>
+
         <dependency>
             <groupId>io.minio</groupId>
             <artifactId>minio</artifactId>
@@ -132,7 +133,6 @@
         <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-redis-jackson</artifactId>
-            <version>1.38.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -190,6 +190,14 @@
             <artifactId>commons</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

community-8073/src/main/java/com/ivmiku/tutorial/config/SaTokenConfig.java

@@ -1,6 +1,7 @@
 package com.ivmiku.tutorial.config;
 
-import cn.dev33.satoken.interceptor.SaAnnotationInterceptor;
+import cn.dev33.satoken.interceptor.SaInterceptor;
+import cn.dev33.satoken.stp.StpUtil;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -11,7 +12,8 @@ public class SaTokenConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         // 注册注解拦截器，并排除不需要注解鉴权的接口地址 (与登录拦截器无关)
-        registry.addInterceptor(new SaAnnotationInterceptor())
+        registry.addInterceptor(new SaInterceptor(handle -> StpUtil.checkLogin()))
-                .addPathPatterns("/**");
+                .addPathPatterns("/**")
+                .excludePathPatterns("/swagger-ui/**");
     }
 }

community-8073/src/main/java/com/ivmiku/tutorial/config/WebSocketConfig.java

@@ -0,0 +1,34 @@
+package com.ivmiku.tutorial.config;
+
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import org.springframework.boot.web.servlet.ServletContextInitializer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
+import org.springframework.web.util.WebAppRootListener;
+
+@Configuration
+public class WebSocketConfig implements ServletContextInitializer {
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter (){
+        return new ServerEndpointExporter();
+    }
+
+    @Override
+    public void onStartup(ServletContext servletContext) throws ServletException {
+        servletContext.addListener(WebAppRootListener.class);
+        servletContext.setInitParameter("org.apache.tomcat.websocket.textBufferSize","102400000");
+    }
+
+    @Bean
+    public ServletServerContainerFactoryBean createWebSocketContainer() {
+        ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
+        // 在此处设置bufferSize
+        container.setMaxTextMessageBufferSize(50*1024*1024);
+        container.setMaxBinaryMessageBufferSize(50*1024*1024);
+        container.setMaxSessionIdleTimeout(15 * 60000L);
+        return container;
+    }
+}

community-8073/src/main/java/com/ivmiku/tutorial/controller/CommentController.java

@@ -2,21 +2,23 @@ package com.ivmiku.tutorial.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.pagehelper.PageInfo;
 import com.ivmiku.tutorial.entity.Comment;
 import com.ivmiku.tutorial.entity.Pages;
+import com.ivmiku.tutorial.response.AtNotifier;
 import com.ivmiku.tutorial.response.Result;
 import com.ivmiku.tutorial.service.CommentService;
 import com.ivmiku.tutorial.service.FileService;
+import com.ivmiku.tutorial.util.MyRedisUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * 评论控制器，用于处理评论相关的HTTP请求。
@@ -24,6 +26,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/comments")
 @SaCheckLogin
+
 public class CommentController {
 
     private static final Logger logger = LoggerFactory.getLogger(CommentController.class);
@@ -34,48 +37,36 @@ public class CommentController {
     @Resource
     private FileService fileService;
 
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
+    @Resource
+    private MyRedisUtil myRedisUtil;
+
+
     /**
      * 创建评论接口。
-     *
-     * @param content 评论内容
-     * @param postId 帖子的ID
-     * @param mentionedUserId 提及的用户ID（可选）
-     * @param imageFiles 图片文件（可选）
-     * @param videoFile 视频文件（可选）
-     * @return 返回操作结果
      */
     @PostMapping("/create")
     @Operation(summary = "创建评论")
     public Result createComment(@RequestParam("content") String content,
-                                @RequestParam("postId") Long postId,
+                                @RequestParam(value = "postId", required = false) Long postId,
+                                @RequestParam(value = "tutorialId", required = false) Long tutorialId,
                                 @RequestParam(value = "mentionedUserId", required = false) String mentionedUserId,
                                 @RequestParam(value = "imageFiles", required = false) MultipartFile[] imageFiles,
-                                @RequestParam(value = "videoFile", required = false) MultipartFile videoFile) {
+                                @RequestParam(value = "videoFile", required = false) MultipartFile videoFile,
+                                @RequestParam("type") String type) {
+
         logger.info("创建评论请求开始，用户ID：{}", StpUtil.getLoginIdAsString());
 
-        Comment comment = new Comment();
+        if (!isValidCommentType(type)) {
-        comment.setUserOpenid(StpUtil.getLoginIdAsString());
+            return Result.error("无效的评论类型");
-        comment.setPostId(postId);
+        }
-        comment.setContent(content);
+
-        comment.setParentCommentId(0l);
+        Comment comment = createCommentObject(content, postId, tutorialId, mentionedUserId, type);
-        comment.setMentionedUserId(mentionedUserId);
 
         try {
-            // 上传视频
+            processFileUploads(comment, imageFiles, videoFile);
-            if (videoFile != null && !videoFile.isEmpty()) {
-                String uploadResult = fileService.uploadMinio(videoFile);
-                comment.setVideoUrl(uploadResult);
-            }
-
-            // 上传图片
-            if (imageFiles != null && imageFiles.length > 0) {
-                StringBuilder imageUrls = new StringBuilder();
-                for (MultipartFile file : imageFiles) {
-                    String uploadResult = fileService.uploadMinio(file);
-                    imageUrls.append(uploadResult + ";");
-                }
-                comment.setImageUrls(imageUrls.toString());
-            }
         } catch (Exception e) {
             logger.error("文件上传失败", e);
             return Result.error("文件上传失败");
@@ -83,60 +74,47 @@ public class CommentController {
 
         commentService.createComment(comment);
         logger.info("评论创建成功，评论ID：{}", comment.getCommentId());
+        if (!mentionedUserId.isEmpty()) {
+            AtNotifier notifier = new AtNotifier();
+            notifier.setFromId(comment.getUserOpenid());
+            notifier.setToId(mentionedUserId);
+            notifier.setPostId(String.valueOf(comment.getCommentId()));
+            rabbitTemplate.convertAndSend("exchange2", "", JSON.toJSONString(notifier));
+            myRedisUtil.listAdd("at:" + notifier.getToId(), JSON.toJSONString(notifier));
+        }
         return Result.ok(comment);
     }
 
     /**
      * 回复评论接口。
-     *
-     * @param parentCommentId 父评论的ID
-     * @param postId 帖子的ID
-     * @param content 回复内容
-     * @param mentionedUserId 提及的用户ID（可选）
-     * @param imageFiles 图片文件（可选）
-     * @param videoFile 视频文件（可选）
-     * @return 返回操作结果
      */
     @PostMapping("/reply")
     @Operation(summary = "回复评论")
     public Result replyComment(@RequestParam Long parentCommentId,
-                               @RequestParam Long postId,
+                               @RequestParam("content") String content,
-                               @RequestParam String content,
+                               @RequestParam(value = "postId", required = false) Long postId,
-                               @RequestParam(required = false) String mentionedUserId,
+                               @RequestParam(value = "tutorialId", required = false) Long tutorialId,
+                               @RequestParam(value = "mentionedUserId", required = false) String mentionedUserId,
                                @RequestParam(value = "imageFiles", required = false) MultipartFile[] imageFiles,
-                               @RequestParam(value = "videoFile", required = false) MultipartFile videoFile) {
+                               @RequestParam(value = "videoFile", required = false) MultipartFile videoFile,
+                               @RequestParam("type") String type) {
+
         logger.info("回复评论请求开始，用户ID：{}", StpUtil.getLoginIdAsString());
 
-        // 检查父评论是否存在
         Comment parentComment = commentService.getCommentById(parentCommentId);
         if (parentComment == null) {
-            logger.warn("父评论ID：{}不存在", parentCommentId);
             return Result.error("父评论不存在");
         }
 
-        Comment reply = new Comment();
+        if (!isValidCommentType(type)) {
-        reply.setUserOpenid(StpUtil.getLoginIdAsString());
+            return Result.error("无效的评论类型");
+        }
+
+        Comment reply = createCommentObject(content, postId, tutorialId, mentionedUserId, type);
         reply.setParentCommentId(parentCommentId);
-        reply.setPostId(postId);
-        reply.setContent(content);
-        reply.setMentionedUserId(mentionedUserId);
 
         try {
-            // 上传视频
+            processFileUploads(reply, imageFiles, videoFile);
-            if (videoFile != null && !videoFile.isEmpty()) {
-                String uploadResult = fileService.uploadMinio(videoFile);
-                reply.setVideoUrl(uploadResult);
-            }
-
-            // 上传图片
-            if (imageFiles != null && imageFiles.length > 0) {
-                StringBuilder imageUrls = new StringBuilder();
-                for (MultipartFile file : imageFiles) {
-                    String uploadResult = fileService.uploadMinio(file);
-                    imageUrls.append(uploadResult + ";");
-                }
-                reply.setImageUrls(imageUrls.toString());
-            }
         } catch (Exception e) {
             logger.error("文件上传失败", e);
             return Result.error("文件上传失败");
@@ -144,9 +122,51 @@ public class CommentController {
 
         commentService.createComment(reply);
         logger.info("评论回复成功，评论ID：{}", reply.getCommentId());
+        if (!mentionedUserId.isEmpty()) {
+            AtNotifier notifier = new AtNotifier();
+            notifier.setFromId(reply.getUserOpenid());
+            notifier.setToId(mentionedUserId);
+            notifier.setPostId(String.valueOf(reply.getCommentId()));
+            rabbitTemplate.convertAndSend("exchange2", "", JSON.toJSONString(notifier));
+            myRedisUtil.listAdd("at:" + notifier.getToId(), JSON.toJSONString(notifier));
+        }
         return Result.ok(reply);
     }
 
+    // 工具方法：创建评论对象
+    private Comment createCommentObject(String content, Long postId, Long tutorialId, String mentionedUserId, String type) {
+        Comment comment = new Comment();
+        comment.setUserOpenid(StpUtil.getLoginIdAsString());
+        comment.setContent(content);
+        comment.setMentionedUserId(mentionedUserId);
+        if ("post".equals(type)) {
+            comment.setPostId(postId);
+        } else if ("tutorial".equals(type)) {
+            comment.setTutorialId(tutorialId);
+        }
+        return comment;
+    }
+
+    // 工具方法：处理文件上传
+    private void processFileUploads(Comment comment, MultipartFile[] imageFiles, MultipartFile videoFile) throws Exception {
+        if (videoFile != null && !videoFile.isEmpty()) {
+            comment.setVideoUrl(fileService.uploadMinio(videoFile));
+        }
+
+        if (imageFiles != null && imageFiles.length > 0) {
+            StringBuilder imageUrls = new StringBuilder();
+            for (MultipartFile file : imageFiles) {
+                imageUrls.append(fileService.uploadMinio(file)).append(";");
+            }
+            comment.setImageUrls(imageUrls.toString());
+        }
+    }
+
+    // 工具方法：校验评论类型
+    private boolean isValidCommentType(String type) {
+        return "post".equals(type) || "tutorial".equals(type);
+    }
+
     /**
      * 获取评论详情接口。
      *
@@ -214,6 +234,21 @@ public class CommentController {
         return Result.ok(comments);
     }
 
+    /**
+     * 获取教程下的所有评论。ok
+     *
+     * @param tutorialId 帖子的唯一标识ID
+     * @return 返回操作结果和评论列表
+     */
+    @PostMapping("/tutorial/{tutorialId}")
+    @Operation(summary = "获取教程下的所有评论")
+    public Result getTutorialComments(@PathVariable("tutorialId") Long tutorialId, @RequestBody Pages pages) {
+        logger.info("获取教程ID：{}的评论列表", tutorialId);
+        logger.info("获取pageSize：{}", pages.getPageSize());
+        IPage<Comment> comments = commentService.getTutorialComments(tutorialId, pages.getPageNum(), pages.getPageSize());
+        return Result.ok(comments);
+    }
+
     /**
      * 获取评论下的所有回复。
      *
@@ -228,35 +263,35 @@ public class CommentController {
         return Result.ok(replies);
     }
 
-    /**
+//    /**
-     * @评论接口。
+//     * @评论接口。
-     *
+//     *
-     * @param comment 包含@信息的评论数据
+//     * @param comment 包含@信息的评论数据
-     * @return 返回操作结果
+//     * @return 返回操作结果
-     */
+//     */
-    @PostMapping("/mention")
+//    @PostMapping("/mention")
-    @Operation(summary = "@评论")
+//    @Operation(summary = "@评论")
-    public Result mentionUser(@RequestBody Comment comment) {
+//    public Result mentionUser(@RequestBody Comment comment) {
-        logger.info("用户ID：{}提交@评论请求", StpUtil.getLoginIdAsString());
+//        logger.info("用户ID：{}提交@评论请求", StpUtil.getLoginIdAsString());
-
+//
-        // 检查父评论是否存在（如果有父评论ID）
+//        // 检查父评论是否存在（如果有父评论ID）
-        if (comment.getParentCommentId() != null) {
+//        if (comment.getParentCommentId() != null) {
-            Comment parentComment = commentService.getCommentById(comment.getParentCommentId());
+//            Comment parentComment = commentService.getCommentById(comment.getParentCommentId());
-            if (parentComment == null) {
+//            if (parentComment == null) {
-                logger.warn("父评论ID：{}不存在", comment.getParentCommentId());
+//                logger.warn("父评论ID：{}不存在", comment.getParentCommentId());
-                return Result.error("父评论不存在");
+//                return Result.error("父评论不存在");
-            }
+//            }
-        }
+//        }
-
+//
-        // 检查帖子ID是否存在
+//        // 检查帖子ID是否存在
-        if (comment.getPostId() == null) {
+//        if (comment.getPostId() == null) {
-            logger.warn("帖子ID不能为空");
+//            logger.warn("帖子ID不能为空");
-            return Result.error("帖子ID不能为空");
+//            return Result.error("帖子ID不能为空");
-        }
+//        }
-
+//
-        comment.setUserOpenid(StpUtil.getLoginIdAsString());
+//        comment.setUserOpenid(StpUtil.getLoginIdAsString());
-        commentService.createComment(comment);
+//        commentService.createComment(comment);
-        logger.info("@评论创建成功，评论ID：{}", comment.getCommentId());
+//        logger.info("@评论创建成功，评论ID：{}", comment.getCommentId());
-        return Result.ok();
+//        return Result.ok();
-    }
+//    }
 }

community-8073/src/main/java/com/ivmiku/tutorial/controller/CommunityController.java

@@ -49,6 +49,7 @@ public class CommunityController {
      * @return 包含社区信息的响应
      */
     @GetMapping("/get/{id}")
+    @Operation(summary = "通过id获取社区信息")
     public Result getCommunity(@PathVariable Long id) {
         Community community = communityService.getById(id);  // 根据ID获取社区信息
         return Result.ok(community);  // 返回包含社区信息的成功结果
@@ -62,6 +63,7 @@ public class CommunityController {
      * @return 更新结果的响应
      */
     @PutMapping("/update/{id}")
+    @Operation(summary = "根据id修改社区")
     public Result updateCommunity(@PathVariable Long id, @RequestBody Community community) {
         communityService.updateCommunity(id, community);  // 调用服务层更新社区信息
         return Result.ok();  // 返回成功结果
@@ -74,6 +76,7 @@ public class CommunityController {
      * @return 删除结果的响应
      */
     @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除社区")
     public Result deleteCommunity(@PathVariable Long id) {
         communityService.deleteCommunity(id);  // 调用服务层删除社区
         return Result.ok();  // 返回成功结果
@@ -86,6 +89,7 @@ public class CommunityController {
      * @return 包含社区信息的响应
      */
     @GetMapping("/getByName/{name}")
+    @Operation(summary = "根据name获取社区信息")
     public Result getCommunityByName(@PathVariable String name) {
         logger.info("社区名称为: {}", name);
         List<Community> communitys = communityService.getByName(name);  // 根据ID获取社区信息
@@ -98,6 +102,7 @@ public class CommunityController {
      * @return 包含社区信息的响应
      */
     @GetMapping("/list")
+    @Operation(summary = "获取所有社区")
     public Result getCommunityList() {
         List<Community> communities = communityService.getCommunityList();  // 获取社区列表
         return Result.ok(communities);  // 返回包含社区信息的成功结果

community-8073/src/main/java/com/ivmiku/tutorial/controller/CommunitytagController.java

@@ -3,6 +3,7 @@ package com.ivmiku.tutorial.controller;
 import com.ivmiku.tutorial.entity.Communitytag;
 import com.ivmiku.tutorial.response.Result;
 import com.ivmiku.tutorial.service.CommunitytagService;
+import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -16,30 +17,35 @@ public class CommunitytagController {
     private CommunitytagService communitytagService;
 
     @PostMapping("/create")
+    @Operation(summary = "创建社区标签")
     public Result createCommunityTag(@RequestBody Communitytag communityTag) {
         communitytagService.createCommunityTag(communityTag);
         return Result.ok();
     }
 
     @PutMapping("/update/{id}")
+    @Operation(summary = "更新社区标签")
     public Result updateCommunityTag(@PathVariable Long id, @RequestBody Communitytag communityTag) {
         communitytagService.updateCommunityTag(id, communityTag);
         return Result.ok();
     }
 
     @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除社区标签")
     public Result deleteCommunityTag(@PathVariable Long id) {
         communitytagService.deleteCommunityTag(id);
         return Result.ok();
     }
 
     @GetMapping("/get/{id}")
+    @Operation(summary = "获取社区标签详情")
     public Result getCommunityTag(@PathVariable Long id) {
         Communitytag communityTag = communitytagService.getCommunityTagById(id);
         return Result.ok(communityTag);
     }
 
     @GetMapping("/list/{communityId}")
+    @Operation(summary = "获取社区标签列表")
     public Result getCommunityTagListByCommunityId(@PathVariable Long communityId) {
         List<Communitytag> tags = communitytagService.getCommunityTagListByCommunityId(communityId);
         return Result.ok(tags);

community-8073/src/main/java/com/ivmiku/tutorial/controller/InteractionController.java

@@ -4,9 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.lang.hash.Hash;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ivmiku.tutorial.entity.Pages;
 import com.ivmiku.tutorial.entity.Post;
+import com.ivmiku.tutorial.entity.Tutorials;
 import com.ivmiku.tutorial.response.Result;
 import com.ivmiku.tutorial.service.InteractionService;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,6 +37,7 @@ public class InteractionController {
      * @return 操作结果
      */
     @PostMapping("/favorite")
+    @Operation(summary = "对帖子收藏")
     public Result favoritePost(@RequestParam Long postId) {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("User {} is favoriting post {}", userOpenid, postId);
@@ -47,6 +52,7 @@ public class InteractionController {
      * @return 操作结果
      */
     @PostMapping("/likePost")
+    @Operation(summary = "对帖子点赞")
     public Result likePost(@RequestParam Long postId) {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("User {} is liking post {}", userOpenid, postId);
@@ -61,6 +67,7 @@ public class InteractionController {
      * @return 操作结果
      */
     @PostMapping("/likeComment")
+    @Operation(summary = "对评论点赞")
     public Result likeComment(@RequestParam Long commentId) {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("User {} is liking comment {}", userOpenid, commentId);
@@ -75,6 +82,7 @@ public class InteractionController {
      * @return 操作结果
      */
     @DeleteMapping("/unfavorite")
+    @Operation(summary = "取消收藏帖子")
     public Result unfavoritePost(@RequestParam Long postId) {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("User {} is unfavoriting post {}", userOpenid, postId);
@@ -89,6 +97,7 @@ public class InteractionController {
      * @return 操作结果
      */
     @DeleteMapping("/unlikePost")
+    @Operation(summary = "取消对帖子的点赞")
     public Result unlikePost(@RequestParam Long postId) {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("User {} is unliking post {}", userOpenid, postId);
@@ -103,6 +112,7 @@ public class InteractionController {
      * @return 操作结果
      */
     @DeleteMapping("/unlikeComment")
+    @Operation(summary = "取消对评论的点赞")
     public Result unlikeComment(@RequestParam Long commentId) {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("User {} is unliking comment {}", userOpenid, commentId);
@@ -116,10 +126,11 @@ public class InteractionController {
      * @return
      */
     @GetMapping("/getFavoritePosts")
-    public Result getFavoritePosts() {
+    @Operation(summary = "获取用户收藏的帖子")
+    public Result getFavoritePosts(@RequestBody Pages pages) {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("用户 {} 正在获取收藏的帖子", userOpenid);
-        IPage<Post> favoritePost = interactionService.getFavoritePosts(userOpenid);
+        IPage<Post> favoritePost = interactionService.getFavoritePosts(userOpenid, pages.getPageNum(), pages.getPageSize());
         HashMap<String, Object> data = new HashMap<>();
         if (favoritePost != null) {
             log.info("用户 {} 收藏的帖子获取成功", userOpenid);
@@ -134,10 +145,82 @@ public class InteractionController {
      * 统计我的获赞数量 笔记数量 收藏数量
      */
     @GetMapping("/getLikeCount")
+    @Operation(summary = "统计用户获赞数量")
     public Result getLikeCount() {
         String userOpenid = StpUtil.getLoginIdAsString();
         log.info("用户 {} 正在获取用户获赞的数量", userOpenid);
         HashMap<String, Object> res = interactionService.getLikeCount(userOpenid);
         return Result.ok();
     }
+
+    /**
+     * 对官方教程点赞
+     * @param tutorialId 教程ID
+     * @return 操作结果
+     */
+    @PostMapping("/likeOfficialTutorial")
+    @Operation(summary = "对官方教程点赞")
+    public Result likeOfficialTutorial(@RequestParam Long tutorialId) {
+        String userOpenid = StpUtil.getLoginIdAsString();
+        log.info("用户 {} 正在对官方教程 {} 点赞", userOpenid, tutorialId);
+        interactionService.likeOfficialTutorial(userOpenid, tutorialId);
+        return Result.ok();
+    }
+
+    /**
+     * 收藏官方教程
+     * @param tutorialId 教程ID
+     * @return 操作结果
+     */
+    @PostMapping("/favoriteOfficialTutorial")
+    @Operation(summary = "收藏官方教程")
+    public Result favoriteOfficialTutorial(@RequestParam Long tutorialId) {
+        String userOpenid = StpUtil.getLoginIdAsString();
+        log.info("用户 {} 正在收藏官方教程 {}", userOpenid, tutorialId);
+        interactionService.favoriteOfficialTutorial(userOpenid, tutorialId);
+        return Result.ok();
+    }
+
+    /**
+     * 取消对官方教程的点赞
+     * @param tutorialId 教程ID
+     * @return 操作结果
+     */
+    @DeleteMapping("/unlikeOfficialTutorial")
+    @Operation(summary = "取消对官方教程的点赞")
+    public Result unlikeOfficialTutorial(@RequestParam Long tutorialId) {
+        String userOpenid = StpUtil.getLoginIdAsString();
+        log.info("用户 {} 正在取消对官方教程 {} 的点赞", userOpenid, tutorialId);
+        interactionService.unlikeOfficialTutorial(userOpenid, tutorialId);
+        return Result.ok();
+    }
+
+    /**
+     * 取消收藏官方教程
+     * @param tutorialId 教程ID
+     * @return 操作结果
+     */
+    @DeleteMapping("/unfavoriteOfficialTutorial")
+    @Operation(summary = "取消收藏官方教程")
+    public Result unfavoriteOfficialTutorial(@RequestParam Long tutorialId) {
+        String userOpenid = StpUtil.getLoginIdAsString();
+        log.info("用户 {} 正在取消收藏官方教程 {}", userOpenid, tutorialId);
+        interactionService.unfavoriteOfficialTutorial(userOpenid, tutorialId);
+        return Result.ok();
+    }
+
+    /**
+     * 获取用户收藏的官方教程
+     * @return 用户收藏的官方教程列表
+     */
+    @GetMapping("/getFavoriteOfficialTutorials")
+    @Operation(summary = "获取用户收藏的官方教程")
+    public Result getFavoriteOfficialTutorials(@RequestBody Pages pages) {
+        String userOpenid = StpUtil.getLoginIdAsString();
+        log.info("用户 {} 正在获取收藏的官方教程", userOpenid);
+        IPage<Tutorials> favoriteTutorials = interactionService.getFavoriteOfficialTutorials(userOpenid, pages.getPageNum(), pages.getPageSize());
+        HashMap<String, Object> data = new HashMap<>();
+        data.put("list", favoriteTutorials);
+        return Result.ok(data);
+    }
 }

community-8073/src/main/java/com/ivmiku/tutorial/controller/PostController.java

@@ -1,6 +1,7 @@
 package com.ivmiku.tutorial.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageInfo;
@@ -9,8 +10,11 @@ import com.ivmiku.tutorial.entity.Post;
 import com.ivmiku.tutorial.response.Result;
 import com.ivmiku.tutorial.service.FileService;
 import com.ivmiku.tutorial.service.PostService;
+import io.swagger.v3.oas.annotations.Operation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -36,14 +40,20 @@ public class PostController {
     @Resource
     private FileService fileService;
 
+    // RedisTemplate 用于存储和检索搜索历史
+    @Resource
+    private RedisTemplate redisTemplate;
+
     @PostMapping("/create")
+    @Operation(summary = "创建帖子")
     public Result createPost(@RequestParam("title") String title,
                              @RequestParam("content") String content,
-                             @RequestParam("communityId") Long communityId,
+                             @RequestParam(value = "communityId") Long communityId,
-                             @RequestParam("imageFiles") MultipartFile[] imageFiles,
+                             @RequestParam(value = "imageFiles", required = false) MultipartFile[] imageFiles,
-                             @RequestParam("videoFile") MultipartFile videoFile,
+                             @RequestParam(value = "videoFile", required = false) MultipartFile videoFile,
                              @RequestParam("isPublic") Integer isPublic,
-                             @RequestParam("location") String location) {
+                             @RequestParam(value = "location", required = false) String location) {
+        System.out.println("Aaa");
         String userId = StpUtil.getLoginIdAsString();
         logger.info("用户ID：{}开始创建帖子", userId);
 
@@ -82,6 +92,7 @@ public class PostController {
 
 
     @GetMapping("/get/{id}")
+    @Operation(summary = "获取帖子详细信息")
     public Result getPost(@PathVariable Long id) {
         logger.info("开始获取帖子ID：{}的详细信息", id);
         String userId = StpUtil.getLoginIdAsString();
@@ -95,6 +106,7 @@ public class PostController {
     }
 
     @PutMapping("/update/{id}")
+    @Operation(summary = "更新帖子信息")
     public Result updatePost(@PathVariable Long id, @RequestBody Post post) {
         String userId = StpUtil.getLoginIdAsString(); // 获取当前登录用户的ID
         logger.info("用户ID：{}开始更新帖子ID：{}", userId, id);
@@ -104,6 +116,7 @@ public class PostController {
     }
 
     @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除帖子")
     public Result deletePost(@PathVariable Long id) {
         String userId = StpUtil.getLoginIdAsString(); // 获取当前登录用户的ID
         logger.info("用户ID：{}开始删除帖子ID：{}", userId, id);
@@ -117,6 +130,7 @@ public class PostController {
      * @return 当前用户帖子列表与该用户的总发布数量
      */
     @GetMapping("/getPostList")
+    @Operation(summary = "用户获取自己发布的帖子的列表")
     public Result getPostList(@RequestBody Pages pages) {
         logger.info("开始获取帖子列表");
         String userId = StpUtil.getLoginIdAsString(); // 获取当前登录用户的ID
@@ -132,6 +146,7 @@ public class PostController {
      * @return 当前用户帖子列表
      */
     @GetMapping("/getCommunityPostList/{communityId}")
+    @Operation(summary = "获取当前社区帖子列表")
     public Result getCommunityPostList(@PathVariable("communityId") Long communityId, @RequestBody Pages pages) {
         logger.info("开始获取帖子列表");
         IPage<Post> posts = postService.getCommunityPostList(communityId, pages.getPageNum(), pages.getPageSize());
@@ -143,6 +158,7 @@ public class PostController {
      * @return
      */
     @GetMapping("/official")
+    @Operation(summary = "获取所有官方创建的帖子")
     public IPage<Post> getOfficialPosts(@RequestBody Pages pages) {
         return postService.getOfficialPosts(pages.getPageNum(), pages.getPageSize());
     }
@@ -152,11 +168,13 @@ public class PostController {
      * @return
      */
     @GetMapping("/nonOfficial")
+    @Operation(summary = "获取所有非官方创建的帖子")
     public IPage<Post> getNonOfficialPosts(@RequestBody Pages pages) {
         return postService.getNonOfficialPosts(pages.getPageNum(), pages.getPageSize());
     }
 
     @PutMapping("/changePublic")
+    @Operation(summary = "修改帖子公开状态")
     public Result changePublic(@RequestParam Long postId, @RequestParam Integer isPublic) {
         String userId = StpUtil.getLoginIdAsString(); // 获取当前登录用户的ID
         logger.info("用户ID：{}开始修改帖子ID：{}的公开状态", userId, postId);
@@ -164,4 +182,165 @@ public class PostController {
         logger.info("用户ID：{}的帖子ID：{}修改成功", userId, postId);
         return Result.ok();
     }
+
+
+    @GetMapping("/popularSearches")
+    @Operation(summary = "获取热门搜索词")
+    public Result getPopularSearches() {
+        List<String> popularSearches = postService.getPopularSearches();
+        return Result.ok(popularSearches);
+    }
+
+    @PostMapping("/searchHistory")
+    @Operation(summary = "保存搜索历史")
+    public Result saveSearchHistory(@RequestParam String keyword) {
+        String userId = StpUtil.getLoginIdAsString();
+        String key = "search_history:" + userId;
+
+        // 保存搜索历史到 Redis 中
+        redisTemplate.opsForList().rightPush(key, keyword);
+        // 如果列表长度超过 10 条，删除最早的记录
+        Long listSize = redisTemplate.opsForList().size(key);
+        if (listSize != null && listSize > 10) {
+            redisTemplate.opsForList().leftPop(key);  // 删除最早的记录
+        }
+
+        return Result.ok("搜索历史保存成功");
+    }
+
+    /**
+     * 获取用户的搜索历史
+     */
+    @GetMapping("/searchHistory")
+    @Operation(summary = "获取用户的搜索历史")
+    public Result getSearchHistory() {
+        String userId = StpUtil.getLoginIdAsString();
+        String key = "search_history:" + userId;
+
+        // 从 Redis 中获取搜索历史
+        List<String> history = redisTemplate.opsForList().range(key, 0, -1);
+
+        return Result.ok(history);
+    }
+
+    /**
+     * 删除用户的搜索历史
+     */
+    @DeleteMapping("/deleteSearchHistory")
+    @Operation(summary = "删除用户的搜索历史")
+    public Result deleteSearchHistory() {
+        String userId = StpUtil.getLoginIdAsString(); // 获取当前登录用户的ID
+        String key = "search_history:" + userId;
+
+        // 删除Redis中的搜索历史
+        redisTemplate.delete(key);
+
+        logger.info("用户ID：{}的搜索历史已删除", userId);
+        return Result.ok("搜索历史已删除");
+    }
+
+
+    /**
+     * 根据关键字搜索帖子，包括标题和内容
+     */
+    @GetMapping("/search")
+    @Operation(summary = "根据关键字搜索帖子")
+    public Result searchPosts(@RequestParam String keyword) {
+        // 保存用户搜索历史
+        saveSearchHistory(keyword);
+
+        // 调用服务层方法进行帖子搜索
+        List<Post> posts = postService.searchPosts(keyword);
+
+        return Result.ok(posts);
+    }
+
+
+    @GetMapping("/topFavorited")
+    @Operation(summary = "获取用户收藏数量较高的帖子")
+    public Result getTopFavoritedPosts(@RequestParam(defaultValue = "10") int limit) {
+        List<Post> topFavoritedPosts = postService.getTopFavoritedPosts(limit);
+        return Result.ok(topFavoritedPosts);
+    }
+
+
+    @PostMapping("/saveDraft")
+    @Operation(summary = "暂存帖子草稿")
+    public Result saveDraft(@RequestParam("title") String title,
+                            @RequestParam("content") String content,
+                            @RequestParam("communityId") Long communityId,
+                            @RequestParam(value = "imageFiles", required = false) MultipartFile[] imageFiles,
+                            @RequestParam(value = "videoFile", required = false) MultipartFile videoFile,
+                            @RequestParam(value = "location", required = false) String location) {
+        String userId = StpUtil.getLoginIdAsString();
+        logger.info("用户ID：{} 开始暂存帖子草稿", userId);
+
+        Post post = new Post();
+        post.setUserOpenid(userId);
+        post.setTitle(title);
+        post.setContent(content);
+        post.setCommunityId(communityId);
+        post.setIsDraft(1);  // 0 表示草稿
+        post.setLocation(location);
+
+        try {
+            // 上传视频
+            if (videoFile != null && !videoFile.isEmpty()) {
+                String uploadResult = fileService.uploadMinio(videoFile);
+                post.setVideoUrl(uploadResult);
+            }
+
+            // 上传图片
+            if (imageFiles != null && imageFiles.length > 0) {
+                StringBuilder imageUrls = new StringBuilder();
+                for (MultipartFile file : imageFiles) {
+                    String uploadResult = fileService.uploadMinio(file);
+                    imageUrls.append(uploadResult).append(";");
+                }
+                post.setImageUrls(imageUrls.toString());
+            }
+        } catch (Exception e) {
+            logger.error("文件上传失败", e);
+            return Result.error("文件上传失败");
+        }
+
+        postService.createPost(post);  // 保存草稿
+        logger.info("用户ID：{} 的帖子草稿暂存成功", userId);
+        return Result.ok(post);
+    }
+
+    @GetMapping("/getDrafts")
+    @Operation(summary = "获取用户的所有草稿")
+    public Result getDrafts() {
+        String userId = StpUtil.getLoginIdAsString();
+        logger.info("用户ID：{} 开始获取草稿", userId);
+
+        List<Post> drafts = postService.getDraftsByUserId(userId);
+
+        if (drafts.isEmpty()) {
+            return Result.error("未找到任何草稿");
+        }
+
+        return Result.ok(drafts);
+    }
+    /**
+     * 猜你喜欢
+     */
+    @GetMapping("/guessYouLike")
+    @Operation(summary = "猜你喜欢")
+    public Result guessYouLike(@RequestParam("latitude") Double latitude,
+                               @RequestParam("longitude") Double longitude) {
+
+        String userId = StpUtil.getLoginIdAsString();
+        String key = "search_history:" + userId;
+        // 获取用户的搜索历史关键词
+        List<String> searchHistory = redisTemplate.opsForList().range(key, 0, -1);
+
+        // 获取猜你喜欢的帖子列表
+        List<Post> recommendedPosts = postService.getRecommendedPosts(latitude, longitude, searchHistory);
+
+        return Result.ok(recommendedPosts);
+    }
+
+
 }

community-8073/src/main/java/com/ivmiku/tutorial/controller/PostTagController.java

@@ -6,6 +6,7 @@ import com.ivmiku.tutorial.entity.PostTag;
 import com.ivmiku.tutorial.entity.Tag;
 import com.ivmiku.tutorial.response.Result;
 import com.ivmiku.tutorial.service.PostTagService;
+import io.swagger.v3.oas.annotations.Operation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +25,7 @@ public class PostTagController {
     private PostTagService postTagService;
 
     @PostMapping("/create")
+    @Operation(summary = "创建帖子标签")
     public Result createPostTag(@RequestBody PostTag postTag) {
         logger.info("开始创建帖子标签");
         postTagService.createPostTag(postTag);
@@ -32,6 +34,7 @@ public class PostTagController {
     }
 
     @GetMapping("/get/{id}")
+    @Operation(summary = "获取帖子标签详细信息")
     public Result getPostTag(@PathVariable Long id) {
         logger.info("开始获取帖子标签ID：{}的详细信息", id);
         PostTag postTag = postTagService.getPostTagById(id);
@@ -44,6 +47,7 @@ public class PostTagController {
     }
 
     @PutMapping("/update/{id}")
+    @Operation(summary = "更新帖子标签")
     public Result updatePostTag(@PathVariable Long id, @RequestBody PostTag postTag) {
         logger.info("开始更新帖子标签ID：{}", id);
         postTagService.updatePostTag(id, postTag);
@@ -52,6 +56,7 @@ public class PostTagController {
     }
 
     @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除帖子标签")
     public Result deletePostTag(@PathVariable Long id) {
         logger.info("开始删除帖子标签ID：{}", id);
         postTagService.deletePostTag(id);
@@ -60,6 +65,7 @@ public class PostTagController {
     }
 
     @GetMapping("/getPostTagList/{postId}")
+    @Operation(summary = "获取帖子附带的标签列表")
     public Result getPostTagList(@PathVariable Long postId) {
         logger.info("开始获取帖子标签列表");
         List<Tag> tags = postTagService.getPostTagList(postId);
@@ -67,6 +73,7 @@ public class PostTagController {
     }
 
     @GetMapping("/getTagPostList/{tagId}")
+    @Operation(summary = "获取标签附带的帖子列表")
     public Result getTagPostList(@PathVariable Long tagId) {
         logger.info("开始获取标签帖子列表");
         List<Post> posts = postTagService.getTagPostList(tagId);
@@ -74,6 +81,7 @@ public class PostTagController {
     }
 
     @GetMapping("/topTags")
+    @Operation(summary = "获取使用次数最多的标签")
     public Result getTopTags(@RequestParam(defaultValue = "10") int topN) {
         logger.info("开始获取前{}个使用次数最多的标签", topN);
         List<String> tags = postTagService.getTopTags(topN);

community-8073/src/main/java/com/ivmiku/tutorial/controller/TagController.java

@@ -5,6 +5,7 @@ import com.ivmiku.tutorial.entity.Tag;
 import com.ivmiku.tutorial.response.Result;
 import com.ivmiku.tutorial.service.PostTagService;
 import com.ivmiku.tutorial.service.TagService;
+import io.swagger.v3.oas.annotations.Operation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,7 @@ public class TagController {
      * @return Result 返回操作结果
      */
     @PostMapping("/create")
+    @Operation(summary = "创建标签")
     public Result createTag(@RequestBody Tag tag) {
         logger.info("开始创建标签：{}", tag.getName());
         tagService.createTag(tag);
@@ -49,6 +51,7 @@ public class TagController {
      * @return Result 返回操作结果和标签详情
      */
     @GetMapping("/get/{id}")
+    @Operation(summary = "获取标签详情")
     public Result getTag(@PathVariable Long id) {
         logger.info("开始获取标签ID：{}的详细信息", id);
         Tag tag = tagService.getTagById(id);
@@ -69,6 +72,7 @@ public class TagController {
      * @return Result 返回操作结果
      */
     @PutMapping("/update/{id}")
+    @Operation(summary = "更新标签")
     public Result updateTag(@PathVariable Long id, @RequestBody Tag tag) {
         logger.info("开始更新标签ID：{}的信息", id);
         tagService.updateTag(id, tag);
@@ -84,6 +88,7 @@ public class TagController {
      * @return Result 返回操作结果
      */
     @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除标签")
     public Result deleteTag(@PathVariable Long id) {
         logger.info("开始删除标签ID：{}", id);
         tagService.deleteTag(id);
@@ -97,6 +102,7 @@ public class TagController {
      * @return Result 返回操作结果和标签详情
      */
     @GetMapping("/getTagList")
+    @Operation(summary = "获取所有标签详情")
     public Result getTagList() {
         List<Tag> tags = tagService.getTagList();
         return Result.ok(tags);
@@ -107,6 +113,7 @@ public class TagController {
      * @return Result 返回操作结果和排序后的标签列表
      */
     @GetMapping("/sorted-tag-list")
+    @Operation(summary = "获取排序后的标签列表")
     public Result getSortedTagList() {
         logger.info("开始获取排序后的标签列表");
         List<Tag> tags = postTagService.getSortedTagList();

community-8073/src/main/java/com/ivmiku/tutorial/controller/TutorialController.java

@@ -0,0 +1,126 @@
+package com.ivmiku.tutorial.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.ivmiku.tutorial.entity.Tutorials;
+import com.ivmiku.tutorial.response.Result;
+import com.ivmiku.tutorial.service.FileService;
+import com.ivmiku.tutorial.service.TutorialsService;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/tutorial")
+@Slf4j
+public class TutorialController {
+
+    private static final Logger logger = LoggerFactory.getLogger(TutorialController.class);
+
+
+    @Autowired
+    private TutorialsService tutorialsService;
+
+    @Resource
+    private FileService fileService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建教程")
+    public Result createTutorial(@RequestParam("title") String title,
+                                 @RequestParam("content") String content,
+                                 @RequestParam("tagId") Long tagId,
+                                 @RequestParam(value = "imageFile", required = false) MultipartFile imageFile,
+                                 @RequestParam(value = "videoFile", required = false) MultipartFile videoFile,
+                                 @RequestParam("isOfficial") Integer isOfficial) {
+        String userId = (String) StpUtil.getLoginId();  // 获取 userOpenid
+        logger.info("用户ID：{} 开始创建教程", userId);
+
+        Tutorials tutorial = new Tutorials();
+        tutorial.setTitle(title);
+        tutorial.setContent(content);
+        tutorial.setTagId(tagId);
+        tutorial.setIsOfficial(isOfficial);
+        tutorial.setUserOpenid(userId);  // 设置 userOpenid
+
+        try {
+            // 上传图片
+            if (imageFile != null && !imageFile.isEmpty()) {
+                String uploadResult = fileService.uploadMinio(imageFile);
+                tutorial.setImageUrl(uploadResult);
+            }
+
+            // 上传视频
+            if (videoFile != null && !videoFile.isEmpty()) {
+                String uploadResult = fileService.uploadMinio(videoFile);
+                tutorial.setVideoUrl(uploadResult);
+            }
+        } catch (Exception e) {
+            logger.error("文件上传失败", e);
+            return Result.error("文件上传失败");
+        }
+
+        tutorialsService.createTutorial(tutorial);
+        logger.info("用户ID：{} 的教程创建成功", userId);
+        return Result.ok(tutorial);
+    }
+
+
+    // 获取教程详细信息
+    @GetMapping("/get/{id}")
+    @Operation(summary = "获取教程详细信息")
+    public Result getTutorial(@PathVariable Long id) {
+        Tutorials tutorial = tutorialsService.getById(id);
+        if (tutorial != null) {
+            return Result.ok(tutorial);
+        }
+        return Result.error("未找到教程");
+    }
+
+    // 更新教程
+    @PutMapping("/update/{id}")
+    @Operation(summary = "更新教程")
+    public Result updateTutorial(@PathVariable Long id, @RequestBody Tutorials tutorial) {
+        tutorial.setTutorialId(id);  // 确保教程ID是正确的
+        boolean updated = tutorialsService.updateById(tutorial);
+        if (updated) {
+            return Result.ok("教程更新成功");
+        }
+        return Result.error("教程更新失败");
+    }
+
+    // 删除教程
+    @DeleteMapping("/delete/{id}")
+    @Operation(summary = "删除教程")
+    public Result deleteTutorial(@PathVariable Long id) {
+        boolean deleted = tutorialsService.removeById(id);
+        if (deleted) {
+            return Result.ok("教程删除成功");
+        }
+        return Result.error("教程删除失败");
+    }
+
+    // 获取所有教程
+    @GetMapping("/list")
+    @Operation(summary = "获取所有教程")
+    public Result listTutorials() {
+        List<Tutorials> tutorials = tutorialsService.list();
+        return Result.ok(tutorials);
+    }
+    // 根据教程标签ID获取教程列表
+    @GetMapping("/listByTag/{tagId}")
+    @Operation(summary = "根据教程标签ID获取教程列表")
+    public Result listTutorialsByTag(@PathVariable Long tagId) {
+        List<Tutorials> tutorials = tutorialsService.getTutorialsByTagId(tagId);
+        if (tutorials.isEmpty()) {
+            return Result.error("未找到对应标签的教程");
+        }
+        return Result.ok(tutorials);
+    }
+
+}

community-8073/src/main/java/com/ivmiku/tutorial/controller/TutorialTagsController.java

@@ -0,0 +1,61 @@
+package com.ivmiku.tutorial.controller;
+
+import com.ivmiku.tutorial.entity.TutorialTags;
+import com.ivmiku.tutorial.response.Result;
+import com.ivmiku.tutorial.service.TutorialTagsService;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/tutorialTags")
+public class TutorialTagsController {
+
+    @Autowired
+    private TutorialTagsService tutorialTagsService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建教程标签")
+    public Result createTag(@RequestParam("tagName") String tagName,
+                            @RequestParam("isOfficial") Integer isOfficial) {
+        TutorialTags tag = new TutorialTags();
+        tag.setTagName(tagName);
+        tag.setIsOfficial(isOfficial);
+
+        tutorialTagsService.createTag(tag);
+        return Result.ok(tag);
+    }
+
+    @GetMapping("/getAll")
+    @Operation(summary = "获取所有教程标签")
+    public Result getAllTags() {
+        List<TutorialTags> tags = tutorialTagsService.getAllTags();
+        return Result.ok(tags);
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新教程标签")
+    public Result updateTag(@RequestParam("tagId") Long tagId,
+                            @RequestParam("tagName") String tagName,
+                            @RequestParam("isOfficial") Integer isOfficial) {
+        TutorialTags tag = tutorialTagsService.getTagById(tagId);
+        if (tag == null) {
+            return Result.error("标签不存在");
+        }
+
+        tag.setTagName(tagName);
+        tag.setIsOfficial(isOfficial);
+
+        tutorialTagsService.updateTag(tag);
+        return Result.ok(tag);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除教程标签")
+    public Result deleteTag(@RequestParam("tagId") Long tagId) {
+        tutorialTagsService.deleteTag(tagId);
+        return Result.ok("标签已删除");
+    }
+}

community-8073/src/main/java/com/ivmiku/tutorial/controller/WebSocketServer.java

@@ -0,0 +1,80 @@
+package com.ivmiku.tutorial.controller;
+
+import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSON;
+import com.ivmiku.tutorial.entity.UserDTO;
+import com.ivmiku.tutorial.response.Result;
+import com.ivmiku.tutorial.service.impl.SearchService;
+import jakarta.websocket.*;
+import jakarta.websocket.server.PathParam;
+import jakarta.websocket.server.ServerEndpoint;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.stereotype.Controller;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Controller
+@ServerEndpoint(value = "/search/{satoken}")
+public class WebSocketServer implements ApplicationContextAware {
+    public static Map<String, Session> sessionMap = new ConcurrentHashMap<>();
+    private static ApplicationContext applicationContext;
+    private SearchService searchService;
+
+    @OnOpen
+    public void onOpen(Session session, EndpointConfig endpointConfig, @PathParam("satoken") String satoken) throws IOException {
+        String userId = (String) StpUtil.getLoginIdByToken(satoken);
+        if (userId == null) {
+            session.getBasicRemote().sendText("Invalid Token");
+            session.close();
+        }
+        sessionMap.put(userId, session);
+        this.searchService = WebSocketServer.applicationContext.getBean(SearchService.class);
+    }
+
+    @OnClose
+    public void onClose(CloseReason closeReason, Session session){
+        sessionMap.remove(session.getId());
+    }
+
+    @OnError
+    public void onError(Throwable throwable) throws IOException {
+        throwable.printStackTrace();
+    }
+
+    @OnMessage
+    public void onMessage(String message, Session session) throws IOException {
+        char first = message.charAt(0);
+        String userId = null;
+        for (Map.Entry<String, Session> entry : sessionMap.entrySet()) {
+            if (entry.getValue().equals(session)) {
+                userId = entry.getKey();
+            }
+        }
+        switch (first) {
+            case '@' -> {
+                String sub = message.substring(1);
+                List<UserDTO> result = searchService.getUserList(sub, userId);
+                session.getBasicRemote().sendText(JSON.toJSONString(Result.ok(result)));
+            }
+            case '#' -> {
+                String sub = message.substring(1);
+                List<String> list = searchService.getTag(sub);
+                session.getBasicRemote().sendText(JSON.toJSONString(Result.ok(list)));
+            }
+            //预留给社区搜索
+            default -> {
+
+            }
+        }
+    }
+
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        WebSocketServer.applicationContext = applicationContext;
+    }
+}

community-8073/src/main/java/com/ivmiku/tutorial/entity/Comment.java

@@ -21,6 +21,9 @@ public class Comment implements Serializable {
 
     private Long postId;
 
+    @TableField("tutorialId")
+    private Long tutorialId; // 新增字段
+
     private String content;
 
     private Long parentCommentId;

community-8073/src/main/java/com/ivmiku/tutorial/entity/Favorite.java

@@ -22,5 +22,7 @@ public class Favorite implements Serializable {
 
     private Integer isDeleted;
 
+    private Long tutorialId;  // 新增字段
+
     private static final long serialVersionUID = 1L;
 }

community-8073/src/main/java/com/ivmiku/tutorial/entity/Likee.java

@@ -20,6 +20,8 @@ public class Likee implements Serializable {
 
     private Long commentId;
 
+    private Long tutorialId;  // 新增字段
+
     private Integer isDeleted;
 
     private static final long serialVersionUID = 1L;

community-8073/src/main/java/com/ivmiku/tutorial/entity/Post.java

@@ -37,9 +37,13 @@ public class Post implements Serializable {
 
     private String location; // 存储帖子位置信息
 
+    private Integer isDraft; // 是否为草稿 0不是 1是
+
     private Date createdAt;
 
     private Date updatedAt;
 
     private static final long serialVersionUID = 1L;
+
+
 }

community-8073/src/main/java/com/ivmiku/tutorial/entity/Subscribe.java

@@ -0,0 +1,13 @@
+package com.ivmiku.tutorial.entity;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author Aurora
+ */
+@TableName("subscribe")
+@Data
+public class Subscribe {
+    private Long id;
+    private Long subId;
+}

community-8073/src/main/java/com/ivmiku/tutorial/entity/TutorialTags.java

@@ -0,0 +1,25 @@
+package com.ivmiku.tutorial.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import lombok.Data;
+
+/**
+ * @TableName tutorial_tags
+ */
+@TableName(value ="tutorial_tags")
+@Data
+public class TutorialTags implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Long tagId;
+
+    private String tagName;
+
+    private Integer isOfficial;
+
+    @TableLogic
+    private Integer isDeleted;
+
+    private static final long serialVersionUID = 1L;
+}

community-8073/src/main/java/com/ivmiku/tutorial/entity/Tutorials.java

@@ -0,0 +1,38 @@
+package com.ivmiku.tutorial.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @TableName tutorials
+ */
+@TableName(value ="tutorials")
+@Data
+public class Tutorials implements Serializable {
+    @TableId(type = IdType.AUTO)
+    private Long tutorialId;
+
+    private String title;
+
+    private String content;
+
+    private String imageUrl;
+
+    private String videoUrl;
+
+    private Integer isOfficial;
+
+    @TableLogic
+    private Integer isDeleted;
+
+    private Date createdAt;
+
+    private Long tagId;
+
+    private String userOpenid;  // 新增的字段
+
+    private static final long serialVersionUID = 1L;
+}

community-8073/src/main/java/com/ivmiku/tutorial/entity/User.java

@@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+@TableName("user")
 @Data
-@TableName("User")
 public class User {
     @TableId
     private String openid;
     private String nickname;
     private String avatarUrl;
+    private boolean isAdmin;
+    private String phoneNum;
+    private String birthday;
+    private String gender;
 }

community-8073/src/main/java/com/ivmiku/tutorial/entity/UserDTO.java

@@ -0,0 +1,12 @@
+package com.ivmiku.tutorial.entity;
+
+import lombok.Data;
+
+@Data
+public class UserDTO {
+    private String nickname;
+    private String avatarUrl;
+    private String phoneNum;
+    private String birthday;
+    private String gender;
+}

community-8073/src/main/java/com/ivmiku/tutorial/mapper/LikeMapper.java

@@ -14,13 +14,16 @@ import org.apache.ibatis.annotations.Select;
 public interface LikeMapper extends BaseMapper<Likee> {
 
     // 获取帖子获赞数
-    @Select("SELECT SUM(like_count) FROM posts WHERE user_openid = #{userOpenid}")
+
     Long getPostLikeCount(@Param("userOpenid") String userOpenid);
 
     // 获取评论获赞数
-    @Select("SELECT SUM(like_count) FROM comments WHERE user_openid = #{userOpenid}")
+
     Long getCommentLikeCount(@Param("userOpenid") String userOpenid);
 
+    // 查询帖子被点赞的总数
+    Long getLikeCountByPostId(@Param("postId") Long postId);
+
 }
 
 

community-8073/src/main/java/com/ivmiku/tutorial/mapper/PostMapper.java

@@ -17,6 +17,18 @@ public interface PostMapper extends BaseMapper<Post> {
 
 
     List<Post> getTagPostList(Long tagId);
+
+    List<String> selectPopularSearches();
+
+    List<Post> searchPosts(String keyword);
+
+    List<Post> getTopFavoritedPosts(int limit);
+
+    List<Post> getPostsBasedOnHistoryAndHotness(Long userId, List<String> searchHistory);
+
+
+    @Select("SELECT * FROM post WHERE ST_Distance_Sphere(point(location_lng, location_lat), point(#{longitude}, #{latitude})) < 50000") // 50km 范围
+    List<Post> getPostsNearby(Double latitude, Double longitude);
 }
 
 

community-8073/src/main/java/com/ivmiku/tutorial/mapper/SubscribeMapper.java

@@ -0,0 +1,8 @@
+package com.ivmiku.tutorial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ivmiku.tutorial.entity.Subscribe;
+
+public interface SubscribeMapper extends BaseMapper<Subscribe> {
+
+}

community-8073/src/main/java/com/ivmiku/tutorial/mapper/TutorialTagsMapper.java

@@ -0,0 +1,18 @@
+package com.ivmiku.tutorial.mapper;
+
+import com.ivmiku.tutorial.entity.TutorialTags;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author rog
+* @description 针对表【tutorial_tags】的数据库操作Mapper
+* @createDate 2024-08-29 21:15:08
+* @Entity com.ivmiku.tutorial.entity.TutorialTags
+*/
+public interface TutorialTagsMapper extends BaseMapper<TutorialTags> {
+
+}
+
+
+
+

community-8073/src/main/java/com/ivmiku/tutorial/mapper/TutorialsMapper.java

@@ -0,0 +1,18 @@
+package com.ivmiku.tutorial.mapper;
+
+import com.ivmiku.tutorial.entity.Tutorials;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author rog
+* @description 针对表【tutorials】的数据库操作Mapper
+* @createDate 2024-08-29 21:14:50
+* @Entity com.ivmiku.tutorial.entity.Tutorials
+*/
+public interface TutorialsMapper extends BaseMapper<Tutorials> {
+
+}
+
+
+
+

community-8073/src/main/java/com/ivmiku/tutorial/mapper/UserMapper.java

@@ -0,0 +1,7 @@
+package com.ivmiku.tutorial.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ivmiku.tutorial.entity.User;
+
+public interface UserMapper extends BaseMapper<User> {
+}

community-8073/src/main/java/com/ivmiku/tutorial/service/CommentService.java

@@ -68,5 +68,5 @@ public interface CommentService extends IService<Comment> {
     void createReply(Long parentCommentId, Long postId, String content, String mentionedUserId);
 
 
-
+    IPage<Comment> getTutorialComments(Long tutorialId, Integer pageNum, Integer pageSize);
 }

community-8073/src/main/java/com/ivmiku/tutorial/service/InteractionService.java

@@ -2,6 +2,7 @@ package com.ivmiku.tutorial.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ivmiku.tutorial.entity.Post;
+import com.ivmiku.tutorial.entity.Tutorials;
 
 import java.util.HashMap;
 import java.util.List;
@@ -17,7 +18,19 @@ public interface InteractionService {
     void likeComment(String userOpenid, Long commentId);
     void unlikeComment(String userOpenid, Long commentId);
 
-    IPage<Post> getFavoritePosts(String userOpenid);
+    IPage<Post> getFavoritePosts(String userOpenid, int pageNum, int pageSize);
 
     HashMap<String, Object> getLikeCount(String userOpenid);
+
+    void likeOfficialTutorial(String userOpenid, Long tutorialId);
+
+    void favoriteOfficialTutorial(String userOpenid, Long tutorialId);
+
+    void unlikeOfficialTutorial(String userOpenid, Long tutorialId);
+
+    void unfavoriteOfficialTutorial(String userOpenid, Long tutorialId);
+
+    IPage<Tutorials> getFavoriteOfficialTutorials(String userOpenid, int pageNum, int pageSize);
+    // 新增方法：根据帖子 ID 获取点赞总数
+    Long getLikeCountByPostId(Long postId);
 }

community-8073/src/main/java/com/ivmiku/tutorial/service/PostService.java

@@ -23,4 +23,16 @@ public interface PostService extends IService<Post> {
     IPage<Post> getNonOfficialPosts(int pageNum, int pageSize);
 
     void changePublic(Long postId, Integer isPublic);
+
+    List<String> getPopularSearches();
+
+    List<Post> searchPosts(String keyword);
+
+    List<Post> getTopFavoritedPosts(int limit);
+
+    List<Post> getDraftsByUserId(String userId);
+
+    List<Post> getRecommendedPosts(Double latitude, Double longitude, List<String> searchHistory);
+
+
 }

community-8073/src/main/java/com/ivmiku/tutorial/service/TutorialTagsService.java

@@ -0,0 +1,25 @@
+package com.ivmiku.tutorial.service;
+
+import com.ivmiku.tutorial.entity.TutorialTags;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author rog
+* @description 针对表【tutorial_tags】的数据库操作Service
+* @createDate 2024-08-29 21:15:08
+*/
+public interface TutorialTagsService extends IService<TutorialTags> {
+
+
+    void createTag(TutorialTags tag);
+
+    List<TutorialTags> getAllTags();
+
+    TutorialTags getTagById(Long tagId);
+
+    void updateTag(TutorialTags tag);
+
+    void deleteTag(Long tagId);
+}

community-8073/src/main/java/com/ivmiku/tutorial/service/TutorialsService.java

@@ -0,0 +1,20 @@
+package com.ivmiku.tutorial.service;
+
+import com.ivmiku.tutorial.entity.Tutorials;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+* @author rog
+* @description 针对表【tutorials】的数据库操作Service
+* @createDate 2024-08-29 21:14:50
+*/
+public interface TutorialsService extends IService<Tutorials> {
+
+    void createTutorial(Tutorials tutorial);
+
+    List<Tutorials> getTutorialsByTagId(Long tagId);
+
+    List<Tutorials> getTutorialsByIds(List<Long> tutorialIds);
+}

community-8073/src/main/java/com/ivmiku/tutorial/service/impl/CommentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ivmiku.tutorial.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,10 +9,13 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ivmiku.tutorial.entity.Comment;
 import com.ivmiku.tutorial.mapper.CommentMapper;
+import com.ivmiku.tutorial.response.AtNotifier;
 import com.ivmiku.tutorial.service.CommentService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,6 +34,9 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
     @Autowired
     protected CommentMapper commentMapper;
 
+    @Resource
+    private RabbitTemplate rabbitTemplate;
+
     /**
      * 保存评论。
      * 将评论数据保存到数据库。
@@ -186,8 +193,38 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
             reply.setMentionedUserId(mentionedUserId);
         }
         createComment(reply);
+        if (mentionedUserId != null) {
+            AtNotifier notifier = new AtNotifier();
+            notifier.setFromId(reply.getUserOpenid());
+            notifier.setToId(mentionedUserId);
+            notifier.setPostId(String.valueOf(reply.getCommentId()));
+            rabbitTemplate.convertAndSend("exchange2", "", JSON.toJSONString(notifier));
+        }
 
         logger.info("评论回复成功，评论ID：{}", reply.getCommentId());
     }
 
+    @Override
+    public IPage<Comment> getTutorialComments(Long tutorialId, Integer pageNum, Integer pageSize) {
+        logger.info("开始获取帖子ID：{}的评论列表，第{}页，每页{}条", tutorialId, pageNum, pageSize);
+
+        // 设置分页参数
+//        PageHelper.startPage(pageNum, pageSize);
+        IPage<Comment> page = new Page<>(pageNum, pageSize);
+
+        // 查询评论
+        LambdaQueryWrapper<Comment> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Comment::getTutorialId, tutorialId).eq(Comment::getIsDeleted, 0);
+        IPage<Comment> comments = commentMapper.selectPage(page, wrapper);
+
+        if (comments != null) {
+            logger.info("获取教程ID：{}的评论列表成功", tutorialId);
+        } else {
+            logger.warn("教程ID：{}的评论列表为空", tutorialId);
+        }
+
+        // 使用 PageInfo 包装结果
+        return comments;
+    }
+
 }

community-8073/src/main/java/com/ivmiku/tutorial/service/impl/InteractionServiceImpl.java

@@ -3,18 +3,22 @@ package com.ivmiku.tutorial.service.impl;
 import cn.hutool.core.lang.hash.Hash;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ivmiku.tutorial.entity.Favorite;
 import com.ivmiku.tutorial.entity.Likee;
 import com.ivmiku.tutorial.entity.Post;
+import com.ivmiku.tutorial.entity.Tutorials;
 import com.ivmiku.tutorial.mapper.FavoriteMapper;
 import com.ivmiku.tutorial.mapper.LikeMapper;
 import com.ivmiku.tutorial.service.InteractionService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ivmiku.tutorial.service.PostService;
+import com.ivmiku.tutorial.service.TutorialsService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -34,6 +38,9 @@ public class InteractionServiceImpl implements InteractionService {
     @Resource
     private PostService postService;
 
+    @Resource
+    private TutorialsService tutorialService;
+
     @Override
     public void favoritePost(String userOpenid, Long postId) {
         log.info("User {} is favoriting post {}", userOpenid, postId);
@@ -107,13 +114,13 @@ public class InteractionServiceImpl implements InteractionService {
     }
 
     @Override
-    public IPage<Post> getFavoritePosts(String userOpenid) {
+    public IPage<Post> getFavoritePosts(String userOpenid, int pageNum, int pageSize) {
         LambdaQueryWrapper<Favorite> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(Favorite::getUserOpenid, userOpenid);
         List<Favorite> favorites = favoriteMapper.selectList(wrapper);
         if (favorites != null && !favorites.isEmpty()) {
             List<Long> postIds = favorites.stream().map(Favorite::getPostId).toList();
-            return postService.getPostList(userOpenid, 1, 10);
+            return postService.getPostList(userOpenid, pageNum, pageSize);
         }
         return null;
     }
@@ -157,8 +164,97 @@ public class InteractionServiceImpl implements InteractionService {
         } else {
             res.put("favoriteCount", 0L); // 如果为空，设置为0
         }
-        Long myTotalPost = getFavoritePosts(userOpenid).getTotal();
-        res.put("myTotalPost", myTotalPost);
         return res;
     }
+
+    @Override
+    public void likeOfficialTutorial(String userOpenid, Long tutorialId) {
+        log.info("User {} is liking tutorial {}", userOpenid, tutorialId);
+        Likee likee = new Likee();
+        likee.setUserOpenid(userOpenid);
+        likee.setTutorialId(tutorialId);
+        likee.setIsDeleted(0);
+        likeMapper.insert(likee);
+    }
+
+    @Override
+    public void favoriteOfficialTutorial(String userOpenid, Long tutorialId) {
+        log.info("User {} is favoriting tutorial {}", userOpenid, tutorialId);
+        Favorite favorite = new Favorite();
+        favorite.setUserOpenid(userOpenid);
+        favorite.setTutorialId(tutorialId);
+        favorite.setIsDeleted(0);
+        favoriteMapper.insert(favorite);
+    }
+
+    @Override
+    public void unlikeOfficialTutorial(String userOpenid, Long tutorialId) {
+        log.info("User {} is unliking tutorial {}", userOpenid, tutorialId);
+        QueryWrapper<Likee> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_openid", userOpenid)
+                .eq("tutorial_id", tutorialId)
+                .eq("is_deleted", 0);
+        Likee likee = likeMapper.selectOne(queryWrapper);
+        if (likee != null) {
+            likee.setIsDeleted(1);
+            likeMapper.updateById(likee);
+        }
+    }
+
+    @Override
+    public void unfavoriteOfficialTutorial(String userOpenid, Long tutorialId) {
+        log.info("User {} is unfavoriting tutorial {}", userOpenid, tutorialId);
+        QueryWrapper<Favorite> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_openid", userOpenid)
+                .eq("tutorial_id", tutorialId)
+                .eq("is_deleted", 0);
+        Favorite favorite = favoriteMapper.selectOne(queryWrapper);
+        if (favorite != null) {
+            favorite.setIsDeleted(1);
+            favoriteMapper.updateById(favorite);
+        }
+    }
+
+
+    @Override
+    public IPage<Tutorials> getFavoriteOfficialTutorials(String userOpenid, int pageNum, int pageSize) {
+        // 创建分页对象
+        IPage<Favorite> page = new Page<>(pageNum, pageSize);
+
+        // 创建查询条件，筛选出用户收藏的且未被删除的教程
+        LambdaQueryWrapper<Favorite> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(Favorite::getUserOpenid, userOpenid)
+                .isNotNull(Favorite::getTutorialId)  // 确保教程ID不为空
+                .eq(Favorite::getIsDeleted, 0);      // 只获取未删除的收藏记录
+
+        // 分页查询收藏的教程ID
+        IPage<Favorite> favoritePage = favoriteMapper.selectPage(page, wrapper);
+
+        // 提取出所有收藏的教程ID
+        List<Long> tutorialIds = favoritePage.getRecords().stream()
+                .map(Favorite::getTutorialId)
+                .toList();
+
+        if (tutorialIds.isEmpty()) {
+            return new Page<>();  // 如果没有收藏记录，返回空的分页对象
+        }
+
+        // 通过教程ID列表查询对应的教程实体，并将分页结果映射到教程分页
+        List<Tutorials> tutorials = tutorialService.getTutorialsByIds(tutorialIds);
+
+        // 创建一个新的分页对象，用于返回教程数据
+        IPage<Tutorials> tutorialPage = new Page<>(pageNum, pageSize);
+        tutorialPage.setRecords(tutorials);
+        tutorialPage.setTotal(favoritePage.getTotal()); // 设置总记录数
+
+        return tutorialPage;
+    }
+
+
+    @Override
+    public Long getLikeCountByPostId(Long postId) {
+        log.info("Fetching like count for post {}", postId);
+        return likeMapper.getLikeCountByPostId(postId);
+    }
+
 }

community-8073/src/main/java/com/ivmiku/tutorial/service/impl/PostServiceImpl.java

@@ -5,16 +5,24 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ivmiku.tutorial.entity.BrowingHistory;
 import com.ivmiku.tutorial.entity.Post;
+import com.ivmiku.tutorial.mapper.CommentMapper;
+import com.ivmiku.tutorial.mapper.FavoriteMapper;
+import com.ivmiku.tutorial.mapper.LikeMapper;
 import com.ivmiku.tutorial.mapper.PostMapper;
 import com.ivmiku.tutorial.service.BrowingHistoryService;
+import com.ivmiku.tutorial.service.InteractionService;
 import com.ivmiku.tutorial.service.PostService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import java.sql.Timestamp;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements PostService {
@@ -24,6 +32,10 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements Po
     @Autowired
     private PostMapper postMapper;
 
+    @Lazy
+    @Autowired
+    private InteractionService interactionService;
+
     @Autowired
     private BrowingHistoryService browingHistoryService;
 
@@ -170,4 +182,62 @@ public class PostServiceImpl extends ServiceImpl<PostMapper, Post> implements Po
         post.setIsPublic(isPublic);
         postMapper.update(post, wrapper);
     }
+
+    @Override
+    public List<String> getPopularSearches() {
+        return postMapper.selectPopularSearches();
+    }
+
+    @Override
+    public List<Post> searchPosts(String keyword) {
+        // 调用 Mapper 中的搜索方法
+        return postMapper.searchPosts(keyword);
+    }
+
+    @Override
+    public List<Post> getTopFavoritedPosts(int limit) {
+        return postMapper.getTopFavoritedPosts(limit);
+    }
+
+
+    @Override
+    public List<Post> getDraftsByUserId(String userId) {
+        return postMapper.selectList(new LambdaQueryWrapper<Post>()
+                .eq(Post::getUserOpenid, userId)
+                .eq(Post::getIsDraft, 1));  // 0 表示草稿
+    }
+
+
+    @Override
+    public List<Post> getRecommendedPosts(Double latitude, Double longitude, List<String> searchHistory) {
+        // 1. 根据用户当前位置计算距离（例如使用 Haversine 公式）
+        List<Post> nearbyPosts = postMapper.getPostsNearby(latitude, longitude);
+
+        // 2. 根据帖子热度排序
+        List<Post> sortedPosts = sortPostsByHeat(nearbyPosts);
+
+        // 3. 根据用户的搜索历史关键词筛选相关帖子
+        List<Post> matchingPosts = sortedPosts.stream()
+                .filter(post -> searchHistory.stream().anyMatch(keyword ->
+                        post.getTitle().contains(keyword) || post.getContent().contains(keyword)))
+                .collect(Collectors.toList());
+
+        return matchingPosts;
+    }
+
+    public List<Post> sortPostsByHeat(List<Post> posts) {
+        // 根据帖子热度进行排序
+        return posts.stream()
+                .sorted((post1, post2) -> {
+                    int post1Heat = calculatePostHeat(post1);
+                    int post2Heat = calculatePostHeat(post2);
+                    return Integer.compare(post2Heat, post1Heat); // 降序排列
+                })
+                .collect(Collectors.toList());
+    }
+    public int calculatePostHeat(Post post) {
+        Long postId = post.getPostId();
+        return interactionService.getLikeCountByPostId(postId).intValue();
+    }
+
 }

community-8073/src/main/java/com/ivmiku/tutorial/service/impl/SearchService.java

@@ -0,0 +1,58 @@
+package com.ivmiku.tutorial.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ivmiku.tutorial.entity.Subscribe;
+import com.ivmiku.tutorial.entity.Tag;
+import com.ivmiku.tutorial.entity.User;
+import com.ivmiku.tutorial.entity.UserDTO;
+import com.ivmiku.tutorial.mapper.PostTagMapper;
+import com.ivmiku.tutorial.mapper.SubscribeMapper;
+import com.ivmiku.tutorial.mapper.TagMapper;
+import com.ivmiku.tutorial.mapper.UserMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class SearchService {
+    @Resource
+    private UserMapper userMapper;
+
+    @Resource
+    private TagMapper tagMapper;
+
+    @Resource
+    private SubscribeMapper subscribeMapper;
+
+    public List<UserDTO> getUserList(String text, String userId) {
+        int len = text.length();
+        QueryWrapper<Subscribe> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user1_id", userId);
+        List<Subscribe> list = subscribeMapper.selectList(queryWrapper);
+        List<UserDTO> result = new ArrayList<>();
+        for (Subscribe subscribe : list) {
+            String user2Id = String.valueOf(subscribe.getSubId());
+            User user = userMapper.selectById(user2Id);
+            if (user.getNickname().substring(0, len).equals(text)) {
+                UserDTO userDTO = new UserDTO();
+                userDTO.setNickname(user.getNickname());
+                userDTO.setAvatarUrl(user.getAvatarUrl());
+                result.add(userDTO);
+            }
+        }
+        return result;
+    }
+
+    public List<String> getTag(String text) {
+        QueryWrapper<Tag> queryWrapper = new QueryWrapper<>();
+        queryWrapper.likeRight("name", text);
+        List<Tag> list = tagMapper.selectList(queryWrapper);
+        List<String> result = new ArrayList<>();
+        for (Tag tag : list) {
+            result.add(tag.getName());
+        }
+        return result;
+    }
+}

community-8073/src/main/java/com/ivmiku/tutorial/service/impl/TutorialTagsServiceImpl.java

@@ -0,0 +1,56 @@
+package com.ivmiku.tutorial.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ivmiku.tutorial.entity.TutorialTags;
+import com.ivmiku.tutorial.service.TutorialTagsService;
+import com.ivmiku.tutorial.mapper.TutorialTagsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author rog
+* @description 针对表【tutorial_tags】的数据库操作Service实现
+* @createDate 2024-08-29 21:15:08
+*/
+@Service
+public class TutorialTagsServiceImpl extends ServiceImpl<TutorialTagsMapper, TutorialTags>
+    implements TutorialTagsService{
+
+    @Autowired
+    private TutorialTagsMapper tutorialTagsMapper;
+
+    @Override
+    public void createTag(TutorialTags tag) {
+        tutorialTagsMapper.insert(tag);
+    }
+
+    @Override
+    public List<TutorialTags> getAllTags() {
+        QueryWrapper<TutorialTags> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted", 0);
+        return tutorialTagsMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public TutorialTags getTagById(Long tagId) {
+        return tutorialTagsMapper.selectById(tagId);
+    }
+
+    @Override
+    public void updateTag(TutorialTags tag) {
+        tutorialTagsMapper.updateById(tag);
+    }
+
+    @Override
+    public void deleteTag(Long tagId) {
+        tutorialTagsMapper.deleteById(tagId);
+    }
+
+}
+
+
+
+

community-8073/src/main/java/com/ivmiku/tutorial/service/impl/TutorialsServiceImpl.java

@@ -0,0 +1,53 @@
+package com.ivmiku.tutorial.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ivmiku.tutorial.entity.Tutorials;
+import com.ivmiku.tutorial.service.TutorialsService;
+import com.ivmiku.tutorial.mapper.TutorialsMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author rog
+* @description 针对表【tutorials】的数据库操作Service实现
+* @createDate 2024-08-29 21:14:50
+*/
+@Service
+public class TutorialsServiceImpl extends ServiceImpl<TutorialsMapper, Tutorials>
+    implements TutorialsService{
+
+    @Autowired
+    private TutorialsMapper tutorialsMapper;
+
+    // 其他已存在的方法
+
+    @Override
+    public List<Tutorials> getTutorialsByTagId(Long tagId) {
+        QueryWrapper<Tutorials> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("tag_id", tagId);
+        return tutorialsMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public List<Tutorials> getTutorialsByIds(List<Long> tutorialIds) {
+        if (tutorialIds != null && !tutorialIds.isEmpty()) {
+            QueryWrapper<Tutorials> queryWrapper = new QueryWrapper<>();
+            queryWrapper.in("tutorial_id", tutorialIds);
+            return tutorialsMapper.selectList(queryWrapper);
+        }
+        return null;
+    }
+
+    @Override
+    public void createTutorial(Tutorials tutorial) {
+        this.save(tutorial);
+    }
+
+}
+
+
+
+

community-8073/src/main/java/com/ivmiku/tutorial/util/MyRedisUtil.java

@@ -0,0 +1,94 @@
+package com.ivmiku.tutorial.util;
+
+import com.alibaba.fastjson2.JSON;
+import com.ivmiku.tutorial.response.AtNotifier;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author Aurora
+ */
+@Component
+public class MyRedisUtil {
+    @Autowired
+    private RedisTemplate<String, Object> redisTemplate;
+
+    public void listAdd(String key, Object value) {
+        redisTemplate.opsForList().leftPush(key, value);
+    }
+
+    public List<AtNotifier> listGet(String key, int s, int e) {
+        List<Object> list = redisTemplate.opsForList().range(key, s, e);
+        List<AtNotifier> result = new ArrayList<>();
+        if (list != null) {
+            for (Object json : list) {
+                result.add(JSON.parseObject(JSON.toJSONString(json), AtNotifier.class));
+            }
+        }
+        return result;
+    }
+
+    public void listClear(String key) {
+        redisTemplate.opsForList().trim(key, 1, 0);
+    }
+
+    public Long getListSize(String key) {
+        return redisTemplate.opsForList().size(key);
+    }
+
+    public Set<String> getKey() {
+        return redisTemplate.keys("history:*");
+    }
+
+    public Object rightPop(String key) {
+        return redisTemplate.opsForList().rightPop(key);
+    }
+
+
+
+
+
+    public void setExpireTime(String key) {
+        if (redisTemplate.opsForValue().getOperations().getExpire(key) > 0) {
+            redisTemplate.expire(key, 3, TimeUnit.DAYS);
+        }
+    }
+
+    public void refreshExpire(String key) {
+        redisTemplate.persist(key);
+        redisTemplate.expire(key, 3, TimeUnit.DAYS);
+    }
+
+    public boolean ifExist(String key) {
+        return Boolean.TRUE.equals(redisTemplate.hasKey(key));
+    }
+
+    public List<String> getStringList(String key, int s, int e) {
+        List<Object> list = redisTemplate.opsForList().range(key, s, e);
+        List<String> result = new ArrayList<>();
+        assert list != null;
+        for (Object object : list) {
+            result.add((String) object);
+        }
+        return result;
+    }
+
+    public void insertKey(String openid, String sessionKey) {
+        redisTemplate.opsForValue().set("sessionkey:" + openid, sessionKey);
+    }
+
+    public String getKey(String userId) {
+        return (String) redisTemplate.opsForValue().get("sessionkey:" + userId);
+    }
+
+    public void deleteFromList(AtNotifier message) {
+        String id = message.getToId();
+        redisTemplate.opsForList().remove("unread:" + id, 0, message);
+    }
+}

community-8073/src/main/resources/application-dep.properties

@@ -1,9 +1,11 @@
 wx.miniapp.configs[0].appid=wx0d4fdb5c7bf3b12b
 wx.miniapp.configs[0].secret=989f155fcc3aee616568473faf1b1d3b
 
-spring.data.redis.host=127.0.0.1
+spring.data.redis.host=redis
 spring.data.redis.port=6379
 spring.data.redis.database=0
+spring.data.redis.password=Shuodedaoli114514
+
 
 spring.application.name=community
 
@@ -11,14 +13,25 @@ server.port=8073
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Shuodedaoli114514
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://mysql:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=nacos:8848
 spring.cloud.nacos.discovery.enabled=true
 
-management.zipkin.tracing.endpoint=http://127.0.0.1:9411/api/v2/spans
+dubbo.application.qos-enable=false
-management.tracing.sampling.probability=1.0
 
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
+minio.endpoint=120.26.243.81
+minio.port=9000
+minio.accessKey=minio_root
+minio.secretKey=minio_123456
+minio.bucketName=haixia
+
+spring.data.redis.lettuce.pool.max-active=32
+spring.data.redis.lettuce.pool.max-idle=16
+spring.data.redis.lettuce.pool.min-idle=8
+
+spring.rabbitmq.host=rabbitmq
 

community-8073/src/main/resources/mapper/CommentMapper.xml

@@ -8,6 +8,7 @@
         <id property="commentId" column="comment_id" jdbcType="BIGINT"/>
         <result property="userOpenid" column="user_openid" jdbcType="VARCHAR"/>
         <result property="postId" column="post_id" jdbcType="BIGINT"/>
+        <result property="tutorialId" column="tutorialId" jdbcType="BIGINT"/>
         <result property="content" column="content" jdbcType="VARCHAR"/>
         <result property="parentCommentId" column="parent_comment_id" jdbcType="BIGINT"/>
         <result property="isDeleted" column="is_deleted" jdbcType="TINYINT"/>
@@ -19,7 +20,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        comment_id, user_openid, post_id, content,
+        comment_id, user_openid, post_id, tutorialId, content,
         parent_comment_id, is_deleted, created_at, updated_at,
         mentioned_user_id, image_urls, video_url
     </sql>

community-8073/src/main/resources/mapper/FavoriteMapper.xml

@@ -8,11 +8,12 @@
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="userOpenid" column="user_openid" jdbcType="VARCHAR"/>
             <result property="postId" column="post_id" jdbcType="BIGINT"/>
+            <result property="tutorialId" column="tutorialId" jdbcType="BIGINT"/>
             <result property="isDeleted" column="is_deleted" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,user_openid,post_id,
+        id,user_openid, post_id, tutorialId,
         is_deleted
     </sql>
 </mapper>

community-8073/src/main/resources/mapper/LikeMapper.xml

@@ -5,15 +5,33 @@
 <mapper namespace="com.ivmiku.tutorial.mapper.LikeMapper">
 
     <resultMap id="BaseResultMap" type="com.ivmiku.tutorial.entity.Likee">
-            <id property="id" column="id" jdbcType="BIGINT"/>
+        <id property="id" column="id" jdbcType="BIGINT"/>
-            <result property="userOpenid" column="user_openid" jdbcType="VARCHAR"/>
+        <result property="userOpenid" column="user_openid" jdbcType="VARCHAR"/>
-            <result property="postId" column="post_id" jdbcType="BIGINT"/>
+        <result property="postId" column="post_id" jdbcType="BIGINT"/>
-            <result property="commentId" column="comment_id" jdbcType="BIGINT"/>
+        <result property="tutorialId" column="tutorial_id" jdbcType="BIGINT"/>
-            <result property="isDeleted" column="is_deleted" jdbcType="TINYINT"/>
+        <result property="commentId" column="comment_id" jdbcType="BIGINT"/>
+        <result property="isDeleted" column="is_deleted" jdbcType="TINYINT"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,user_openid,post_id,
+        id, user_openid, post_id, tutorial_id, comment_id, is_deleted
-        comment_id,is_deleted
     </sql>
+
+    <!-- 查询用户所有帖子的点赞总数 -->
+    <select id="getPostLikeCount" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM likee
+        WHERE user_openid = #{userOpenid}
+          AND post_id IS NOT NULL
+          AND is_deleted = 0;
+    </select>
+
+    <!-- 查询用户所有评论的点赞总数 -->
+    <select id="getCommentLikeCount" resultType="java.lang.Long">
+        SELECT COUNT(*)
+        FROM likee
+        WHERE user_openid = #{userOpenid}
+          AND comment_id IS NOT NULL
+          AND is_deleted = 0;
+    </select>
 </mapper>

community-8073/src/main/resources/mapper/PostMapper.xml

@@ -16,6 +16,7 @@
         <result property="isOfficial" column="is_official" jdbcType="TINYINT"/>
         <result property="isPublic" column="is_public" jdbcType="TINYINT"/>
         <result property="location" column="location" jdbcType="VARCHAR"/>
+        <result property="isDraft" column="is_draft" jdbcType="TINYINT"/>
         <result property="createdAt" column="created_at" jdbcType="TIMESTAMP"/>
         <result property="updatedAt" column="updated_at" jdbcType="TIMESTAMP"/>
     </resultMap>
@@ -37,32 +38,33 @@
     <!-- 插入新的帖子 -->
     <insert id="insertPost" parameterType="com.ivmiku.tutorial.entity.Post">
         INSERT INTO post (
-        post_id, user_openid, community_id, title, content,
+            post_id, user_openid, community_id, title, content,
-        video_url, image_urls,
+            video_url, image_urls,
-        is_deleted, is_official, is_public, location, created_at, updated_at
+            is_deleted, is_official, is_public, location, is_draft, created_at, updated_at
         ) VALUES (
-        #{postId}, #{userOpenid}, #{communityId}, #{title}, #{content},
+                     #{postId}, #{userOpenid}, #{communityId}, #{title}, #{content},
-        #{videoUrl}, #{imageUrls},
+                     #{videoUrl}, #{imageUrls},
-        #{isDeleted}, #{isOfficial}, #{is_public}, #{location}, #{createdAt}, #{updatedAt}
+                     #{isDeleted}, #{isOfficial}, #{isPublic}, #{location}, #{isDraft}, #{createdAt}, #{updatedAt}
-        )
+                 )
     </insert>
 
     <!-- 更新帖子 -->
     <update id="updatePost" parameterType="com.ivmiku.tutorial.entity.Post">
         UPDATE post
         SET
-        user_openid = #{userOpenid},
+            user_openid = #{userOpenid},
-        community_id = #{communityId},
+            community_id = #{communityId},
-        title = #{title},
+            title = #{title},
-        content = #{content},
+            content = #{content},
-        video_url = #{videoUrl},
+            video_url = #{videoUrl},
-        image_urls = #{imageUrls},
+            image_urls = #{imageUrls},
-        is_deleted = #{isDeleted},
+            is_deleted = #{isDeleted},
-        is_official = #{isOfficial},
+            is_official = #{isOfficial},
-        is_public = #{is_public},
+            is_public = #{isPublic},
-        location = #{location},
+            location = #{location},
-        created_at = #{createdAt},
+            is_draft = #{isDraft},
-        updated_at = #{updatedAt}
+            created_at = #{createdAt},
+            updated_at = #{updatedAt}
         WHERE post_id = #{postId}
     </update>
 
@@ -80,5 +82,36 @@
         FROM post p, posttag pt, tag t
         WHERE p.post_id = pt.post_id AND pt.tag_id = t.tag_id AND t.tag_id = #{tagId} AND p.is_deleted = 0 AND p.is_public = 1
     </select>
+    <select id="selectPopularSearches" resultType="java.lang.String">
+        SELECT title
+        FROM post
+        WHERE is_deleted = 0 AND is_public = 1
+        LIMIT 9
+    </select>
+    <select id="searchPosts" resultType="com.ivmiku.tutorial.entity.Post">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM post
+        WHERE is_deleted = 0
+        AND is_public = 1
+        AND (title LIKE CONCAT('%', #{keyword}, '%')
+        OR content LIKE CONCAT('%', #{keyword}, '%'))
+    </select>
+    <select id="getTopFavoritedPosts" resultType="com.ivmiku.tutorial.entity.Post">
+        SELECT p.post_id, p.user_openid, p.community_id, p.title, p.content,
+               p.is_deleted, p.is_official, p.is_public, p.location, p.created_at, p.updated_at
+        FROM post p
+                 JOIN favorite f ON p.post_id = f.post_id
+        WHERE p.is_deleted = 0 AND p.is_public = 1 AND f.is_deleted = 0
+        GROUP BY p.post_id
+        ORDER BY COUNT(f.id) DESC
+            LIMIT #{limit}
+    </select>
+    <select id="getPostsBasedOnHistoryAndHotness" resultType="com.ivmiku.tutorial.entity.Post">
+        SELECT *
+        FROM post
+        WHERE content LIKE CONCAT('%', #{searchHistory}, '%')
+        ORDER BY hotness DESC
+    </select>
 
 </mapper>

community-8073/src/main/resources/mapper/TutorialTagsMapper.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ivmiku.tutorial.mapper.TutorialTagsMapper">
+
+    <resultMap id="BaseResultMap" type="com.ivmiku.tutorial.entity.TutorialTags">
+            <id property="tagId" column="tag_id" jdbcType="BIGINT"/>
+            <result property="tagName" column="tag_name" jdbcType="VARCHAR"/>
+            <result property="isOfficial" column="is_official" jdbcType="TINYINT"/>
+            <result property="isDeleted" column="is_deleted" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        tag_id,tag_name,is_official,
+        is_deleted
+    </sql>
+</mapper>

community-8073/src/main/resources/mapper/TutorialsMapper.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ivmiku.tutorial.mapper.TutorialsMapper">
+
+    <resultMap id="BaseResultMap" type="com.ivmiku.tutorial.entity.Tutorials">
+        <id column="tutorial_id" property="tutorialId" jdbcType="BIGINT"/>
+        <result column="title" property="title" jdbcType="VARCHAR"/>
+        <result column="content" property="content" jdbcType="VARCHAR"/>
+        <result column="image_url" property="imageUrl" jdbcType="VARCHAR"/>
+        <result column="video_url" property="videoUrl" jdbcType="VARCHAR"/>
+        <result column="is_official" property="isOfficial" jdbcType="INTEGER"/>
+        <result column="is_deleted" property="isDeleted" jdbcType="INTEGER"/>
+        <result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
+        <result column="tag_id" property="tagId" jdbcType="BIGINT"/>
+        <result column="user_openid" property="userOpenid" jdbcType="VARCHAR"/>  <!-- 新增的映射 -->
+    </resultMap>
+
+
+    <sql id="Base_Column_List">
+        tutorial_id,title,content,
+        image_url,video_url,is_official,
+        is_deleted,created_at,tag_id
+    </sql>
+</mapper>

gateway-8133/pom.xml

@@ -56,26 +56,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
-        <!--micrometer-tracing指标追踪  1-->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing</artifactId>
-        </dependency>
-        <!--micrometer-tracing-bridge-brave适配zipkin的桥接包 2-->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing-bridge-brave</artifactId>
-        </dependency>
-        <!--micrometer-observation 3-->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-observation</artifactId>
-        </dependency>
-        <!--zipkin-reporter-brave 5-->
-        <dependency>
-            <groupId>io.zipkin.reporter2</groupId>
-            <artifactId>zipkin-reporter-brave</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.csp</groupId>
             <artifactId>sentinel-transport-simple-http</artifactId>

gateway-8133/src/main/java/com/ivmiku/tutorial/Main8133.java

@@ -3,9 +3,7 @@ package com.ivmiku.tutorial;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(exclude = {
+@SpringBootApplication
-        org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration.class
-})
 public class Main8133 {
     public static void main(String[] args) {
         SpringApplication.run(Main8133.class, args);

gateway-8133/src/main/java/com/ivmiku/tutorial/config/SaTokenConfigure.java

@@ -47,7 +47,8 @@ public class SaTokenConfigure {
                         "/user/register",
                         "/swagger-resources/**",
                         "/v3/**",
-                        "/swagger-ui/**")
+                        "/swagger-ui/**",
+                        "/ws/**")
                 // 鉴权方法：每次访问进入
                 .setAuth(obj -> {
                     // 登录校验 -- 拦截所有路由，并排除指定路由

gateway-8133/src/main/resources/application-dep.properties

@@ -1,16 +1,32 @@
 server.port=8133
 
 spring.application.name=gateway
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=nacos:8848
 
-spring.data.redis.host=127.0.0.1
+spring.data.redis.host=redis
 spring.data.redis.port=6379
 spring.data.redis.database=0
-#spring.data.redis.password=Shuodedaoli114514
+spring.data.redis.password=Shuodedaoli114514
 
 spring.cloud.gateway.routes[0].id=user
 spring.cloud.gateway.routes[0].uri=lb://user
 spring.cloud.gateway.routes[0].predicates[0]=Path=/user/**
+spring.cloud.gateway.routes[0].filters[0]=StripPrefix=1
 
-management.zipkin.tracing.endpoint=http://127.0.0.1:9411/api/v2/spans
+spring.cloud.gateway.routes[1].id=community
-management.tracing.sampling.probability=1.0
+spring.cloud.gateway.routes[1].uri=lb://community
+spring.cloud.gateway.routes[1].predicates[0]=Path=/community/**
+spring.cloud.gateway.routes[1].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[2].id=navigate
+spring.cloud.gateway.routes[2].uri=lb://navigate
+spring.cloud.gateway.routes[2].predicates[0]=Path=/navigate/**
+spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[3].id=websocket
+spring.cloud.gateway.routes[3].uri=lb:ws://user
+spring.cloud.gateway.routes[3].predicates[0]=Path=/chat/**
+
+spring.cloud.gateway.routes[4].id=search
+spring.cloud.gateway.routes[4].uri=lb:ws://community
+spring.cloud.gateway.routes[4].predicates[0]=Path=/search/**

gateway-8133/src/main/resources/application-dev.properties

@@ -17,5 +17,15 @@ spring.cloud.gateway.routes[1].uri=lb://community
 spring.cloud.gateway.routes[1].predicates[0]=Path=/community/**
 spring.cloud.gateway.routes[1].filters[0]=StripPrefix=1
 
-#management.zipkin.tracing.endpoint=http://localhost:9411/api/v2/spans
+spring.cloud.gateway.routes[2].id=navigate
-#management.tracing.sampling.probability=1.0
+spring.cloud.gateway.routes[2].uri=lb://navigate
+spring.cloud.gateway.routes[2].predicates[0]=Path=/navigate/**
+spring.cloud.gateway.routes[2].filters[0]=StripPrefix=1
+
+spring.cloud.gateway.routes[3].id=websocket
+spring.cloud.gateway.routes[3].uri=lb:ws://user
+spring.cloud.gateway.routes[3].predicates[0]=Path=/chat/**
+
+spring.cloud.gateway.routes[4].id=search
+spring.cloud.gateway.routes[4].uri=lb:ws://community
+spring.cloud.gateway.routes[4].predicates[0]=Path=/search/**

navigate-8432/pom.xml

@@ -38,7 +38,7 @@
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
-            <scope>runtime</scope>
+            <version>8.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -109,5 +109,51 @@
             <artifactId>tencentcloud-sdk-java-asr</artifactId>
             <version>3.1.1083</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/ai.djl/api -->
+        <dependency>
+            <groupId>ai.djl</groupId>
+            <artifactId>api</artifactId>
+            <version>0.29.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/ai.djl.pytorch/pytorch-model-zoo -->
+        <dependency>
+            <groupId>ai.djl.pytorch</groupId>
+            <artifactId>pytorch-model-zoo</artifactId>
+            <version>0.29.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/ai.djl.pytorch/pytorch-engine -->
+        <dependency>
+            <groupId>ai.djl.pytorch</groupId>
+            <artifactId>pytorch-engine</artifactId>
+            <version>0.29.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/ai.djl.pytorch/pytorch-native-auto -->
+        <dependency>
+            <groupId>ai.djl.pytorch</groupId>
+            <artifactId>pytorch-native-auto</artifactId>
+            <version>1.9.1</version>
+            <scope>runtime</scope>
+        </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>3.0.13</version>
+                <configuration>
+                    <mainClass>com.ivmiku.tutorial.Main8432</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

navigate-8432/src/main/java/com/ivmiku/tutorial/controller/AssistantController.java

@@ -1,12 +1,15 @@
 package com.ivmiku.tutorial.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.ivmiku.tutorial.entity.AssistantQuery;
 import com.ivmiku.tutorial.response.Result;
 import com.ivmiku.tutorial.service.AssistantService;
 import jakarta.annotation.Resource;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -16,9 +19,10 @@ public class AssistantController {
     @Resource
     private AssistantService assistantService;
 
-    @GetMapping("/response")
+    @PostMapping("/response")
-    public Object getResponse(@RequestParam String input) {
+    public Object getResponse(@RequestBody AssistantQuery query) {
-        Map<String, Object> map = assistantService.getResponse(input);
+        String userInput = assistantService.speechRecognition(query.getContent(), query.getSize(), query.getLanguage());
+        Map<String, Object> map = assistantService.getResponse(userInput, query.getLanguage());
         if (map == null) {
             return Result.error("请求出错");
         }

navigate-8432/src/main/java/com/ivmiku/tutorial/controller/NavigateController.java

@@ -57,10 +57,29 @@ public class NavigateController {
     }
 
     @PostMapping("/ticket")
-    public Object scanTicket(@RequestPart MultipartFile file) throws IOException {
+    public Object scanTicket(@RequestPart MultipartFile file, @RequestParam String location) throws IOException {
         BufferedImage image = ImageIO.read(file.getInputStream());
         Map<String, Object> map = navigateService.scanTicket(image);
-        return Result.ok(map);
+        Map<String, Object> result = new HashMap<>();
+        if (map.containsKey("登机口")) {
+            String address = navigateService.deGeoCode(location);
+            address += map.get("登机口");
+            address += "登机口";
+            result.put("地址", address);
+        } else if (map.containsKey("检票口")) {
+            if (map.containsKey("左边车站")) {
+                String address = (String) map.get("左边车站");
+                address += map.get("检票口");
+                address += "检票口";
+                result.put("地址", address);
+            } else {
+                String address = navigateService.deGeoCode(location);
+                address += map.get("检票口");
+                address += "检票口";
+                result.put("地址", address);
+            }
+        }
+        return Result.ok(result);
     }
 
     @GetMapping("/geocode")

navigate-8432/src/main/java/com/ivmiku/tutorial/entity/AssistantQuery.java

@@ -0,0 +1,10 @@
+package com.ivmiku.tutorial.entity;
+
+import lombok.Data;
+
+@Data
+public class AssistantQuery {
+    private String content;
+    private Integer size;
+    private String language;
+}

navigate-8432/src/main/java/com/ivmiku/tutorial/service/AssistantService.java

@@ -34,10 +34,16 @@ public class AssistantService {
     private final String secretId = "AKID09INNYxYEFFJH3g9VhljVF3qbDiFdx50";
     private final String secretKey = "KajjcNyNaaUCqQroqpzNoMtTHNj4Lbil";
 
-    public Map<String, Object> getAiResponse(String userInput) {
+    public String getAiResponse(String userInput, String language) {
         Map<String, Object> message1 = new HashMap<>();
         message1.put("role", "system");
-        message1.put("content", "模仿语音助手，对用户的问题给出简短的回答");
+        String prompt = "模仿语音助手，对用户的问题给出简短的回答";
+        if ("Chinese".equals(language)) {
+            prompt += "，用中文回答";
+        } else if ("English".equals(language)) {
+            prompt += "，用英文回答";
+        }
+        message1.put("content", prompt);
         Map<String, Object> message2 = new HashMap<>();
         message2.put("role", "user");
         message2.put("content", userInput);
@@ -60,12 +66,10 @@ public class AssistantService {
         JSONArray choices = result.getJSONArray("choices");
         JSONObject message = choices.getJSONObject(0);
         JSONObject content = message.getJSONObject("message");
-        Map<String, Object> map = new HashMap<>();
+        return content.getString("content");
-        map.put("content", content.get("content"));
-        return map;
     }
 
-    public String textToSpeech(String content) {
+    public String textToSpeech(String content, String language) {
         try{
             Credential cred = new Credential(secretId, secretKey);
             HttpProfile httpProfile = new HttpProfile();
@@ -77,6 +81,9 @@ public class AssistantService {
             req.setText(content);
             req.setSessionId(SnowflakeUtil.getNext());
             req.setVoiceType(101006L);
+            if (language.equals("English")) {
+                req.setPrimaryLanguage(2L);
+            }
             TextToVoiceResponse resp = client.TextToVoice(req);
             return resp.getAudio();
         } catch (TencentCloudSDKException e) {
@@ -84,7 +91,7 @@ public class AssistantService {
         }
     }
 
-    public String speechRecognition(String content, Integer length) {
+    public String speechRecognition(String content, Integer length, String language) {
         try{
             Credential cred = new Credential(secretId, secretKey);
             HttpProfile httpProfile = new HttpProfile();
@@ -93,7 +100,11 @@ public class AssistantService {
             clientProfile.setHttpProfile(httpProfile);
             AsrClient client = new AsrClient(cred, "", clientProfile);
             SentenceRecognitionRequest req = new SentenceRecognitionRequest();
-            req.setEngSerViceType("16k_zh");
+            if ("Chinese".equals(language)) {
+                req.setEngSerViceType("16k_zh");
+            } else if ("English".equals(language)) {
+                req.setEngSerViceType("16k_en");
+            }
             req.setSourceType(1L);
             req.setVoiceFormat("wav");
             req.setData(content);
@@ -143,15 +154,16 @@ public class AssistantService {
         return String.valueOf(message.getJSONObject("message"));
     }
 
-    public Map<String, Object> getResponse(String query) {
+    public Map<String, Object> getResponse(String query, String language) {
         Map<String, Object> result = new HashMap<>();
         String tag = extractTag(query);
         String content;
         content = searchGuidance(tag);
-        if (content != null) {
+        if (content == null) {
-            result.put("content", content);
+            content = getAiResponse(query, language);
-            return result;
         }
-        return getAiResponse(query);
+        Map<String, Object> map = new HashMap<>();
+        map.put("content", textToSpeech(content, language));
+        return map;
     }
 }

navigate-8432/src/main/java/com/ivmiku/tutorial/service/NavigateService.java

@@ -53,7 +53,7 @@ public class NavigateService {
     }
 
     public Map<String, Object> scanTicket(BufferedImage image) {
-        String base64Img = ImgUtil.toBase64(image, "jpg");
+        String base64Img = ImgUtil.toBase64(image, "png");
         SmartStructuralOCRV2Response resp;
         try {
             Credential cred = new Credential(secretId, secretKey);
@@ -64,7 +64,7 @@ public class NavigateService {
             OcrClient client = new OcrClient(cred, "ap-shanghai", clientProfile);
             SmartStructuralOCRV2Request req = new SmartStructuralOCRV2Request();
             req.setImageBase64(base64Img);
-            String[] itemNames1 = {"登机口", "检票口"};
+            String[] itemNames1 = {"登机口", "检票口", "左边车站", "右边车站"};
             req.setItemNames(itemNames1);
             resp = client.SmartStructuralOCRV2(req);
         } catch (TencentCloudSDKException e) {
@@ -106,4 +106,23 @@ public class NavigateService {
         JSONObject location = array.getJSONObject(0);
         return location.getString("location");
     }
+
+    public String deGeoCode(String fomattedLoc) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("key", key);
+        params.put("location", fomattedLoc);
+        params.put("poitype", "飞机场|火车站|地铁站");
+        HttpResponse response = HttpRequest.get("https://restapi.amap.com/v3/geocode/regeo")
+                .form(params)
+                .execute();
+        String result = response.body();
+        response.close();
+        JSONObject resultObj = JSONObject.parseObject(result);
+        if (resultObj.getInteger("status")==0) {
+            return null;
+        }
+        JSONObject reGeoCode = resultObj.getJSONObject("regeocode");
+        String address = reGeoCode.getString("formatted_address");
+        return address;
+    }
 }

navigate-8432/src/main/java/com/ivmiku/tutorial/service/RecogintionService.java

@@ -0,0 +1,10 @@
+package com.ivmiku.tutorial.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class RecogintionService {
+    static {
+
+    }
+}

navigate-8432/src/main/resources/application-dep.properties

@@ -10,10 +10,7 @@ server.port=8432
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
 spring.datasource.password=Shuodedaoli114514
-spring.datasource.url=jdbc:mysql://mysql:4514/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&ServerTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://mysql:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&ServerTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 
 spring.cloud.nacos.discovery.server-addr=nacos:8848
-spring.cloud.nacos.discovery.enabled=true
+spring.cloud.nacos.discovery.enabled=true
-
-management.zipkin.tracing.endpoint=http://zipkin:9411/api/v2/spans
-management.tracing.sampling.probability=1.0

navigate-8432/src/main/resources/application-dev.properties

@@ -10,5 +10,5 @@ dubbo.application.qos-enable=false
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=12345abcde
+spring.datasource.password=Shuodedaoli114514
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&ServerTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://154.40.44.199:4514/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&ServerTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true

pom.xml

@@ -13,7 +13,7 @@
         <module>user-8072</module>
         <module>commons</module>
         <module>community-8073</module>
-
+        <module>navigate-8432</module>
     </modules>
 
     <properties>
@@ -178,6 +178,11 @@
                 <artifactId>sa-token-spring-boot3-starter</artifactId>
                 <version>${satoken-version}</version>
             </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-redis-jackson</artifactId>
+                <version>${satoken-version}</version>
+            </dependency>
             <!-- https://mvnrepository.com/artifact/org.apache.dubbo/dubbo-registry-nacos -->
             <dependency>
                 <groupId>org.apache.dubbo</groupId>

user-8072/pom.xml

@@ -65,45 +65,10 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
-        <!-- dubbo -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.dubbo/dubbo-registry-nacos -->
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-registry-nacos</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-loadbalancer</artifactId>
         </dependency>
-        <!--micrometer-tracing指标追踪  1-->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing</artifactId>
-        </dependency>
-        <!--micrometer-tracing-bridge-brave适配zipkin的桥接包 2-->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-tracing-bridge-brave</artifactId>
-        </dependency>
-        <!--micrometer-observation 3-->
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-observation</artifactId>
-        </dependency>
-        <!--zipkin-reporter-brave 5-->
-        <dependency>
-            <groupId>io.zipkin.reporter2</groupId>
-            <artifactId>zipkin-reporter-brave</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-tracing-brave-zipkin-starter</artifactId>
-            <version>3.2.13</version>
-        </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>

user-8072/src/main/java/com/ivmiku/tutorial/Main8072.java

@@ -4,9 +4,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-@SpringBootApplication(exclude = {
+@SpringBootApplication
-        org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinAutoConfiguration.class
-})
 @MapperScan("com.ivmiku.tutorial.mapper")
 public class Main8072 {
     public static void main(String[] args) {

user-8072/src/main/java/com/ivmiku/tutorial/config/RabbitMqConfig.java

@@ -14,14 +14,29 @@ public class RabbitMqConfig {
         return new Queue("queue1",true);
     }
 
+    @Bean
+    public Queue queue2() {
+        return new Queue("queue2",true);
+    }
+
     @Bean
     public FanoutExchange exchange1() {
         return new FanoutExchange("exchange1",true, false);
     }
 
+    @Bean
+    public FanoutExchange exchange2() {
+        return new FanoutExchange("exchange2",true, false);
+    }
+
     @Bean
     public Binding binding1() {
         return BindingBuilder.bind(queue1()).to(exchange1());
     }
+
+    @Bean
+    public Binding binding2() {
+        return BindingBuilder.bind(queue2()).to(exchange2());
+    }
 }
 

user-8072/src/main/java/com/ivmiku/tutorial/controller/MessageController.java

@@ -12,7 +12,7 @@ import java.text.ParseException;
 
 @SaCheckLogin
 @RestController
-@RequestMapping("/api/message")
+@RequestMapping("/message")
 public class MessageController {
     @Autowired
     private MessageService messageService;

user-8072/src/main/java/com/ivmiku/tutorial/controller/RelationController.java

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.*;
 
 @SaCheckLogin
 @RestController
-@RequestMapping("/api/relation")
+@RequestMapping("/relation")
 public class RelationController {
     @Autowired
     private RelationService relationService;

user-8072/src/main/java/com/ivmiku/tutorial/controller/UserController.java

@@ -7,8 +7,10 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson2.JSON;
 import com.ivmiku.tutorial.entity.User;
+import com.ivmiku.tutorial.entity.UserDTO;
 import com.ivmiku.tutorial.mapper.UserMapper;
 import com.ivmiku.tutorial.response.Result;
+import com.ivmiku.tutorial.service.UserService;
 import com.ivmiku.tutorial.utils.RedisUtil;
 import jakarta.annotation.Resource;
 import me.chanjar.weixin.common.error.WxErrorException;
@@ -28,9 +30,13 @@ public class UserController {
     @Resource
     private RedisUtil redisUtil;
 
+    @Resource
+    private UserService userService;
+
     @GetMapping("/login")
-    public Object login(@RequestParam(name = "code") String code, @RequestParam(name = "rawdata") String rawData, @RequestParam(name = "signature") String signature
+    public Object login(@RequestParam(name = "code") String code,
-) {
+                        @RequestParam(name = "rawdata") String rawData,
+                        @RequestParam(name = "signature") String signature) {
         WxMaJscode2SessionResult session;
         try {
             session = wxMaService.getUserService().getSessionInfo(code);
@@ -49,6 +55,8 @@ public class UserController {
             user.setOpenid(session.getOpenid());
             user.setNickname(raw.getString("nickname"));
             user.setAvatarUrl(raw.getString("avatarUrl"));
+            user.setGender(raw.getString("gender"));
+            user.setAdmin(false);
             userMapper.insert(user);
         }
         map.put("token", StpUtil.getTokenValue());
@@ -56,4 +64,21 @@ public class UserController {
         WxMaConfigHolder.remove();
         return JSON.toJSON(Result.ok(map));
     }
+
+    @GetMapping("/validate")
+    public Object validate() {
+        try {
+            StpUtil.checkLogin();
+        } catch (Exception e) {
+            return Result.error(e.getMessage());
+        }
+        return Result.ok();
+    }
+
+    @PostMapping("/edit")
+    public Object editInfo(@RequestBody UserDTO userDTO) {
+        String loginId = (String) StpUtil.getLoginId();
+        userService.changeUserInfo(userDTO, loginId);
+        return Result.ok();
+    }
 }

user-8072/src/main/java/com/ivmiku/tutorial/controller/WebSocketServer.java

@@ -2,7 +2,9 @@ package com.ivmiku.tutorial.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.ivmiku.tutorial.entity.Message;
+import com.ivmiku.tutorial.response.AtNotifier;
 import com.ivmiku.tutorial.service.MessageService;
 import com.ivmiku.tutorial.service.RelationService;
 import com.ivmiku.tutorial.utils.DateUtil;
@@ -11,11 +13,7 @@ import jakarta.websocket.*;
 import jakarta.websocket.server.PathParam;
 import jakarta.websocket.server.ServerEndpoint;
 import org.springframework.amqp.core.ExchangeTypes;
-import org.springframework.amqp.rabbit.annotation.Exchange;
+import org.springframework.amqp.rabbit.annotation.*;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.QueueBinding;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +26,6 @@ import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static jakarta.websocket.CloseReason.CloseCodes.CLOSED_ABNORMALLY;
@@ -70,6 +67,7 @@ public class WebSocketServer implements ApplicationContextAware {
             if (relationService.ifIgnored(msg.getToId(), msg.getFromId())) {
             session.getBasicRemote().sendText("您已被对方屏蔽");
         } else {
+            messageService.insertMessage(msg);
             rabbitTemplate.convertAndSend("exchange1", "", JSON.toJSONString(msg));
         }
     }
@@ -88,7 +86,15 @@ public class WebSocketServer implements ApplicationContextAware {
         sessionMap.put(userId, session);
         List<Message> unreadList = messageService.getUnreadMsg(userId);
         for(Message msg : unreadList) {
-            session.getBasicRemote().sendText(JSON.toJSONString(msg));
+            JSONObject object = JSONObject.from(msg);
+            object.put("type", 1);
+            session.getBasicRemote().sendText(object.toJSONString());
+        }
+        List<AtNotifier> atList = messageService.getAtList(userId);
+        for (AtNotifier notifier : atList) {
+            JSONObject object = JSONObject.from(notifier);
+            object.put("type", 2);
+            session.getBasicRemote().sendText(object.toJSONString());
         }
     }
 
@@ -133,10 +139,28 @@ public class WebSocketServer implements ApplicationContextAware {
             value = @Queue(),
             exchange = @Exchange(value = "exchange1",type = ExchangeTypes.FANOUT)
     ))
-    public void sendMsg(String message) throws IOException, ParseException {
+    public void sendMsg(String message) throws IOException {
         Message msg = JSON.parseObject(message, Message.class);
         if (sessionMap.containsKey(msg.getToId())) {
-            sessionMap.get(msg.getToId()).getBasicRemote().sendText(JSON.toJSONString(msg));
+            JSONObject jsonObject = JSONObject.from(msg);
+            jsonObject.put("type", 1);
+            sessionMap.get(msg.getToId()).getBasicRemote().sendText(jsonObject.toJSONString());
+            messageService.deleteMessage(msg);
+        }
+    }
+
+    @RabbitHandler
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(),
+            exchange = @Exchange(value = "exchange2",type = ExchangeTypes.FANOUT)
+    ))
+    public void sendAt(String message) throws IOException {
+        AtNotifier notifier = JSON.parseObject(message, AtNotifier.class);
+        if (sessionMap.containsKey(notifier.getToId())) {
+            JSONObject jsonObject = JSONObject.from(notifier);
+            jsonObject.put("type", 2);
+            sessionMap.get(notifier.getToId()).getBasicRemote().sendText(jsonObject.toJSONString());
+            messageService.deleteNotifier(notifier);
         }
     }
 }

user-8072/src/main/java/com/ivmiku/tutorial/entity/User.java

@@ -11,4 +11,8 @@ public class User {
     private String openid;
     private String nickname;
     private String avatarUrl;
+    private boolean isAdmin;
+    private String phoneNum;
+    private String birthday;
+    private String gender;
 }

user-8072/src/main/java/com/ivmiku/tutorial/entity/UserDTO.java

@@ -0,0 +1,12 @@
+package com.ivmiku.tutorial.entity;
+
+import lombok.Data;
+
+@Data
+public class UserDTO {
+    private String nickname;
+    private String avatarUrl;
+    private String phoneNum;
+    private String birthday;
+    private String gender;
+}

user-8072/src/main/java/com/ivmiku/tutorial/service/MessageService.java

@@ -6,6 +6,7 @@ import com.ivmiku.tutorial.entity.ChatId;
 import com.ivmiku.tutorial.entity.Message;
 import com.ivmiku.tutorial.mapper.ChatIdMapper;
 import com.ivmiku.tutorial.mapper.MessageMapper;
+import com.ivmiku.tutorial.response.AtNotifier;
 import com.ivmiku.tutorial.utils.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
@@ -104,9 +105,12 @@ public class MessageService {
      * @return 查询结果
      */
     public List<Message> getUnreadMsg(String userId) {
-        List<Message> result = redisUtil.listGet("unread:" + userId, 0, -1);
+        if (redisUtil.ifExist("unread:" + userId)) {
-        redisUtil.listClear(userId);
+            List<Message> result = redisUtil.listGet("unread:" + userId, 0, -1);
-        return result;
+            redisUtil.listClear("unread:" + userId);
+            return result;
+        }
+        return new ArrayList<>();
     }
 
     /**
@@ -233,4 +237,21 @@ public class MessageService {
             }
         }
     }
+
+    public void insertMessage(Message message) {
+        String id = message.getToId();
+        redisUtil.listAdd("unread:" + id, message);
+    }
+
+    public void deleteMessage(Message message) {
+        redisUtil.deleteFromList(message);
+    }
+
+    public void deleteNotifier(AtNotifier notifier) {
+        redisUtil.deleteFromList(notifier);
+    }
+
+    public List<AtNotifier> getAtList(String userId) {
+        return redisUtil.listGetN("at:" + userId, 0, -1);
+    }
 }

user-8072/src/main/java/com/ivmiku/tutorial/service/UserService.java

@@ -1,6 +1,9 @@
 package com.ivmiku.tutorial.service;
 
+import cn.hutool.core.util.DesensitizedUtil;
+import cn.hutool.crypto.SecureUtil;
 import com.ivmiku.tutorial.entity.User;
+import com.ivmiku.tutorial.entity.UserDTO;
 import com.ivmiku.tutorial.mapper.UserMapper;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -13,4 +16,30 @@ public class UserService {
     public User selectUserById(String id) {
         return userMapper.selectById(id);
     }
+
+    public void changeUserInfo(UserDTO userDTO, String openid) {
+        String nickname = userDTO.getNickname();
+        String avatarUrl = userDTO.getAvatarUrl();
+        String gender = userDTO.getGender();
+        String phoneNum = userDTO.getPhoneNum();
+        String birthday = userDTO.getBirthday();
+        User user = userMapper.selectById(openid);
+        if (nickname != null) {
+            user.setNickname(nickname);
+        }
+        if (avatarUrl != null) {
+            user.setAvatarUrl(avatarUrl);
+        }
+        if (gender != null) {
+            user.setGender(gender);
+        }
+        if (phoneNum != null) {
+            phoneNum = DesensitizedUtil.mobilePhone(phoneNum);
+            user.setPhoneNum(phoneNum);
+        }
+        if (birthday != null) {
+            user.setBirthday(birthday);
+        }
+        userMapper.updateById(user);
+    }
 }

user-8072/src/main/java/com/ivmiku/tutorial/utils/RedisUtil.java

@@ -2,6 +2,7 @@ package com.ivmiku.tutorial.utils;
 
 import com.alibaba.fastjson2.JSON;
 import com.ivmiku.tutorial.entity.Message;
+import com.ivmiku.tutorial.response.AtNotifier;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -114,4 +115,37 @@ public class RedisUtil {
         }
         return result;
     }
+
+    public void insertKey(String openid, String sessionKey) {
+        redisTemplate.opsForValue().set("sessionkey:" + openid, sessionKey);
+    }
+
+    public String getKey(String userId) {
+        return (String) redisTemplate.opsForValue().get("sessionkey:" + userId);
+    }
+
+    public void deleteFromList(Message message) {
+        String id = message.getToId();
+        redisTemplate.opsForList().remove("unread:" + id, 0, message);
+    }
+
+    public void listAddN(String key, Object value) {
+        redisTemplate.opsForList().leftPush(key, value);
+    }
+
+    public List<AtNotifier> listGetN(String key, int s, int e) {
+        List<Object> list = redisTemplate.opsForList().range(key, s, e);
+        List<AtNotifier> result = new ArrayList<>();
+        if (list != null) {
+            for (Object json : list) {
+                result.add(JSON.parseObject(JSON.toJSONString(json), AtNotifier.class));
+            }
+        }
+        return result;
+    }
+
+    public void deleteFromList(AtNotifier message) {
+        String id = message.getToId();
+        redisTemplate.opsForList().remove("unread:" + id, 0, message);
+    }
 }

user-8072/src/main/resources/application-dep.properties

@@ -1,9 +1,10 @@
 wx.miniapp.configs[0].appid=wx0d4fdb5c7bf3b12b
 wx.miniapp.configs[0].secret=989f155fcc3aee616568473faf1b1d3b
 
-spring.data.redis.host=127.0.0.1
+spring.data.redis.host=redis
 spring.data.redis.port=6379
 spring.data.redis.database=0
+spring.data.redis.password=Shuodedaoli114514
 
 spring.application.name=user
 
@@ -11,11 +12,10 @@ server.port=8072
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=Shuodedaoli114514
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+spring.datasource.url=jdbc:mysql://mysql:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
 
-spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
+spring.cloud.nacos.discovery.server-addr=nacos:8848
 spring.cloud.nacos.discovery.enabled=true
 
-management.zipkin.tracing.endpoint=http://127.0.0.1:9411/api/v2/spans
+spring.rabbitmq.host=rabbitmq
-management.tracing.sampling.probability=1.0

user-8072/src/main/resources/application-dev.properties

@@ -11,8 +11,10 @@ server.port=8072
 
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=12345abcde
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/tutorial?useUnicode=true&characterEncoding=utf8&useSSL=false&ServerTimezone=Asia/Shanghai
 
 
-dubbo.application.qos-enable=false
+dubbo.application.qos-enable=false
+
+spring.rabbitmq.port=5672

user-8072/src/main/resources/application.properties

@@ -1 +1 @@
-spring.profiles.active=dev
+spring.profiles.active=dep