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/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