diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index c6e4e3f0..1fd51a25 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -16,9 +16,9 @@ spring:
         master:
           type: ${spring.datasource.type}
           driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai-github?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+          url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
           username: root
-          password: qxyg1010
+          password: root
 
       hikari:
         # 最大连接池数量
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatMessageController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatMessageController.java
index 10ddd3c6..40a5971e 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatMessageController.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatMessageController.java
@@ -45,6 +45,18 @@ public class ChatMessageController extends BaseController {
         return chatMessageService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 根据会话ID查询聊天消息列表
+     */
+    @GetMapping("/listBySession/{sessionId}")
+    public TableDataInfo<ChatMessageVo> listBySession(@NotNull(message = "会话ID不能为空")
+                                                      @PathVariable Long sessionId,
+                                                      PageQuery pageQuery) {
+        ChatMessageBo bo = new ChatMessageBo();
+        bo.setSessionId(sessionId);
+        return chatMessageService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 导出聊天消息列表
      */
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java
index 0250177a..e9a38259 100644
--- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java
@@ -100,24 +100,7 @@ public class SseServiceImpl implements ISseService {
                 // 设置用户id
                 chatRequest.setUserId(LoginHelper.getUserId());
 
-
-                //待优化的地方 （这里请前端提交send的时候传递uuid进来或者sessionId）
-                //待优化的地方 （这里请前端提交send的时候传递uuid进来或者sessionId）
-                //待优化的地方 （这里请前端提交send的时候传递uuid进来或者sessionId）
-                {
-                    // 设置会话id
-                    if (chatRequest.getUuid() == null) {
-                        //暂时随机生成会话id
-                        chatRequest.setSessionId(System.currentTimeMillis());
-                    } else {
-                        //这里或许需要修改一下，这里应该用uuid 或者 前端传递 sessionId
-                        chatRequest.setSessionId(chatRequest.getUuid());
-                    }
-                }
-
-
-
-                chatRequest.setUserId(chatCostService.getUserId());
+                // 设置会话id
                 if (chatRequest.getSessionId() == null) {
                     ChatSessionBo chatSessionBo = new ChatSessionBo();
                     chatSessionBo.setUserId(chatCostService.getUserId());