From 3c524675fa1b9cc777299f25567bc4cf3f883ddc Mon Sep 17 00:00:00 2001 From: yyb <1416014977@qq.com> Date: Tue, 27 Jan 2026 10:39:35 +0800 Subject: [PATCH] =?UTF-8?q?update=20m2pool=20=E5=AE=A2=E6=9C=8D=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E5=AE=A4=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E4=B8=8D?= =?UTF-8?q?=E5=86=8D=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=AD=98=E5=9C=A8=E8=81=8A?= =?UTF-8?q?=E5=A4=A9=E4=BF=A1=E6=81=AF=E7=9A=84=E8=81=8A=E5=A4=A9=E5=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/m2pool/chat/task/ChatTask.java | 2 ++ .../src/main/resources/mapper/chat/ChatMessageMapper.xml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java index a6f0bda..31b7522 100644 --- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java +++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/task/ChatTask.java @@ -17,6 +17,7 @@ import org.springframework.cloud.context.config.annotation.RefreshScope; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.time.LocalDateTime; @@ -47,6 +48,7 @@ public class ChatTask { // @Scheduled(cron = "0 0/1 * * * ?") @Scheduled(cron = "0 15 1 * * ?") + @Transactional public void chatMessageDataSeparatedForHotAndCold(){ if(!enable){ System.out.println("ChatTask 定时任务已关闭，请在nacos修改配置"); diff --git a/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml b/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml index 247be6c..78f2ce8 100644 --- a/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml +++ b/m2pool-modules/m2pool-chat/src/main/resources/mapper/chat/ChatMessageMapper.xml @@ -37,8 +37,9 @@ select room_id from chat_message where send_email = #{userEmail} group by room_id UNION select room_id from chat_message_history where send_email = #{userEmail} group by room_id - UNION - select id as room_id from chat_room where user_two_email = #{userEmail} +-- 不再展示不存在聊天信息的聊天室 +-- UNION +-- select id as room_id from chat_room where user_two_email = #{userEmail}