|
@@ -64,16 +64,11 @@ public class WebSocketServerEndpoint {
|
|
|
WS_LOG.debug("[onOpen]. path=" + path + "");
|
|
|
}
|
|
|
|
|
|
- MessageOut out = new MessageOut();
|
|
|
- out.setSessionId(sessionId);
|
|
|
- out.setStatus(200);
|
|
|
- out.setPath(path);
|
|
|
+ MessageOut out = new MessageOut(path, sessionId);
|
|
|
|
|
|
Method method = MessageHandlerHolder.getMethod(path);
|
|
|
if (null == method) {
|
|
|
- out.setStatus(404);
|
|
|
- out.setStatusCode("404");
|
|
|
- out.setStatusDesc("NOT FOUND");
|
|
|
+ out.setStatus("404", "NOT FOUND");
|
|
|
sendText(session, path, out);
|
|
|
IOUtils.closeQuietly(session);
|
|
|
return;
|
|
@@ -96,16 +91,12 @@ public class WebSocketServerEndpoint {
|
|
|
User user = getRedisClient().get(key, User.class);
|
|
|
|
|
|
if (null == user) {
|
|
|
- out.setStatus(403);
|
|
|
- out.setStatusCode("403");
|
|
|
- out.setStatusDesc("no login");
|
|
|
+ out.setStatus("403", "no login");
|
|
|
sendText(session, path, out);
|
|
|
IOUtils.closeQuietly(session);
|
|
|
return;
|
|
|
} else if (!token.equals(user.getToken())) {
|
|
|
- out.setStatus(403);
|
|
|
- out.setStatusCode("403");
|
|
|
- out.setStatusDesc("token is wrong");
|
|
|
+ out.setStatus("403", "token is wrong");
|
|
|
sendText(session, path, out);
|
|
|
IOUtils.closeQuietly(session);
|
|
|
return;
|
|
@@ -181,22 +172,15 @@ public class WebSocketServerEndpoint {
|
|
|
|
|
|
User user = getRedisClient().get(key, User.class);
|
|
|
|
|
|
- MessageOut out = new MessageOut();
|
|
|
- out.setSessionId(sessionId);
|
|
|
- out.setStatus(200);
|
|
|
- out.setPath(path);
|
|
|
+ MessageOut out = new MessageOut(path, sessionId);
|
|
|
|
|
|
if (null == user) {
|
|
|
- out.setStatus(403);
|
|
|
- out.setStatusCode("403");
|
|
|
- out.setStatusDesc("no login");
|
|
|
+ out.setStatus("403", "no login");
|
|
|
sendText(session, path, out);
|
|
|
IOUtils.closeQuietly(session);
|
|
|
return;
|
|
|
} else if (!token.equals(user.getToken())) {
|
|
|
- out.setStatus(403);
|
|
|
- out.setStatusCode("403");
|
|
|
- out.setStatusDesc("token is wrong");
|
|
|
+ out.setStatus("403", "token is wrong");
|
|
|
sendText(session, path, out);
|
|
|
IOUtils.closeQuietly(session);
|
|
|
return;
|
|
@@ -249,14 +233,10 @@ public class WebSocketServerEndpoint {
|
|
|
|
|
|
} catch (StatusException e) {
|
|
|
WS_LOG.error("[onMessage-FAIL]. path=" + path + "", e);
|
|
|
- out.setStatus(500);
|
|
|
- out.setStatusCode(e.getCode());
|
|
|
- out.setStatusDesc(e.getDesc());
|
|
|
+ out.setStatus(e.getCode(), e.getDesc());
|
|
|
} catch (Exception e) {
|
|
|
WS_LOG.error("[onMessage-FAIL]. path=" + path + "", e);
|
|
|
- out.setStatus(500);
|
|
|
- out.setStatusCode("500");
|
|
|
- out.setStatusDesc("系统异常");
|
|
|
+ out.setStatus("500", "系统异常");
|
|
|
}
|
|
|
|
|
|
sendText(session, path, out);
|