test/j-im
1
0
Fork 0
mirror of https://gitee.com/xchao/j-im.git synced 2024-11-29 18:37:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

重构集群+持久化

Browse Source
This commit is contained in:
王超 2020-05-04 04:06:07 +08:00
parent 2d9aa81ff1
commit cc13b48ac2
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jim-server-demo/src/main/resources/pages/index.html
View File

@ -8,7 +8,7 @@
<style type="text/css" media="screen">
*{margin:0;padding:0;}
#wrap{margin:10px auto; width:80%; height:99%;}
.unit{margin-bottom:5px; padding:5px; border:solid 1px #000; height:auto; clear:both;box-sizing:border-box;}
.unit{margin-bottom:5px; padding:5px; border:solid 1px #000; height:auto; clear:both;box-sizing:border-box;}
.unit label{text-align:right;width:100px;line-height: 30px; display:inline-block;}
.unit input{line-height: 30px; width:100px; height:30px;}
.log {font-size:11px; font-family:Courier; overflow: auto; height:100%; background:black;width:85%;float:left}
@ -38,7 +38,7 @@ function connect(){
logDiv = document.getElementById('logs');
socket = new WebSocket("ws:"+ip+":"+port+"?username="+username+"&password="+password);
socket.onopen = function(e){
};
socket.onerror = function(e){
logDiv.innerHTML+="<font color='red' size='1'>异常:"+e+"</font><br>";
@ -211,7 +211,7 @@ function initOnlineUsers(){
document.getElementById("onlinePanel").innerHTML = onlineUserStr;
}
function disConnect(){
socket.close();
socket.close();
}
function send(){

22
jim-server/src/main/java/org/jim/server/listener/ImServerListenerAdapter.java
View File

@ -1,8 +1,10 @@
package org.jim.server.listener;
import com.alibaba.fastjson.JSONObject;
import org.jim.core.ImChannelContext;
import org.jim.core.ImConst;
import org.jim.core.ImPacket;
import org.jim.core.ImSessionContext;
import org.jim.core.config.ImConfig;
import org.jim.core.message.MessageHelper;
import org.jim.core.packets.User;
@ -65,6 +67,7 @@ public class ImServerListenerAdapter implements ServerAioListener, ImConst{
public void onAfterSent(ChannelContext channelContext, Packet packet, boolean isSentSuccess)throws Exception{
imServerListener.onAfterSent((ImChannelContext)channelContext.get(Key.IM_CHANNEL_CONTEXT_KEY), (ImPacket)packet, isSentSuccess);
}
/**
* 连接关闭前触发本方法
* @param channelContext the channelContext
@ -77,15 +80,19 @@ public class ImServerListenerAdapter implements ServerAioListener, ImConst{
@Override
public void onBeforeClose(ChannelContext channelContext, Throwable throwable, String remark, boolean isRemove)throws Exception{
ImServerChannelContext imServerChannelContext = (ImServerChannelContext) channelContext.get(Key.IM_CHANNEL_CONTEXT_KEY);
ImServerConfig imServerConfig = ImConfig.Global.get();
MessageHelper messageHelper = imServerConfig.getMessageHelper();
User user = imServerChannelContext.getSessionContext().getImClientNode().getUser();
boolean isStore = ImServerConfig.ON.equals(imServerConfig.getIsStore()) && Objects.nonNull(messageHelper) && Objects.nonNull(user);
if(isStore){
imServerConfig.getImUserListener().onAfterUnbind(imServerChannelContext, user);
ImSessionContext imSessionContext = imServerChannelContext.getSessionContext();
if(Objects.nonNull(imSessionContext)){
ImServerConfig imServerConfig = ImConfig.Global.get();
MessageHelper messageHelper = imServerConfig.getMessageHelper();
User user = imServerChannelContext.getSessionContext().getImClientNode().getUser();
boolean isStore = ImServerConfig.ON.equals(imServerConfig.getIsStore()) && Objects.nonNull(messageHelper) && Objects.nonNull(user);
if(isStore){
imServerConfig.getImUserListener().onAfterUnbind(imServerChannelContext, user);
}
}
imServerListener.onBeforeClose(imServerChannelContext, throwable, remark, isRemove);
}
/**
* 解码成功后触发本方法
* @param channelContext
@ -98,6 +105,7 @@ public class ImServerListenerAdapter implements ServerAioListener, ImConst{
public void onAfterDecoded(ChannelContext channelContext, Packet packet,int packetSize) throws Exception {
imServerListener.onAfterDecoded((ImChannelContext)channelContext.get(Key.IM_CHANNEL_CONTEXT_KEY), (ImPacket)packet, packetSize);
}
/**
* 接收到TCP层传过来的数据后
* @param channelContext
@ -108,6 +116,7 @@ public class ImServerListenerAdapter implements ServerAioListener, ImConst{
public void onAfterReceivedBytes(ChannelContext channelContext,int receivedBytes) throws Exception {
imServerListener.onAfterReceivedBytes((ImChannelContext)channelContext.get(Key.IM_CHANNEL_CONTEXT_KEY), receivedBytes);
}
/**
* 处理一个消息包后
* @param channelContext
@ -124,4 +133,5 @@ public class ImServerListenerAdapter implements ServerAioListener, ImConst{
public boolean onHeartbeatTimeout(ChannelContext channelContext, Long aLong, int i) {
return imServerListener.onHeartbeatTimeout((ImChannelContext)channelContext.get(Key.IM_CHANNEL_CONTEXT_KEY), aLong, i);
}
}