From d6dbf08b8b08eda643a418acff1a981804b1dadd Mon Sep 17 00:00:00 2001 From: heavyrian2012 Date: Thu, 9 Dec 2021 10:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3API=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=BE=A4=E7=BB=84=E6=88=96=E7=94=A8=E6=88=B7=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/robot/UpdateProfileAction.java | 19 ++++++++++--------- .../persistence/MemoryMessagesStore.java | 16 ++++++++-------- .../pojos/InputModifyGroupInfo.java | 4 ++-- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java index 8c53f83b..1f21bebe 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/UpdateProfileAction.java @@ -34,42 +34,43 @@ public class UpdateProfileAction extends RobotAction { WFCMessage.User.Builder builder = messagesStore.getUserInfo(robot.getUid()).toBuilder(); boolean modified = false; + String value = input.getStrValue() == null ? "" : input.getStrValue(); switch (input.getIntValue()) { case Modify_DisplayName: - builder.setDisplayName(input.getStrValue()); + builder.setDisplayName(value); modified = true; break; case Modify_Gender: - builder.setGender(Integer.parseInt(input.getStrValue())); + builder.setGender(Integer.parseInt(value)); modified = true; break; case Modify_Portrait: - builder.setPortrait(input.getStrValue()); + builder.setPortrait(value); modified = true; break; //不允许修改电话号码，如果修改电话号码必须通过admin进行修改 // case Modify_Mobile: -// builder.setMobile(input.getStrValue()); +// builder.setMobile(value); // modified = true; // break; case Modify_Email: - builder.setEmail(input.getStrValue()); + builder.setEmail(value); modified = true; break; case Modify_Address: - builder.setAddress(input.getStrValue()); + builder.setAddress(value); modified = true; break; case Modify_Company: - builder.setCompany(input.getStrValue()); + builder.setCompany(value); modified = true; break; case Modify_Social: - builder.setSocial(input.getStrValue()); + builder.setSocial(value); modified = true; break; case Modify_Extra: - builder.setExtra(input.getStrValue()); + builder.setExtra(value); modified = true; break; default: diff --git a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java index ddad1144..2b735f3a 100755 --- a/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java +++ b/broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java @@ -2392,31 +2392,31 @@ public class MemoryMessagesStore implements IMessagesStore { } WFCMessage.User.Builder builder = user.toBuilder(); if((flag & Update_User_DisplayName) > 0) { - builder.setDisplayName(userInfo.getDisplayName()); + builder.setDisplayName(userInfo.getDisplayName() == null ? "" : userInfo.getDisplayName()); } if((flag & Update_User_Portrait) > 0) { - builder.setPortrait(userInfo.getPortrait()); + builder.setPortrait(userInfo.getPortrait() == null ? "" : userInfo.getPortrait()); } if((flag & Update_User_Gender) > 0) { builder.setGender(userInfo.getGender()); } if((flag & Update_User_Mobile) > 0) { - builder.setMobile(userInfo.getMobile()); + builder.setMobile(userInfo.getMobile() == null ? "" : userInfo.getMobile()); } if((flag & Update_User_Email) > 0) { - builder.setEmail(userInfo.getEmail()); + builder.setEmail(userInfo.getEmail() == null ? "" : userInfo.getEmail()); } if((flag & Update_User_Address) > 0) { - builder.setAddress(userInfo.getAddress()); + builder.setAddress(userInfo.getAddress() == null ? "" : userInfo.getAddress()); } if((flag & Update_User_Company) > 0) { - builder.setCompany(userInfo.getCompany()); + builder.setCompany(userInfo.getCompany() == null ? "" : userInfo.getCompany()); } if((flag & Update_User_Social) > 0) { - builder.setSocial(userInfo.getSocial()); + builder.setSocial(userInfo.getSocial() == null ? "" : userInfo.getSocial()); } if((flag & Update_User_Extra) > 0) { - builder.setExtra(userInfo.getExtra()); + builder.setExtra(userInfo.getExtra() == null ? "" : userInfo.getExtra()); } if((flag & Update_User_Name) > 0) { if(StringUtil.isNullOrEmpty(userInfo.getName())) { diff --git a/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java b/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java index 232b973b..198b7068 100755 --- a/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java +++ b/common/src/main/java/cn/wildfirechat/pojos/InputModifyGroupInfo.java @@ -55,7 +55,7 @@ public class InputModifyGroupInfo extends InputGroupBase { return WFCMessage.ModifyGroupInfoRequest.newBuilder() .setGroupId(group_id) .setType(type) - .setValue(value) + .setValue(value == null ? "" : value) .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) .setNotifyContent(notify_message.toProtoMessageContent()) .build(); @@ -63,7 +63,7 @@ public class InputModifyGroupInfo extends InputGroupBase { return WFCMessage.ModifyGroupInfoRequest.newBuilder() .setGroupId(group_id) .setType(type) - .setValue(value) + .setValue(value == null ? "" : value) .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) .build(); }