From a702602758e7e14066c2f1ef861cc6c9eeaffad2 Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Sat, 23 Mar 2024 11:13:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=AD=E7=9A=84=E5=AF=86=E7=A0=81=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loServer/action/admin/CreateRobotAction.java | 8 +------- .../xiaoleilu/loServer/action/admin/CreateUserAction.java | 6 +----- .../java/io/moquette/persistence/MemoryMessagesStore.java | 3 +-- broker/src/main/java/io/moquette/spi/IMessagesStore.java | 2 +- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java index 1e3d7978..2c1644d5 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java @@ -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); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java index 39b1b51c..1c6ee234 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java @@ -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); diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index bddf37ee..483f895a 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -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 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); } diff --git a/broker/src/main/java/io/moquette/spi/IMessagesStore.java b/broker/src/main/java/io/moquette/spi/IMessagesStore.java index 8c846060..0f0c4960 100755 --- a/broker/src/main/java/io/moquette/spi/IMessagesStore.java +++ b/broker/src/main/java/io/moquette/spi/IMessagesStore.java @@ -147,7 +147,7 @@ public interface IMessagesStore { List 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);