anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
heavyrain.lee
2019-05-22 20:24:21 +08:00
parent 79bd0c3304
commit d36c3f4f77
99 changed files with 247 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/com/xiaoleilu/loServer/RestResult.java
+1 -1
View File
@@ -8,7 +8,7 @@
package com.xiaoleilu.loServer;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
public class RestResult {
broker/src/main/java/com/xiaoleilu/loServer/action/Action.java
+2 -2
View File
@@ -20,9 +20,9 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
/**
* 请求处理接口<br>
broker/src/main/java/com/xiaoleilu/loServer/action/IMAction.java
+1 -1
View File
@@ -25,7 +25,7 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.Base64;
import java.util.concurrent.Executor;
broker/src/main/java/com/xiaoleilu/loServer/action/RouteAction.java
+1 -1
View File
@@ -26,7 +26,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.Base64;
import java.util.concurrent.Executor;
broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddGroupMemberAction.java
+3 -2
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -22,12 +23,12 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/group/member")
@Route(APIPath.Group_Member_Add)
@HttpMethod("POST")
public class AddGroupMemberAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/AdminAction.java
+1 -1
View File
@@ -16,7 +16,7 @@ import com.xiaoleilu.loServer.handler.Response;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import org.apache.commons.codec.digest.DigestUtils;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.RateLimiter;
abstract public class AdminAction extends Action {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/BlockUserAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -20,9 +21,9 @@ import io.moquette.persistence.TargetEntry;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("admin/user/status")
@Route(APIPath.User_Status)
@HttpMethod("POST")
public class BlockUserAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CheckUserOnlineAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
@@ -17,9 +18,9 @@ import io.moquette.persistence.RPCCenter;
import io.moquette.persistence.TargetEntry;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("/admin/user/onlinestatus")
@Route(APIPath.User_Online_Status)
@HttpMethod("POST")
public class CheckUserOnlineAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChatroomAction.java
+4 -3
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -21,10 +22,10 @@ import io.moquette.spi.impl.Utils;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("/admin/chatroom")
@HttpMethod("PUT")
@Route(APIPath.Create_Chatroom)
@HttpMethod("POST")
public class CreateChatroomAction extends AdminAction {
@Override
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateGroupAction.java
+4 -3
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -23,13 +24,13 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/group")
@HttpMethod("PUT")
@Route(APIPath.Create_Group)
@HttpMethod("POST")
public class CreateGroupAction extends AdminAction {
@Override
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateRobotAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -20,10 +21,10 @@ import cn.wildfirechat.pojos.OutputCreateRobot;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.UUIDGenerator;
@Route("admin/robot/create")
@Route(APIPath.Create_Robot)
@HttpMethod("POST")
public class CreateRobotAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateUserAction.java
+5 -4
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -15,15 +16,15 @@ 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 cn.wildfirechat.pojos.InputCreateUser;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.OutputCreateUser;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.UUIDGenerator;
@Route("admin/user/create")
@Route(APIPath.Create_User)
@HttpMethod("POST")
public class CreateUserAction extends AdminAction {
@@ -35,7 +36,7 @@ public class CreateUserAction extends AdminAction {
@Override
public boolean action(Request request, Response response) {
if (request.getNettyRequest() instanceof FullHttpRequest) {
InputCreateUser inputCreateUser = getRequestBody(request.getNettyRequest(), InputCreateUser.class);
InputOutputUserInfo inputCreateUser = getRequestBody(request.getNettyRequest(), InputOutputUserInfo.class);
if (inputCreateUser != null
&& !StringUtil.isNullOrEmpty(inputCreateUser.getName())) {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/DestoryChatroomAction.java
+4 -3
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -19,10 +20,10 @@ import io.moquette.spi.impl.Utils;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("/admin/chatroom")
@HttpMethod("DELETE")
@Route(APIPath.Chatroom_Destroy)
@HttpMethod("POST")
public class DestoryChatroomAction extends AdminAction {
@Override
broker/src/main/java/com/xiaoleilu/loServer/action/admin/DismissGroupAction.java
+4 -3
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -22,13 +23,13 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/group")
@HttpMethod("DELETE")
@Route(APIPath.Group_Dismiss)
@HttpMethod("POST")
public class DismissGroupAction extends AdminAction {
@Override
broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -23,12 +24,12 @@ import io.netty.buffer.Unpooled;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/friend/status")
@Route(APIPath.Friend_Status)
@HttpMethod("POST")
public class FriendRelationAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java
+2 -3
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -15,8 +16,6 @@ import com.xiaoleilu.loServer.annotation.Route;
import com.xiaoleilu.loServer.handler.Request;
import com.xiaoleilu.loServer.handler.Response;
import com.xiaoleilu.loServer.model.FriendData;
import cn.wildfirechat.pojos.InputCreateGroup;
import cn.wildfirechat.pojos.InputFriendRequest;
import cn.wildfirechat.pojos.InputGetFriendList;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
@@ -24,7 +23,7 @@ import io.netty.handler.codec.http.HttpResponseStatus;
import java.util.ArrayList;
import java.util.List;
@Route("admin/friend/list")
@Route(APIPath.Friend_List)
@HttpMethod("POST")
public class FriendRelationGetAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetChatroomInfoAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -19,9 +20,9 @@ import cn.wildfirechat.pojos.OutputGetChatroomInfo;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("/admin/chatroom")
@Route(APIPath.Chatroom_Info)
@HttpMethod("GET")
public class GetChatroomInfoAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetIMTokenAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.xiaoleilu.loServer.annotation.HttpMethod;
import com.xiaoleilu.loServer.annotation.Route;
@@ -18,13 +19,13 @@ import cn.wildfirechat.pojos.OutputGetIMTokenData;
import io.moquette.persistence.RPCCenter;
import io.moquette.persistence.TargetEntry;
import io.netty.handler.codec.http.FullHttpRequest;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.Base64;
import java.util.concurrent.Executor;
@Route("/admin/user/token")
@Route(APIPath.User_Token)
@HttpMethod("POST")
public class GetIMTokenAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserAction.java
+5 -4
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -15,14 +16,14 @@ 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 cn.wildfirechat.pojos.InputCreateUser;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.InputGetUserInfo;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("admin/user/info")
@Route(APIPath.User_Info)
@HttpMethod("POST")
public class GetUserAction extends AdminAction {
@@ -52,7 +53,7 @@ public class GetUserAction extends AdminAction {
if (user == null) {
result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
} else {
result = RestResult.ok(InputCreateUser.fromPbUser(user));
result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
}
response.setContent(new Gson().toJson(result));
broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockListAction.java
+2 -1
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -17,7 +18,7 @@ import com.xiaoleilu.loServer.handler.Response;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
@Route("admin/user/statuslist")
@Route(APIPath.User_Status_List)
@HttpMethod("POST")
public class GetUserBlockListAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/GetUserBlockStatusAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -19,9 +20,9 @@ import cn.wildfirechat.pojos.OutputUserStatus;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("admin/user/checkstatus")
@Route(APIPath.User_Check_Status)
@HttpMethod("POST")
public class GetUserBlockStatusAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/KickoffGroupMemberAction.java
+4 -3
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -22,13 +23,13 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/group/member")
@HttpMethod("DELETE")
@Route(APIPath.Group_Member_Kickoff)
@HttpMethod("POST")
public class KickoffGroupMemberAction extends AdminAction {
@Override
broker/src/main/java/com/xiaoleilu/loServer/action/admin/RecallMessageAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -23,12 +24,12 @@ import io.netty.buffer.Unpooled;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/message/recall")
@Route(APIPath.Msg_Recall)
@HttpMethod("POST")
public class RecallMessageAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/SendMessageAction.java
+3 -2
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.hazelcast.util.StringUtil;
import com.xiaoleilu.loServer.RestResult;
@@ -24,12 +25,12 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/message/send")
@Route(APIPath.Msg_Send)
@HttpMethod("POST")
public class SendMessageAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordAddAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -17,9 +18,9 @@ import com.xiaoleilu.loServer.handler.Response;
import cn.wildfirechat.pojos.InputOutputSensitiveWords;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("admin/sensitive/add")
@Route(APIPath.Sensitive_Add)
@HttpMethod("POST")
public class SensitiveWordAddAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordDeleteAction.java
+3 -2
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -17,9 +18,9 @@ import com.xiaoleilu.loServer.handler.Response;
import cn.wildfirechat.pojos.InputOutputSensitiveWords;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("admin/sensitive/del")
@Route(APIPath.Sensitive_Del)
@HttpMethod("POST")
public class SensitiveWordDeleteAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/SensitiveWordQueryAction.java
+3 -2
View File
@@ -8,17 +8,18 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
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 cn.wildfirechat.pojos.InputOutputSensitiveWords;
import io.netty.handler.codec.http.FullHttpRequest;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.List;
@Route("admin/sensitive/query")
@Route(APIPath.Sensitive_Query)
@HttpMethod("POST")
public class SensitiveWordQueryAction extends AdminAction {
broker/src/main/java/com/xiaoleilu/loServer/action/admin/TransferGroupAction.java
+4 -3
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -22,13 +23,13 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/group/owner")
@HttpMethod("PUT")
@Route(APIPath.Group_Owner)
@HttpMethod("POST")
public class TransferGroupAction extends AdminAction {
@Override
broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java
+1 -1
View File
@@ -20,7 +20,7 @@ import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import org.apache.commons.codec.digest.DigestUtils;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.RateLimiter;
abstract public class ChannelAction extends Action {
broker/src/main/java/com/xiaoleilu/loServer/action/channel/SendMessageAction.java
+3 -2
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.channel;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -24,14 +25,14 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
import static cn.wildfirechat.proto.ProtoConstants.ConversationType.ConversationType_Channel;
@Route("channel/message/send")
@Route(APIPath.Channel_Message_Send)
@HttpMethod("POST")
public class SendMessageAction extends ChannelAction {
broker/src/main/java/com/xiaoleilu/loServer/action/robot/GetUserAction.java
+5 -4
View File
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action.robot;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -15,14 +16,14 @@ 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 cn.wildfirechat.pojos.InputCreateUser;
import cn.wildfirechat.pojos.InputOutputUserInfo;
import cn.wildfirechat.pojos.InputGetUserInfo;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
@Route("admin/robot/user_info")
@Route(APIPath.Robot_User_Info)
@HttpMethod("POST")
public class GetUserAction extends RobotAction {
@@ -47,7 +48,7 @@ public class GetUserAction extends RobotAction {
if (user == null) {
result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
} else {
result = RestResult.ok(InputCreateUser.fromPbUser(user));
result = RestResult.ok(InputOutputUserInfo.fromPbUser(user));
}
response.setContent(new Gson().toJson(result));
broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java
+1 -1
View File
@@ -20,7 +20,7 @@ import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.util.internal.StringUtil;
import org.apache.commons.codec.digest.DigestUtils;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.RateLimiter;
import java.io.UnsupportedEncodingException;
broker/src/main/java/com/xiaoleilu/loServer/action/robot/SendMessageAction.java
+3 -2
View File
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.robot;
import cn.wildfirechat.common.APIPath;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -23,12 +24,12 @@ 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 common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.concurrent.Executor;
@Route("admin/robot/send")
@Route(APIPath.Robot_Message_Send)
@HttpMethod("POST")
public class SendMessageAction extends RobotAction {
broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java
+2 -2
View File
@@ -12,10 +12,10 @@ import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
import static win.liyufan.im.IMTopic.HandleFriendRequestTopic;
@Handler(IMTopic.AddFriendRequestTopic)
broker/src/main/java/io/moquette/imhandler/AddGroupMember.java
+2 -2
View File
@@ -12,10 +12,10 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(value = IMTopic.AddGroupMemberTopic)
public class AddGroupMember extends GroupHandler<WFCMessage.AddGroupMemberRequest> {
broker/src/main/java/io/moquette/imhandler/BlackListRequestHandler.java
+2 -2
View File
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.BlackListUserTopic)
public class BlackListRequestHandler extends GroupHandler<WFCMessage.BlackUserRequest> {
broker/src/main/java/io/moquette/imhandler/ChannelListenMember.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static win.liyufan.im.IMTopic.PutUserSettingTopic;
broker/src/main/java/io/moquette/imhandler/ChannelSearchHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.List;
broker/src/main/java/io/moquette/imhandler/CreateChannelHandler.java
+1 -1
View File
@@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage;
import com.hazelcast.util.StringUtil;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static win.liyufan.im.IMTopic.PutUserSettingTopic;
broker/src/main/java/io/moquette/imhandler/CreateGroupHandler.java
+1 -1
View File
@@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(value = IMTopic.CreateGroupTopic)
broker/src/main/java/io/moquette/imhandler/DeleteFriendHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.DeleteFriendTopic)
broker/src/main/java/io/moquette/imhandler/DismissGroupHandler.java
+1 -1
View File
@@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import static win.liyufan.im.IMTopic.DismissGroupTopic;
broker/src/main/java/io/moquette/imhandler/DistoryChannelHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static win.liyufan.im.IMTopic.PutUserSettingTopic;
broker/src/main/java/io/moquette/imhandler/FriendPullHandler.java
+1 -1
View File
@@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage;
import com.xiaoleilu.loServer.model.FriendData;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.List;
broker/src/main/java/io/moquette/imhandler/FriendRequestPullHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.List;
broker/src/main/java/io/moquette/imhandler/GetChannelInfoHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.ChannelPullTopic)
broker/src/main/java/io/moquette/imhandler/GetChatroomInfoHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.GetChatroomInfoTopic)
broker/src/main/java/io/moquette/imhandler/GetChatroomMemberHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.GetChatroomMemberTopic)
broker/src/main/java/io/moquette/imhandler/GetGroupInfoHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.List;
broker/src/main/java/io/moquette/imhandler/GetGroupMemberHandler.java
+2 -2
View File
@@ -11,13 +11,13 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.ArrayList;
import java.util.List;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.GetGroupMemberTopic)
public class GetGroupMemberHandler extends IMHandler<WFCMessage.PullGroupMemberRequest> {
broker/src/main/java/io/moquette/imhandler/GetQiniuUploadTokenHandler.java
+1 -1
View File
@@ -14,7 +14,7 @@ import com.xiaoleilu.loServer.action.UploadFileAction;
import io.moquette.server.config.MediaServerConfig;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.GetQiniuUploadTokenTopic)
broker/src/main/java/io/moquette/imhandler/GetTokenHandler.java
+1 -1
View File
@@ -13,7 +13,7 @@ import io.moquette.persistence.MemorySessionStore;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.moquette.spi.impl.security.TokenAuthenticator;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.GetTokenTopic)
broker/src/main/java/io/moquette/imhandler/GetUserInfoHandler.java
+2 -2
View File
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.GetUserInfoTopic)
public class GetUserInfoHandler extends IMHandler<WFCMessage.PullUserRequest> {
broker/src/main/java/io/moquette/imhandler/GetUserSettingHandler.java
+2 -2
View File
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.GetUserSettingTopic)
public class GetUserSettingHandler extends IMHandler<WFCMessage.Version> {
broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
+2 -2
View File
@@ -12,11 +12,11 @@ import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import win.liyufan.im.MessageShardingUtil;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.HandleFriendRequestTopic)
public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFriendRequest> {
broker/src/main/java/io/moquette/imhandler/IMHandler.java
+3 -3
View File
@@ -23,7 +23,7 @@ import io.netty.buffer.Unpooled;
import io.netty.util.internal.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.RateLimiter;
import win.liyufan.im.Utility;
@@ -34,8 +34,8 @@ import java.lang.reflect.Method;
import java.util.LinkedHashSet;
import java.util.Set;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
/**
* 请求处理接口<br>
broker/src/main/java/io/moquette/imhandler/JoinChatroomHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
broker/src/main/java/io/moquette/imhandler/KickoffGroupMember.java
+1 -1
View File
@@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import static win.liyufan.im.IMTopic.KickoffGroupMemberTopic;
@Handler(value = KickoffGroupMemberTopic)
broker/src/main/java/io/moquette/imhandler/LoadRemoteMessagesHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(value = IMTopic.LoadRemoteMessagesTopic)
broker/src/main/java/io/moquette/imhandler/ModifyChannelInfoHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import static win.liyufan.im.IMTopic.ModifyChannelInfoTopic;
broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java
+2 -2
View File
@@ -12,10 +12,10 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.ModifyGroupAliasTopic)
public class ModifyGroupAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
broker/src/main/java/io/moquette/imhandler/ModifyGroupInfoHandler.java
+2 -2
View File
@@ -12,11 +12,11 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Name;
import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.Modify_Group_Portrait;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
@Handler(value = ModifyGroupInfoTopic)
broker/src/main/java/io/moquette/imhandler/ModifyMyInfoHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.ModifyMyInfoTopic)
broker/src/main/java/io/moquette/imhandler/PullMessageHandler.java
+1 -1
View File
@@ -12,7 +12,7 @@ import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(value = IMTopic.PullMessageTopic)
broker/src/main/java/io/moquette/imhandler/PutUserSettingHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.PutUserSettingTopic)
broker/src/main/java/io/moquette/imhandler/QuitChatroomHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.QuitChatroomTopic)
broker/src/main/java/io/moquette/imhandler/QuitGroupHandler.java
+1 -1
View File
@@ -12,7 +12,7 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import static win.liyufan.im.IMTopic.QuitGroupTopic;
broker/src/main/java/io/moquette/imhandler/RecallMessageHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.LinkedHashSet;
broker/src/main/java/io/moquette/imhandler/RouteHandler.java
+1 -1
View File
@@ -13,7 +13,7 @@ import com.hazelcast.core.Member;
import io.moquette.spi.ClientSession;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static io.moquette.BrokerConstants.HZ_Cluster_Node_External_IP;
broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
+1 -1
View File
@@ -14,7 +14,7 @@ import com.hazelcast.util.StringUtil;
import io.moquette.BrokerConstants;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import win.liyufan.im.MessageShardingUtil;
broker/src/main/java/io/moquette/imhandler/SetFriendAliasRequestHandler.java
+2 -2
View File
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.SetFriendAliasTopic)
public class SetFriendAliasRequestHandler extends GroupHandler<WFCMessage.AddFriendRequest> {
broker/src/main/java/io/moquette/imhandler/SyncFriendRequestUnreadHandler.java
+2 -2
View File
@@ -11,10 +11,10 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.RriendRequestUnreadSyncTopic)
public class SyncFriendRequestUnreadHandler extends GroupHandler<WFCMessage.Version> {
broker/src/main/java/io/moquette/imhandler/TransferChannelHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
@Handler(IMTopic.TransferChannelInfoTopic)
broker/src/main/java/io/moquette/imhandler/TransferGroupHandler.java
+2 -2
View File
@@ -12,10 +12,10 @@ import cn.wildfirechat.proto.WFCMessage;
import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
@Handler(IMTopic.TransferGroupTopic)
public class TransferGroupHandler extends GroupHandler<WFCMessage.TransferGroupRequest> {
broker/src/main/java/io/moquette/imhandler/UploadDeviceTokenHandler.java
+1 -1
View File
@@ -13,7 +13,7 @@ import cn.wildfirechat.proto.WFCMessage;
import io.moquette.persistence.MemorySessionStore;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
broker/src/main/java/io/moquette/imhandler/UserSearchHandler.java
+1 -1
View File
@@ -11,7 +11,7 @@ package io.moquette.imhandler;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.spi.impl.Qos1PublishHandler;
import io.netty.buffer.ByteBuf;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import java.util.List;
broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.hazelcast.core.*;
import com.hazelcast.util.StringUtil;
import com.xiaoleilu.loServer.model.FriendData;
import cn.wildfirechat.pojos.InputOutputUserBlockStatus;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import io.moquette.server.Server;
import io.moquette.spi.IMatchingCondition;
import io.moquette.spi.IMessagesStore;
broker/src/main/java/io/moquette/persistence/MemorySessionStore.java
+1 -1
View File
@@ -25,7 +25,7 @@ import io.moquette.spi.ISessionsStore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.*;
import java.util.concurrent.*;
broker/src/main/java/io/moquette/persistence/RPCCenter.java
+1 -1
View File
@@ -12,7 +12,7 @@ import io.moquette.persistence.remote.*;
import io.moquette.server.Server;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
broker/src/main/java/io/moquette/server/ConnectionDescriptorStore.java
+1 -1
View File
@@ -27,7 +27,7 @@ import io.netty.handler.codec.mqtt.MqttMessage;
import io.netty.handler.codec.mqtt.MqttMessageType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.ArrayList;
import java.util.Collection;
broker/src/main/java/io/moquette/spi/IMessagesStore.java
+1 -1
View File
@@ -25,7 +25,7 @@ import io.moquette.spi.impl.subscriptions.Topic;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled;
import io.netty.handler.codec.mqtt.MqttQoS;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.Collection;
import java.util.List;
broker/src/main/java/io/moquette/spi/ISessionsStore.java
+1 -1
View File
@@ -19,7 +19,7 @@ package io.moquette.spi;
import cn.wildfirechat.proto.WFCMessage;
import io.moquette.persistence.MemorySessionStore.Session;
import io.moquette.spi.IMessagesStore.StoredMessage;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import java.util.Collection;
import java.util.Queue;
broker/src/main/java/io/moquette/spi/impl/Qos1PublishHandler.java
+4 -4
View File
@@ -19,9 +19,9 @@ package io.moquette.spi.impl;
import static io.moquette.spi.impl.Utils.readBytesAndRewind;
import static io.netty.handler.codec.mqtt.MqttMessageIdVariableHeader.from;
import static io.netty.handler.codec.mqtt.MqttQoS.AT_MOST_ONCE;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
import static common.cn.wildfirechat.ErrorCode.ERROR_CODE_SUCCESS;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_NOT_IMPLEMENT;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_OVER_FREQUENCY;
import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
import java.io.IOException;
import java.util.*;
@@ -56,7 +56,7 @@ import io.netty.channel.Channel;
import io.netty.handler.codec.mqtt.MqttFixedHeader;
import io.netty.handler.codec.mqtt.MqttMessageType;
import io.netty.handler.codec.mqtt.MqttPublishMessage;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
import win.liyufan.im.IMTopic;
import win.liyufan.im.RateLimiter;
import win.liyufan.im.Utility;
client/pom.xml
-1
View File
@@ -10,7 +10,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.wildfirechat</groupId>
<artifactId>client</artifactId>
<dependencies>
common/pom.xml
-1
View File
@@ -9,7 +9,6 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>cn.wildfirechat</groupId>
<artifactId>common</artifactId>
<dependencies>
client/src/main/java/com/xiaoleilu/loServer/pojos/InputGetToken.java → common/src/main/java/cn.wildfirechat.pojos/InputGetToken.java
+2 -2
View File
@@ -4,9 +4,9 @@ public class InputGetToken {
private String userId;
private String clientId;
public InputGetToken(String userId, String name) {
public InputGetToken(String userId, String clientId) {
this.userId = userId;
this.clientId = name;
this.clientId = clientId;
}
public String getUserId() {
common/src/main/java/cn.wildfirechat.pojos/InputCreateUser.java → common/src/main/java/cn.wildfirechat.pojos/InputOutputUserInfo.java
+3 -3
View File
@@ -11,7 +11,7 @@ package cn.wildfirechat.pojos;
import cn.wildfirechat.proto.WFCMessage;
public class InputCreateUser {
public class InputOutputUserInfo {
private String userId;
private String name;
private String password;
@@ -26,8 +26,8 @@ public class InputCreateUser {
private String extra;
private long updateDt;
public static InputCreateUser fromPbUser(WFCMessage.User pbUser) {
InputCreateUser inputCreateUser = new InputCreateUser();
public static InputOutputUserInfo fromPbUser(WFCMessage.User pbUser) {
InputOutputUserInfo inputCreateUser = new InputOutputUserInfo();
inputCreateUser.userId = pbUser.getUid();
inputCreateUser.name = pbUser.getName();
inputCreateUser.displayName = pbUser.getDisplayName();
client/src/main/java/com/xiaoleilu/loServer/pojos/OutputGetIMTokenData.java → common/src/main/java/cn.wildfirechat.pojos/OutputGetIMTokenData.java
View File
common/src/main/java/cn/wildfirechat/common/APIPath.java
+41
View File
@@ -0,0 +1,41 @@
package cn.wildfirechat.common;
public interface APIPath {
String Create_Chatroom = "/admin/chatroom/create";
String Create_Group = "/admin/group/create";
String Create_Robot = "/admin/robot/create";
String Create_User = "/admin/user/create";
String Chatroom_Destroy = "/admin/chatroom/del";
String Chatroom_Info = "/admin/chatroom/info";
String Sensitive_Add = "/admin/sensitive/add";
String Sensitive_Del = "/admin/sensitive/del";
String Sensitive_Query = "/admin/sensitive/query";
String User_Token = "/admin/user/token";
String User_Status = "/admin/user/status";
String User_Info = "/admin/user/info";
String User_Status_List = "/admin/user/statuslist";
String User_Check_Status = "/admin/user/checkstatus";
String User_Online_Status = "/admin/user/onlinestatus";
String Friend_Status = "/admin/friend/status";
String Friend_List = "/admin/friend/list";
String Msg_Send = "/admin/message/send";
String Msg_Recall = "/admin/message/recall";
String Group_Dismiss = "/admin/group/del";
String Group_Member_Add = "/admin/group/member/add";
String Group_Member_Kickoff = "/admin/group/member/del";
String Group_Owner = "/admin/group/owner";
String Channel_Message_Send = "/channel/message/send";
String Robot_User_Info = "/robot/user_info";
String Robot_Message_Send = "/robot/message/send";
}
common/src/main/java/common/cn/wildfirechat/ErrorCode.java → common/src/main/java/cn/wildfirechat/common/ErrorCode.java
+1 -1
View File
@@ -6,7 +6,7 @@
* file that was distributed with this source code.
*/
package common.cn.wildfirechat;
package cn.wildfirechat.common;
public enum ErrorCode {
//General error
distribution/src/main/assembly/assembly.xml
+24
View File
@@ -78,6 +78,30 @@
<outputDirectory>lib/</outputDirectory>
<destName>moquette-broker-${project.version}.jar</destName>
</file>
<file>
<source>../client/target/client-${project.version}.jar</source>
<outputDirectory>java_client/</outputDirectory>
<destName>client-${project.version}.jar</destName>
</file>
<file>
<source>../common/target/common-${project.version}.jar</source>
<outputDirectory>java_client/</outputDirectory>
<destName>common-${project.version}.jar</destName>
</file>
<file>
<source>../sdk/target/sdk-${project.version}.jar</source>
<outputDirectory>server_sdk/</outputDirectory>
<destName>sdk-${project.version}.jar</destName>
</file>
<file>
<source>../common/target/common-${project.version}.jar</source>
<outputDirectory>server_sdk/</outputDirectory>
<destName>common-${project.version}.jar</destName>
</file>
</files>
sdk/pom.xml
+3 -10
View File
@@ -56,13 +56,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>annotations</artifactId>
<version>2.0.3</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
@@ -72,9 +65,9 @@
</dependency>
<dependency>
<groupId>com.github.qcloudsms</groupId>
<artifactId>qcloudsms</artifactId>
<version>1.0.5</version>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
</dependency>
<dependency>
sdk/src/main/java/cn/wildfirechat/sdk/ChatAdmin.java
+9 -7
View File
@@ -1,5 +1,6 @@
package cn.wildfirechat.sdk;
import cn.wildfirechat.pojos.*;
import cn.wildfirechat.sdk.model.*;
public class ChatAdmin {
@@ -7,19 +8,20 @@ public class ChatAdmin {
HttpUtils.init(url, secret);
}
public static IMResult<User> getUserByName(String mobile) throws Exception {
public static IMResult<InputOutputUserInfo> getUserByName(String mobile) throws Exception {
String path = "/admin/user/info";
UserName name = new UserName(mobile);
return HttpUtils.httpJsonPost(path, name, User.class);
InputGetUserInfo getUserInfo = new InputGetUserInfo(null, mobile);
return HttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
}
public static IMResult<UserId> createUser(User user) throws Exception {
public static IMResult<OutputCreateUser> createUser(InputOutputUserInfo user) throws Exception {
String path = "/admin/user/create";
return HttpUtils.httpJsonPost(path, user, UserId.class);
return HttpUtils.httpJsonPost(path, user, OutputCreateUser.class);
}
public static IMResult<Token> getUserToken(String userId, String clientId) throws Exception {
public static IMResult<OutputGetIMTokenData> getUserToken(String userId, String clientId) throws Exception {
String path = "/admin/user/token";
return HttpUtils.httpJsonPost(path, new GetTokenRequest(userId, clientId), Token.class);
InputGetToken getToken = new InputGetToken(userId, clientId);
return HttpUtils.httpJsonPost(path, getToken, OutputGetIMTokenData.class);
}
}
sdk/src/main/java/cn/wildfirechat/sdk/model/GetTokenRequest.java
-27
View File
@@ -1,27 +0,0 @@
package cn.wildfirechat.sdk.model;
public class GetTokenRequest {
private String userId;
private String clientId;
public GetTokenRequest(String userId, String clientId) {
this.userId = userId;
this.clientId = clientId;
}
public String getClientId() {
return clientId;
}
public void setClientId(String clientId) {
this.clientId = clientId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
}
sdk/src/main/java/cn/wildfirechat/sdk/model/IMResult.java
+1 -1
View File
@@ -1,6 +1,6 @@
package cn.wildfirechat.sdk.model;
import common.cn.wildfirechat.ErrorCode;
import cn.wildfirechat.common.ErrorCode;
public class IMResult<T> {
sdk/src/main/java/cn/wildfirechat/sdk/model/Token.java
-22
View File
@@ -1,22 +0,0 @@
package cn.wildfirechat.sdk.model;
public class Token {
private String token;
private String userId;
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
}
sdk/src/main/java/cn/wildfirechat/sdk/model/User.java
-121
View File
@@ -1,121 +0,0 @@
package cn.wildfirechat.sdk.model;
public class User {
private String userId;
private String name;
private String password;
private String displayName;
private String portrait;
private int gender;
private String mobile;
private String email;
private String address;
private String company;
private String social;
private String extra;
private long updateDt;
public String getSocial() {
return social;
}
public void setSocial(String social) {
this.social = social;
}
public long getUpdateDt() {
return updateDt;
}
public void setUpdateDt(long updateDt) {
this.updateDt = updateDt;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
public String getDisplayName() {
return displayName;
}
public void setDisplayName(String displayName) {
this.displayName = displayName;
}
public String getPortrait() {
return portrait;
}
public void setPortrait(String portrait) {
this.portrait = portrait;
}
public String getMobile() {
return mobile;
}
public void setMobile(String mobile) {
this.mobile = mobile;
}
public String getEmail() {
return email;
}
public void setEmail(String email) {
this.email = email;
}
public String getAddress() {
return address;
}
public void setAddress(String address) {
this.address = address;
}
public String getCompany() {
return company;
}
public void setCompany(String company) {
this.company = company;
}
public String getExtra() {
return extra;
}
public void setExtra(String extra) {
this.extra = extra;
}
public int getGender() {
return gender;
}
public void setGender(int gender) {
this.gender = gender;
}
}
sdk/src/main/java/cn/wildfirechat/sdk/model/UserId.java
-17
View File
@@ -1,17 +0,0 @@
package cn.wildfirechat.sdk.model;
public class UserId {
private String userId;
public UserId(String userId) {
this.userId = userId;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
}
sdk/src/main/java/cn/wildfirechat/sdk/model/UserName.java
-17
View File
@@ -1,17 +0,0 @@
package cn.wildfirechat.sdk.model;
public class UserName {
private String name;
public UserName(String name) {
this.name = name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}