From 29b30cec28db634aac8f471119d2ab0e61fc6637 Mon Sep 17 00:00:00 2001 From: imhao183 Date: Fri, 15 Jan 2021 22:27:17 +0800 Subject: [PATCH] fix build error --- .../loServer/action/robot/AddGroupMemberAction.java | 2 +- .../loServer/action/robot/CreateGroupAction.java | 12 +----------- .../loServer/action/robot/DismissGroupAction.java | 2 +- .../action/robot/KickoffGroupMemberAction.java | 2 +- .../loServer/action/robot/ModifyGroupInfoAction.java | 2 +- .../action/robot/ModifyGroupMemberAliasAction.java | 2 +- .../loServer/action/robot/QuitGroupMemberAction.java | 2 +- .../loServer/action/robot/TransferGroupAction.java | 2 +- .../main/java/cn/wildfirechat/common/APIPath.java | 2 +- 9 files changed, 9 insertions(+), 19 deletions(-) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java index d6e95c16..f3137541 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/AddGroupMemberAction.java @@ -73,7 +73,7 @@ public class AddGroupMemberAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java index 62bcfd42..cabd32ca 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/CreateGroupAction.java @@ -50,16 +50,6 @@ public class CreateGroupAction extends RobotAction { if (inputCreateGroup.isValide()) { PojoGroupInfo group_info = inputCreateGroup.getGroup().getGroup_info(); WFCMessage.CreateGroupRequest createGroupRequest = inputCreateGroup.toProtoGroupRequest(); - if ((group_info.getHistory_message() > 0 && group_info.getHistory_message() < 128) || group_info.getMax_member_count() > 0) { - WFCMessage.GroupInfo.Builder groupInfoBuilder = createGroupRequest.getGroup().getGroupInfo().toBuilder(); - if (group_info.getHistory_message() > 0 && group_info.getHistory_message() < 128) { - groupInfoBuilder.setHistoryMessage(group_info.getHistory_message()); - } - if (group_info.getMax_member_count() > 0) { - groupInfoBuilder.setMaxMemberCount(group_info.getMax_member_count()); - } - createGroupRequest = createGroupRequest.toBuilder().setGroup(createGroupRequest.getGroup().toBuilder().setGroupInfo(groupInfoBuilder)).build(); - } RPCCenter.getInstance().sendRequest(inputCreateGroup.getOperator(), null, IMTopic.CreateGroupTopic, createGroupRequest.toByteArray(), inputCreateGroup.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() { @Override public void onSuccess(byte[] result) { @@ -92,7 +82,7 @@ public class CreateGroupAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java index 1a8fa826..9e33a93f 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/DismissGroupAction.java @@ -73,7 +73,7 @@ public class DismissGroupAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java index ebf127ce..e0061eeb 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/KickoffGroupMemberAction.java @@ -73,7 +73,7 @@ public class KickoffGroupMemberAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java index be0e4bce..98fd27b6 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupInfoAction.java @@ -73,7 +73,7 @@ public class ModifyGroupInfoAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java index b2b60f8c..4c71db89 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/ModifyGroupMemberAliasAction.java @@ -73,7 +73,7 @@ public class ModifyGroupMemberAliasAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java index d4e8dd88..f4cbd646 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/QuitGroupMemberAction.java @@ -73,7 +73,7 @@ public class QuitGroupMemberAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java index c5cc70b4..29dd55e4 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/robot/TransferGroupAction.java @@ -73,7 +73,7 @@ public class TransferGroupAction extends RobotAction { ctx.executor().execute(command); }; } - }, false, 1); + }, false); return false; } else { response.setStatus(HttpResponseStatus.OK); diff --git a/common/src/main/java/cn/wildfirechat/common/APIPath.java b/common/src/main/java/cn/wildfirechat/common/APIPath.java index 74168638..f41134c3 100644 --- a/common/src/main/java/cn/wildfirechat/common/APIPath.java +++ b/common/src/main/java/cn/wildfirechat/common/APIPath.java @@ -77,7 +77,7 @@ public interface APIPath { String Robot_User_Info = "/robot/user_info"; String Robot_Message_Send = "/robot/message/send"; String Robot_Verify_Application_User = "/robot/user/verify"; - + String Robot_Group_Member_Add = "/robot/group/member/add"; String Robot_Group_Allow_Member = "/robot/group/manager/allow"; String Robot_Create_Group = "/robot/group/create";