anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加配置当销毁用户时是否销毁用户信息和消息

Browse Source
This commit is contained in:
heavyrian2012
2025-11-22 23:02:56 +08:00
parent 47039f53b2
commit 24d24fe1e9
5 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/BrokerConstants.java
+3
View File
@@ -213,6 +213,9 @@ public final class BrokerConstants {
public static final String USER_HIDE_PROPERTIES = "user.hide_properties";
public static final String USER_KEEP_DISPLAY_NAME_WHEN_DESTROY = "user.keep_display_name_when_destroy";
public static final String USER_KEEP_FULL_INFO_WHEN_DESTROY = "user.keep_full_info_when_destroy";
public static final String USER_KEEP_MOBILE_WHEN_DESTROY = "user.keep_mobile_when_destroy";
public static final String USER_KEEP_MESSAGES_WHEN_DESTROY = "user.keep_messages_when_destroy";
public static final String SYNC_Data_Part_Size = "sync.data_part_size";
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+32 -24
View File
@@ -202,6 +202,10 @@ public class MemoryMessagesStore implements IMessagesStore {
private int mGroupForbiddenClientOperation;
private int mSyncDataPartSize = 0;
private boolean keepDisplayNameWhenDestroyUser = true;
private boolean keepFullInfoWhenDestroyUser = false;
private boolean keepMobileWhenDestroyUser = false;
private boolean keepMessagesWhenDestroyUser = false;
private String mRecallForwardUrl = null;
private boolean mBroadcastTargetFromUserTable = false;
@@ -600,6 +604,17 @@ public class MemoryMessagesStore implements IMessagesStore {
} catch (Exception e) {
}
try {
keepFullInfoWhenDestroyUser = "true".equals(server.getConfig().getProperty(USER_KEEP_FULL_INFO_WHEN_DESTROY));
} catch (Exception e) {}
try {
keepMobileWhenDestroyUser = "true".equals(server.getConfig().getProperty(USER_KEEP_MOBILE_WHEN_DESTROY));
} catch (Exception e) {}
try {
keepMessagesWhenDestroyUser = "true".equals(server.getConfig().getProperty(USER_KEEP_MESSAGES_WHEN_DESTROY));
} catch (Exception e) {}
try {
@@ -2758,8 +2773,9 @@ public class MemoryMessagesStore implements IMessagesStore {
} finally {
mWriteLock.unlock();
}
databaseStore.clearUserMessage(userId);
if(!keepMessagesWhenDestroyUser) {
databaseStore.clearUserMessage(userId);
}
}
@Override
@@ -3137,37 +3153,29 @@ public class MemoryMessagesStore implements IMessagesStore {
IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
WFCMessage.User us = mUserMap.get(userId);
if (us != null) {
if (keepDisplayNameWhenDestroyUser) {
us = WFCMessage.User.newBuilder()
.setUid(userId)
.setUpdateDt(System.currentTimeMillis())
.setName(userId)
.setDeleted(1)
.clearAddress()
.clearCompany()
.clearEmail()
.clearExtra()
.clearMobile()
.clearPortrait()
.clearSocial()
.build();
WFCMessage.User.Builder builder = WFCMessage.User.newBuilder().setUpdateDt(System.currentTimeMillis()).setDeleted(1);
if(keepFullInfoWhenDestroyUser) {
if(!keepMobileWhenDestroyUser) {
builder.clearMobile();
}
} else {
us = WFCMessage.User.newBuilder()
.setUid(userId)
.setUpdateDt(System.currentTimeMillis())
builder.setUid(userId)
.setName(userId)
.setDeleted(1)
.clearDisplayName()
.clearAddress()
.clearCompany()
.clearEmail()
.clearExtra()
.clearMobile()
.clearPortrait()
.clearSocial()
.build();
.clearGender()
.clearSocial();
if (!keepDisplayNameWhenDestroyUser) {
builder.clearDisplayName();
}
}
us = builder.build();
try {
databaseStore.updateUser(us);
} catch (Exception e) {
@@ -3176,8 +3184,8 @@ public class MemoryMessagesStore implements IMessagesStore {
}
mUserMap.put(userId, us);
}
}
@Override
public void updateUserInfo(WFCMessage.User user) throws Exception {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance();