test/j-im
1
0
Fork 0
mirror of https://gitee.com/xchao/j-im.git synced 2024-12-02 11:57:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化登陆cmd处理器

Browse Source
This commit is contained in:
wchao 2018-08-06 00:42:41 +08:00
parent 253800424a
commit 45f04ed87d
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jim-server-demo/src/main/java/org/jim/server/demo/service/LoginServiceProcessor.java
View File

@ -141,7 +141,6 @@ public class LoginServiceProcessor implements LoginProcessorIntf{
loginRespBody = new LoginRespBody(Command.COMMAND_LOGIN_RESP,ImStatus.C10008,null);
}else{
loginRespBody = new LoginRespBody(Command.COMMAND_LOGIN_RESP,ImStatus.C10007,user);
loginRespBody.setData(user);
}
return loginRespBody;
}

25
jim-server-demo/src/main/resources/page/index.html
View File

@ -38,12 +38,7 @@ function connect(){
logDiv = document.getElementById('logs');
socket = new WebSocket("ws:"+ip+":"+port+"?username="+username+"&password="+password);
socket.onopen = function(e){
logDiv.innerHTML+="<font color='green' size='1'>登录成功...</font><br>";
var userCmd = "{\"cmd\":17,\"type\":\"0\",\"userid\":\""+username+"\"}";
var msgCmd = "{\"cmd\":19,\"type\":\"0\",\"userId\":\""+username+"\"}";
socket.send(userCmd);//获取登录用户信息;
socket.send(msgCmd);//获取用户离线消息(好友+群组);
scrollToBottom();
};
socket.onerror = function(e){
logDiv.innerHTML+="<font color='red' size='1'>异常:"+e+"</font><br>";
@ -51,7 +46,7 @@ function connect(){
};
socket.onclose = function(e){
curUser = null;
logDiv.innerHTML+="<font color='green' size='1'>退出登录...</font><br>";
logDiv.innerHTML+="<font color='green' size='1'>关闭连接...</font><br>";
document.getElementById("onlinePanel").innerHTML="&nbsp;在线成员(0/0)";
scrollToBottom();
};
@ -68,6 +63,9 @@ function connect(){
COMMAND_JOIN_GROUP_NOTIFY_RESP(dataObj);
}else if(dataObj.command == 10){
COMMAND_EXIT_GROUP_NOTIFY_RESP(dataObj);
}else if(dataObj.command == 20 && dataObj.code == 10015){
//获取消息失败，未开启持久化处理
//...
}else if(dataObj.command == 20 && dataObj.code == 10016){//处理离线消息;
var msgFlag = "离线消息";
COMMAND_GET_MESSAGE_RESP(dataObj,msgFlag);
@ -80,13 +78,24 @@ function connect(){
OTHER(data);
}
}else if(dataObj.command == 6){//登陆命令返回状态处理
//暂时不处理...
COMMAND_LOGIN_RESP(dataObj);
}else{
OTHER(data);
}
scrollToBottom();
};
}
//登陆通知处理
function COMMAND_LOGIN_RESP(dataObj){
if(10007 == dataObj.code){//登陆成功;
logDiv.innerHTML+="<font color='green' size='1'>连接成功...</font><br>";
var userCmd = "{\"cmd\":17,\"type\":\"0\",\"userid\":\""+username+"\"}";
var msgCmd = "{\"cmd\":19,\"type\":\"0\",\"userId\":\""+username+"\"}";
socket.send(userCmd);//获取登录用户信息;
socket.send(msgCmd);//获取用户离线消息(好友+群组);
scrollToBottom();
}
}
function COMMAND_EXIT_GROUP_NOTIFY_RESP(data){
var exitGroupNotify = data.data;
var onlineUserCmd = "{\"cmd\":17,\"type\":\"0\",\"userid\":\""+curUser.id+"\"}";

7
jim-server/src/main/java/org/jim/server/command/handler/LoginReqHandler.java
View File

@ -1,8 +1,6 @@
package org.jim.server.command.handler;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.jim.common.Const;
import org.jim.common.ImAio;
import org.jim.common.ImConfig;
@ -48,11 +46,10 @@ public class LoginReqHandler extends AbCmdHandler {
LoginRespBody loginRespBody = loginServiceHandler.doLogin(loginReqBody,channelContext);
if (loginRespBody == null || loginRespBody.getUser() == null) {
log.info("登录失败, loginname:{}, password:{}", loginReqBody.getLoginname(), loginReqBody.getPassword());
if(loginRespBody != null){
/*if(loginRespBody != null){
loginRespBody.clear();
ImAio.send(channelContext, new ImPacket(Command.COMMAND_LOGIN_RESP, loginRespBody.toByte()));
TimeUnit.MILLISECONDS.sleep(1);//这里暂时先这样，需要优化
}
}*/
Aio.remove(channelContext, "loginname and token is null");
return null;
}