wyc

src/main/java/com/zhentao/information/controller/MessageController.java

@@ -6,6 +6,7 @@ import com.zhentao.information.entity.ChatMessage;
 import com.zhentao.information.entity.Message;
 import com.zhentao.information.handler.WebSocketHandler;
 import com.zhentao.information.repository.ChatMessageRepository;
+import com.zhentao.tool.TokenUtils;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +35,9 @@ public class MessageController {
      */
     @PostMapping("/send")
     @NullLogin
-    public String sendMessage(@RequestBody Message message) {
+    public String sendMessage(@RequestHeader("token")String token,@RequestBody Message message) {
+        String userIdFromToken = TokenUtils.getUserIdFromToken(token);
+        message.setFromUserId(userIdFromToken);
         log.info("收到消息：发送者={}, 接收者={}, 内容={}",
                 message.getFromUserId(),
                 message.getToUserId(),
@@ -73,8 +76,13 @@ public class MessageController {
      * 获取两个用户之间的聊天记录
      */
     @GetMapping("/history")
-    public List<ChatMessage> getChatHistory(@RequestParam String userId1, @RequestParam String userId2) {
-        String chatId = generateChatId(userId1, userId2);
+    public List<ChatMessage> getChatHistory(@RequestHeader("token") String token,@RequestParam String userId2) {
+        String userIdFromToken = TokenUtils.getUserIdFromToken(token);
+        System.err.println(userIdFromToken);
+        String chatId = null;
+        if (userIdFromToken != null) {
+            chatId = generateChatId(userIdFromToken, userId2);
+        }
         return chatMessageRepository.findByChatId(chatId);
     }
 

src/main/java/com/zhentao/shouye/controller/UserShouyeController.java

@@ -3,12 +3,10 @@ package com.zhentao.shouye.controller;
 import com.zhentao.config.NullLogin;
 import com.zhentao.shouye.dto.UserShouyeDto;
 import com.zhentao.shouye.service.UserShouyeService;
+import com.zhentao.tool.TokenUtils;
 import com.zhentao.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
-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 org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("shouye")
@@ -16,9 +14,14 @@ public class UserShouyeController {
     @Autowired
     private UserShouyeService userShouyeService;
 
-    @PostMapping("findAll")
+    @GetMapping("findAll")
     @NullLogin
-    public Result findAll(@RequestBody UserShouyeDto dto){
-        return userShouyeService.findAll(dto);
+    public Result findAll(@RequestHeader("token") String token){
+        System.err.println(token);
+        String userIdFromToken = TokenUtils.getUserIdFromToken(token);
+        UserShouyeDto userShouyeDto = new UserShouyeDto();
+        userShouyeDto.setUid1(Long.valueOf(userIdFromToken));
+        System.err.println(userShouyeDto);
+        return userShouyeService.findAll(userShouyeDto);
     }
 }