diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupInfoAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupInfoAction.java new file mode 100755 index 00000000..4cb48962 --- /dev/null +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/ModifyGroupInfoAction.java @@ -0,0 +1,85 @@ +/* + * This file is part of the Wildfire Chat package. + * (c) Heavyrain2012 + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +package com.xiaoleilu.loServer.action.admin; + + +import cn.wildfirechat.common.APIPath; +import cn.wildfirechat.common.ErrorCode; +import cn.wildfirechat.pojos.InputAddGroupMember; +import cn.wildfirechat.pojos.InputModifyGroupInfo; +import com.google.gson.Gson; +import com.xiaoleilu.loServer.RestResult; +import com.xiaoleilu.loServer.annotation.HttpMethod; +import com.xiaoleilu.loServer.annotation.Route; +import com.xiaoleilu.loServer.handler.Request; +import com.xiaoleilu.loServer.handler.Response; +import io.moquette.persistence.RPCCenter; +import io.moquette.persistence.TargetEntry; +import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; +import io.netty.handler.codec.http.FullHttpRequest; +import io.netty.handler.codec.http.HttpResponseStatus; +import win.liyufan.im.IMTopic; + +import java.util.concurrent.Executor; + +@Route(APIPath.Group_Modify_Info) +@HttpMethod("POST") +public class ModifyGroupInfoAction extends AdminAction { + + @Override + public boolean isTransactionAction() { + return true; + } + + @Override + public boolean action(Request request, Response response) { + if (request.getNettyRequest() instanceof FullHttpRequest) { + InputModifyGroupInfo inputAddGroupMember = getRequestBody(request.getNettyRequest(), InputModifyGroupInfo.class); + if (inputAddGroupMember.isValide()) { + RPCCenter.getInstance().sendRequest(inputAddGroupMember.getOperator(), null, IMTopic.ModifyGroupInfoTopic, inputAddGroupMember.toProtoGroupRequest().toByteArray(), inputAddGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() { + @Override + public void onSuccess(byte[] result) { + ByteBuf byteBuf = Unpooled.buffer(); + byteBuf.writeBytes(result); + ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte()); + if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { + sendResponse(response, null, null); + } else { + sendResponse(response, errorCode, null); + } + } + + @Override + public void onError(ErrorCode errorCode) { + sendResponse(response, errorCode, null); + } + + @Override + public void onTimeout() { + sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null); + } + + @Override + public Executor getResponseExecutor() { + return command -> { + ctx.executor().execute(command); + }; + } + }, true); + return false; + } else { + response.setStatus(HttpResponseStatus.OK); + RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER); + response.setContent(new Gson().toJson(result)); + } + } + return true; + } +} diff --git a/common/src/main/java/cn.wildfirechat.pojos/InputModifyGroupInfo.java b/common/src/main/java/cn.wildfirechat.pojos/InputModifyGroupInfo.java new file mode 100755 index 00000000..ed0f70c8 --- /dev/null +++ b/common/src/main/java/cn.wildfirechat.pojos/InputModifyGroupInfo.java @@ -0,0 +1,59 @@ +/* + * This file is part of the Wildfire Chat package. + * (c) Heavyrain2012 + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +package cn.wildfirechat.pojos; + + +import cn.wildfirechat.proto.WFCMessage; +import io.netty.util.internal.StringUtil; + +import java.util.Arrays; +import java.util.List; + +public class InputModifyGroupInfo extends InputGroupBase { + private String group_id; + //ModifyGroupInfoType + private int type; + private String value; + + public boolean isValide() { + return !StringUtil.isNullOrEmpty(group_id); + } + public String getGroup_id() { + return group_id; + } + + public void setGroup_id(String group_id) { + this.group_id = group_id; + } + + public int getType() { + return type; + } + + public void setType(int type) { + this.type = type; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public WFCMessage.ModifyGroupInfoRequest toProtoGroupRequest() { + return WFCMessage.ModifyGroupInfoRequest.newBuilder() + .setGroupId(group_id) + .setType(type) + .setValue(value) + .addAllToLine(to_lines == null || to_lines.isEmpty() ? Arrays.asList(0) : to_lines) + .build(); + } +} diff --git a/common/src/main/java/cn/wildfirechat/common/APIPath.java b/common/src/main/java/cn/wildfirechat/common/APIPath.java index 0a7912b5..06f6b23e 100644 --- a/common/src/main/java/cn/wildfirechat/common/APIPath.java +++ b/common/src/main/java/cn/wildfirechat/common/APIPath.java @@ -32,6 +32,7 @@ public interface APIPath { String Group_Dismiss = "/admin/group/del"; String Group_Transfer = "/admin/group/transfer"; String Group_Get_Info = "/admin/group/get_info"; + String Group_Modify_Info = "/admin/group/modify"; String Group_Member_List = "/admin/group/member/list"; String Group_Member_Add = "/admin/group/member/add"; String Group_Member_Kickoff = "/admin/group/member/del"; diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java index 3af0ee5b..fe36fb46 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java @@ -52,6 +52,17 @@ public class GroupAdmin { return AdminHttpUtils.httpJsonPost(path, transferGroup, Void.class); } + public static IMResult modifyGroupInfo(String operator, String groupId, int type, String value, List to_lines) throws Exception { + String path = APIPath.Group_Modify_Info; + InputModifyGroupInfo modifyGroupInfo = new InputModifyGroupInfo(); + modifyGroupInfo.setGroup_id(groupId); + modifyGroupInfo.setOperator(operator); + modifyGroupInfo.setTo_lines(to_lines); + modifyGroupInfo.setType(type); + modifyGroupInfo.setValue(value); + return AdminHttpUtils.httpJsonPost(path, modifyGroupInfo, Void.class); + } + public static IMResult getGroupMembers(String groupId) throws Exception { String path = APIPath.Group_Member_List; diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java index 269de2d0..efbec28f 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java @@ -222,6 +222,15 @@ public class Main { System.exit(-1); } + voidIMResult = GroupAdmin.modifyGroupInfo(groupInfo.getOwner(), groupInfo.getTarget_id(), ProtoConstants.ModifyGroupInfoType.Modify_Group_Name,"HelloWorld", null); + if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("transfer success"); + } else { + System.out.println("create group failure"); + System.exit(-1); + } + + resultGetGroupInfo = GroupAdmin.getGroupInfo(groupInfo.getTarget_id()); if (resultGetGroupInfo != null && resultGetGroupInfo.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { if ("user2".equals(resultGetGroupInfo.getResult().getOwner())) {