From abebd62ca84554a0bc3fd655c976f296dd61eab7 Mon Sep 17 00:00:00 2001
From: "qinyong@9artedu.com" <qinyong@9artedu.com>
Date: Thu, 11 Jun 2026 17:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generation/controller/GenerationController.java      | 5 +++--
 .../artedu/generation/mapper/ArchiveMessageMapper.java   | 9 ++++++---
 .../src/main/resources/application.yml                   | 6 +++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/backend/generation-service/src/main/java/com/artedu/generation/controller/GenerationController.java b/backend/generation-service/src/main/java/com/artedu/generation/controller/GenerationController.java
index e28d3a3..cc65382 100644
--- a/backend/generation-service/src/main/java/com/artedu/generation/controller/GenerationController.java
+++ b/backend/generation-service/src/main/java/com/artedu/generation/controller/GenerationController.java
@@ -152,8 +152,9 @@ public class GenerationController {
                 log.warn("toUser无效，使用兜底查询, fromUser={}, toUser={}", fromUser, toUser);
                 messages = archiveMessageMapper.selectMessagesByFromUser(fromUser, startTime, endTime);
             } else {
-                toUser = "[\""+toUser+"\"]";
-                messages = archiveMessageMapper.selectSingleChatMessages(fromUser, toUser, startTime, endTime);
+                String toUser_m = "[\""+toUser+"\"]";
+                String fromUser_m = "[\""+fromUser+"\"]";
+                messages = archiveMessageMapper.selectSingleChatMessages(fromUser, toUser, startTime, endTime, toUser_m, fromUser_m);
             }
         }
 
diff --git a/backend/generation-service/src/main/java/com/artedu/generation/mapper/ArchiveMessageMapper.java b/backend/generation-service/src/main/java/com/artedu/generation/mapper/ArchiveMessageMapper.java
index 28ad6c9..812914f 100644
--- a/backend/generation-service/src/main/java/com/artedu/generation/mapper/ArchiveMessageMapper.java
+++ b/backend/generation-service/src/main/java/com/artedu/generation/mapper/ArchiveMessageMapper.java
@@ -13,12 +13,12 @@ public interface ArchiveMessageMapper extends BaseMapper<ArchiveMessage> {
 
     @Select("<script>" +
             "(SELECT msgtime,created_at, from_role, content FROM archive_messages " +
-            "WHERE from_user = #{fromUser} AND to_user = #{toUser} " +
+            "WHERE from_user = #{fromUser} AND to_user = #{toUser_m} " +
             "AND msgtime >= #{startTime} AND msgtime &lt; #{endTime}  AND msgtype='text' " +
             "AND content IS NOT NULL AND content != ''  limit 100) " +
             "UNION ALL " +
             "(SELECT msgtime,created_at, from_role, content FROM archive_messages " +
-            "WHERE from_user = #{toUser} AND to_user = #{fromUser} " +
+            "WHERE from_user = #{toUser} AND to_user = #{fromUser_m} " +
             "AND msgtime >= #{startTime} AND msgtime &lt; #{endTime} AND msgtype='text' " +
             "AND content IS NOT NULL AND content != '' limit 100)" +
             "ORDER BY msgtime DESC" +
@@ -26,7 +26,10 @@ public interface ArchiveMessageMapper extends BaseMapper<ArchiveMessage> {
     List<ArchiveMessage> selectSingleChatMessages(@Param("fromUser") String fromUser,
                                                   @Param("toUser") String toUser,
                                                   @Param("startTime") Long startTime,
-                                                  @Param("endTime") Long endTime);
+                                                  @Param("endTime") Long endTime,
+                                                  @Param("toUser_m") String toUser_m,
+                                                  @Param("fromUser_m") String fromUser_m
+    );
 
     @Select("SELECT created_at, from_role, content FROM archive_messages " +
             "WHERE roomid = #{roomid} " +
diff --git a/backend/generation-service/src/main/resources/application.yml b/backend/generation-service/src/main/resources/application.yml
index 2c72491..222f584 100644
--- a/backend/generation-service/src/main/resources/application.yml
+++ b/backend/generation-service/src/main/resources/application.yml
@@ -11,9 +11,9 @@ spring:
     name: generation-service
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:ai_assistant}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
-    username: ${MYSQL_USERNAME:root}
-    password: ${MYSQL_PASSWORD:root}
+    url: jdbc:mysql://${MYSQL_HOST:sh-cdb-6fzlwnms.sql.tencentcdb.com}:${MYSQL_PORT:63912}/${MYSQL_DATABASE:ai_assistant}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+    username: ${MYSQL_USERNAME:assistant_prod}
+    password: ${MYSQL_PASSWORD:U%$4Tu_C3+4}
   redis:
     host: ${REDIS_HOST:localhost}
     port: ${REDIS_PORT:6379}