From abc1a3c202d7ff837520a83535b09988186c90cf Mon Sep 17 00:00:00 2001
From: xuqm <xuqinmin@bjca.org.cn>
Date: Fri, 2 Jun 2023 18:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E5=88=97=E8=A1=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BA=86=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/org/bjca/trust/java/imserver/im/ImManager.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/cn/org/bjca/trust/java/imserver/im/ImManager.java b/src/main/java/cn/org/bjca/trust/java/imserver/im/ImManager.java
index b03b2d5..d20d55b 100644
--- a/src/main/java/cn/org/bjca/trust/java/imserver/im/ImManager.java
+++ b/src/main/java/cn/org/bjca/trust/java/imserver/im/ImManager.java
@@ -90,12 +90,12 @@ public class ImManager {
                                 SZYXMessage message2 = message1.copy();
                                 message2.setUserName(groupEntity.getUserId());
                                 saveConversation(message2);
-                                sendPacketMessage(szyxMessage.getPacketType(), message2);
+                                sendPacketMessage(PacketType.SEND, message2);
                             }
                         } else {
                             message1.setUserName(message1.getToClientId());
                             saveConversation(message1);
-                            sendPacketMessage(szyxMessage.getPacketType(), message1);
+                            sendPacketMessage(PacketType.SEND, message1);
                         }
                         // TODO: 这里应该有计时器，判断转发消息是否送达，如果没送达则ack返回失败状态
                         sendAckMsg(szyxMessage);
@@ -144,6 +144,8 @@ public class ImManager {
             }
 
             conversationRepository.save(conversation);
+            conversation.getSelf().setPassword("");
+            conversation.getUserInfo().setPassword("");
             sendPacketMessage(PacketType.CONVERSATION, conversation);
         } catch (Exception e) {
             System.out.println("--------------" + e.getMessage());