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