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
2024-03-23 11:13:09 +08:00
parent c01e5b634d
commit a702602758
4 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java
+1 -7
View File
@@ -45,10 +45,6 @@ public class CreateRobotAction extends AdminAction {
if (inputCreateRobot != null
&& !StringUtil.isNullOrEmpty(inputCreateRobot.getName())) {
if(StringUtil.isNullOrEmpty(inputCreateRobot.getPassword())) {
inputCreateRobot.setPassword(UUIDGenerator.getUUID());
}
if(StringUtil.isNullOrEmpty(inputCreateRobot.getUserId())) {
inputCreateRobot.setUserId(messagesStore.getShortUUID());
}
@@ -58,10 +54,8 @@ public class CreateRobotAction extends AdminAction {
}
WFCMessage.User newUser = inputCreateRobot.toUser();
try {
messagesStore.addUserInfo(newUser, inputCreateRobot.getPassword());
messagesStore.addUserInfo(newUser);
} catch (Exception e) {
e.printStackTrace();
Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java
+1 -5
View File
@@ -47,10 +47,6 @@ public class CreateUserAction extends AdminAction {
&& !StringUtil.isNullOrEmpty(inputCreateUser.getName())
&& (inputCreateUser.getType() == ProtoConstants.UserType.UserType_Normal || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Admin || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Super_Admin)) {
if(StringUtil.isNullOrEmpty(inputCreateUser.getPassword())) {
inputCreateUser.setPassword(UUIDGenerator.getUUID());
}
if(StringUtil.isNullOrEmpty(inputCreateUser.getUserId())) {
inputCreateUser.setUserId(messagesStore.getShortUUID());
}
@@ -85,7 +81,7 @@ public class CreateUserAction extends AdminAction {
try {
messagesStore.addUserInfo(newUserBuilder.build(), inputCreateUser.getPassword());
messagesStore.addUserInfo(newUserBuilder.build());
} catch (Exception e) {
e.printStackTrace();
Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+1 -2
View File
@@ -2893,7 +2893,7 @@ public class MemoryMessagesStore implements IMessagesStore {
}
@Override
public void addUserInfo(WFCMessage.User user, String password) throws Exception {
public void addUserInfo(WFCMessage.User user) throws Exception {
HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
if (databaseStore.isUidAndNameConflict(user.getUid(), user.getName())) {
@@ -2901,7 +2901,6 @@ public class MemoryMessagesStore implements IMessagesStore {
}
databaseStore.updateUser(user);
mUserMap.put(user.getUid(), user);
databaseStore.updateUserPassword(user.getUid(), password);
callbackUserInfoEvent(user);
}
broker/src/main/java/io/moquette/spi/IMessagesStore.java
+1 -1
View File
@@ -147,7 +147,7 @@ public interface IMessagesStore {
List<InputOutputUserBlockStatus> getUserStatusList();
ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag);
void addUserInfo(WFCMessage.User user, String password) throws Exception;
void addUserInfo(WFCMessage.User user) throws Exception;
void destroyUser(String userId);
void updateUserInfo(WFCMessage.User user) throws Exception;
WFCMessage.User getUserInfo(String userId);