gitee/cim
1
0
Fork 0
mirror of https://gitee.com/farsunset/cim.git synced 2025-07-12 19:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.优化 cim 的android sdk，大幅提高长连接的存活率

Browse Source 
2.大幅优化服务端的长连接管理，最短的时间获知客户端的连接状态
3.优化mina版 工程代码结构，更加清晰
4.更新了相关文档
This commit is contained in:
远方夕阳 2015-10-26 15:44:00 +08:00
parent 7b1519ea70
commit e49d5ea415
611 changed files with 2675 additions and 2903 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
CIM客户端文档.doc
View File

Binary file not shown.

0
cim_for_mina/1.6.0.VERSION → cim_for_mina/2.0.0.VERSION
View File

9
cim_for_mina/cim-android-sdk/.classpath Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="C:/dev/Android-SDK-Windows/platforms/android-19/android.jar"/>
<classpathentry kind="lib" path="D:/cim-system/cim-server/WebRoot/WEB-INF/lib/log4j.jar"/>
<classpathentry kind="lib" path="D:/cim-system/cim-server/WebRoot/WEB-INF/lib/mina-core-2.0.9.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

23
cim_for_mina/cim-android-sdk/.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>cim-android-sdk</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.genuitec.eclipse.ast.deploy.core.DeploymentBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.genuitec.eclipse.ast.deploy.core.deploymentnature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

3
cim_for_mina/cim-android-sdk/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,3 @@
#Wed Oct 15 09:31:41 CST 2014
eclipse.preferences.version=1
encoding/<project>=UTF-8

14
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMDataConfig.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/android/CIMCacheTools.java
View File

@ -1,12 +1,14 @@
/**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.android; package com.farsunset.cim.client.android;
import android.content.Context; import android.content.Context;
/**
* class CIMCacheTools {
* @author 3979434
*
*/
class CIMDataConfig {
public static String CIM_CONFIG_INFO = "CIM_CONFIG_INFO"; public static String CIM_CONFIG_INFO = "CIM_CONFIG_INFO";

689
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMConnectorManager.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/android/CIMConnectorManager.java
View File

@ -1,320 +1,371 @@
package com.farsunset.cim.client.android; /**
import java.net.InetSocketAddress; * probject:cim-android-sdk
import java.util.concurrent.ExecutorService; * @version 2.0.0
import java.util.concurrent.Executors; *
import java.util.concurrent.TimeUnit; * @author 3979434@qq.com
import java.util.concurrent.Future; */
import org.apache.mina.core.future.ConnectFuture; package com.farsunset.cim.client.android;
import org.apache.mina.core.future.WriteFuture; import java.net.InetSocketAddress;
import org.apache.mina.core.service.IoHandlerAdapter; import java.util.concurrent.ExecutorService;
import org.apache.mina.core.session.IdleStatus; import java.util.concurrent.Executors;
import org.apache.mina.core.session.IoSession; import java.util.concurrent.Future;
import org.apache.mina.filter.codec.ProtocolCodecFilter; import java.util.concurrent.TimeUnit;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.nio.NioSocketConnector; import org.apache.mina.core.future.ConnectFuture;
import android.content.Context; import org.apache.mina.core.future.WriteFuture;
import android.content.Intent; import org.apache.mina.core.service.IoHandlerAdapter;
import android.net.ConnectivityManager; import org.apache.mina.core.session.IdleStatus;
import android.net.NetworkInfo; import org.apache.mina.core.session.IoSession;
import com.farsunset.cim.nio.constant.CIMConstant; import org.apache.mina.filter.codec.ProtocolCodecFilter;
import com.farsunset.cim.nio.filter.ClientMessageCodecFactory; import org.apache.mina.filter.keepalive.KeepAliveFilter;
import com.farsunset.cim.nio.mutual.Message; import org.apache.mina.filter.keepalive.KeepAliveMessageFactory;
import com.farsunset.cim.nio.mutual.ReplyBody; import org.apache.mina.transport.socket.nio.NioSocketConnector;
import com.farsunset.cim.nio.mutual.SentBody;
import android.content.Context;
/** import android.content.Intent;
* 连接服务端管理，cim核心处理类，管理连接，以及消息处理 import android.net.ConnectivityManager;
* import android.net.NetworkInfo;
* @author 3979434@qq.com import android.util.Log;
*/
class CIMConnectorManager { import com.farsunset.cim.client.constant.CIMConstant;
import com.farsunset.cim.client.exception.CIMSessionDisableException;
private NioSocketConnector connector; import com.farsunset.cim.client.exception.NetWorkDisableException;
private ConnectFuture connectFuture; import com.farsunset.cim.client.exception.WriteToClosedSessionException;
private IoSession session; import com.farsunset.cim.client.filter.ClientMessageCodecFactory;
import com.farsunset.cim.client.model.Message;
Context context; import com.farsunset.cim.client.model.ReplyBody;
import com.farsunset.cim.client.model.SentBody;
static CIMConnectorManager manager; /**
* 连接服务端管理，cim核心处理类，管理连接，以及消息处理
// 消息广播action *
public static final String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED"; * @author 3979434@qq.com
*/
// 发送sendbody失败广播 class CIMConnectorManager {
public static final String ACTION_SENT_FAILED = "com.farsunset.cim.SENT_FAILED";
final static String TAG = CIMConnectorManager.class.getSimpleName();
// 发送sendbody成功广播 private NioSocketConnector connector;
public static final String ACTION_SENT_SUCCESS = "com.farsunset.cim.SENT_SUCCESS"; private ConnectFuture connectFuture;
// 链接意外关闭广播
public static final String ACTION_CONNECTION_CLOSED = "com.farsunset.cim.CONNECTION_CLOSED"; Context context;
// 链接失败广播
public static final String ACTION_CONNECTION_FAILED = "com.farsunset.cim.CONNECTION_FAILED";
// 链接成功广播 static CIMConnectorManager manager;
public static final String ACTION_CONNECTION_SUCCESS = "com.farsunset.cim.CONNECTION_SUCCESS";
// 发送sendbody成功后获得replaybody回应广播 // 消息广播action
public static final String ACTION_REPLY_RECEIVED = "com.farsunset.cim.REPLY_RECEIVED"; public static final String ACTION_MESSAGE_RECEIVED = "com.farsunset.cim.MESSAGE_RECEIVED";
// 网络变化广播
public static final String ACTION_NETWORK_CHANGED = "android.net.conn.CONNECTIVITY_CHANGE"; // 发送sendbody失败广播
public static final String ACTION_SENT_FAILED = "com.farsunset.cim.SENT_FAILED";
// 未知异常
public static final String ACTION_UNCAUGHT_EXCEPTION = "com.farsunset.cim.UNCAUGHT_EXCEPTION"; // 发送sendbody成功广播
public static final String ACTION_SENT_SUCCESS = "com.farsunset.cim.SENT_SUCCESS";
// CIM连接状态 // 链接意外关闭广播
public static final String ACTION_CONNECTION_STATUS = "com.farsunset.cim.CONNECTION_STATUS"; public static final String ACTION_CONNECTION_CLOSED = "com.farsunset.cim.CONNECTION_CLOSED";
// 链接失败广播
public static final String ACTION_CONNECTION_FAILED = "com.farsunset.cim.CONNECTION_FAILED";
private ExecutorService executor; // 链接成功广播
public static final String ACTION_CONNECTION_SUCCESS = "com.farsunset.cim.CONNECTION_SUCCESS";
// 发送sendbody成功后获得replaybody回应广播
private CIMConnectorManager(Context ctx) { public static final String ACTION_REPLY_RECEIVED = "com.farsunset.cim.REPLY_RECEIVED";
context = ctx; // 网络变化广播
executor = Executors.newFixedThreadPool(3); public static final String ACTION_NETWORK_CHANGED = "android.net.conn.CONNECTIVITY_CHANGE";
connector = new NioSocketConnector(); // 未知异常
connector.setConnectTimeoutMillis(10 * 1000); public static final String ACTION_UNCAUGHT_EXCEPTION = "com.farsunset.cim.UNCAUGHT_EXCEPTION";
connector.getSessionConfig().setBothIdleTime(180);
connector.getSessionConfig().setKeepAlive(true); // CIM连接状态
connector.getFilterChain().addLast("logger", new LoggingFilter()); public static final String ACTION_CONNECTION_STATUS = "com.farsunset.cim.CONNECTION_STATUS";
connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new ClientMessageCodecFactory()));
connector.setHandler(iohandler);
} private ExecutorService executor;
public synchronized static CIMConnectorManager getManager(Context context) { private CIMConnectorManager(Context ctx) {
if (manager == null) { context = ctx;
manager = new CIMConnectorManager(context); executor = Executors.newFixedThreadPool(3);
}
return manager; connector = new NioSocketConnector();
connector.setConnectTimeoutMillis(10 * 1000);
} connector.getSessionConfig().setTcpNoDelay(true);
connector.getSessionConfig().setReadBufferSize(2048);
private synchronized void syncConnection(final String cimServerHost,final int cimServerPort) { connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new ClientMessageCodecFactory()));
try {
KeepAliveFilter keepAliveaHandler = new KeepAliveFilter(new ClientKeepAliveFactoryImpl(), IdleStatus.BOTH_IDLE);
if(isConnected()){ keepAliveaHandler.setForwardEvent(true);
return ; connector.getFilterChain().addLast("heartbeat", keepAliveaHandler);
} connector.setHandler(iohandler);
InetSocketAddress remoteSocketAddress = new InetSocketAddress(cimServerHost, cimServerPort);
connectFuture = connector.connect(remoteSocketAddress);
connectFuture.awaitUninterruptibly(); }
session = connectFuture.getSession();
public synchronized static CIMConnectorManager getManager(Context context) {
} catch (Exception e) { if (manager == null) {
manager = new CIMConnectorManager(context);
Intent intent = new Intent(); }
intent.setAction(ACTION_CONNECTION_FAILED); return manager;
intent.putExtra("exception", e);
context.sendBroadcast(intent); }
System.out.println("******************CIM连接服务器失败 "+cimServerHost+":"+cimServerPort); private synchronized void syncConnection(final String cimServerHost,final int cimServerPort) {
try {
}
if(isConnected()){
} return ;
}
public void connect(final String cimServerHost, final int cimServerPort) { InetSocketAddress remoteSocketAddress = new InetSocketAddress(cimServerHost, cimServerPort);
connectFuture = connector.connect(remoteSocketAddress);
connectFuture.awaitUninterruptibly();
if (!netWorkAvailable(context)) { connectFuture.getSession();
} catch (Exception e) {
Intent intent = new Intent();
intent.setAction(ACTION_CONNECTION_FAILED); Intent intent = new Intent();
intent.putExtra("exception", new NetWorkDisableException()); intent.setAction(ACTION_CONNECTION_FAILED);
context.sendBroadcast(intent); intent.putExtra("exception", e);
context.sendBroadcast(intent);
return;
} Log.i(TAG, "******************CIM连接服务器失败 "+cimServerHost+":"+cimServerPort);
Future<?> future = executor.submit(new Runnable() { }
@Override
public void run() { }
syncConnection(cimServerHost, cimServerPort);
} public void connect(final String cimServerHost, final int cimServerPort) {
});
try {
if(future.get()!=null) if (!netWorkAvailable(context)) {
{
connect(cimServerHost,cimServerPort); Intent intent = new Intent();
} intent.setAction(ACTION_CONNECTION_FAILED);
} catch (Exception e) { intent.putExtra("exception", new NetWorkDisableException());
context.sendBroadcast(intent);
connect(cimServerHost,cimServerPort);
e.printStackTrace(); return;
} }
}
Future<?> future = executor.submit(new Runnable() {
public void send(final SentBody body) { @Override
public void run() {
syncConnection(cimServerHost, cimServerPort);
executor.execute(new Runnable() { }
@Override });
public void run() { try {
if(future.get()!=null)
android.os.Message msg = new android.os.Message(); {
msg.getData().putSerializable("body", body); connect(cimServerHost,cimServerPort);
}
if(session!=null && session.isConnected()) } catch (Exception e) {
{
WriteFuture wf = session.write(body); connect(cimServerHost,cimServerPort);
// 消息发送超时 10秒 e.printStackTrace();
wf.awaitUninterruptibly(5, TimeUnit.SECONDS); }
if (!wf.isWritten()) {
}
Intent intent = new Intent(); public void send(final SentBody body) {
intent.setAction(ACTION_SENT_FAILED);
intent.putExtra("exception", new WriteToClosedSessionException());
intent.putExtra("sentBody", body); executor.execute(new Runnable() {
context.sendBroadcast(intent); @Override
} public void run() {
}else
{ android.os.Message msg = new android.os.Message();
msg.getData().putSerializable("body", body);
Intent intent = new Intent();
intent.setAction(ACTION_SENT_FAILED); IoSession session = getCurrentSession();
intent.putExtra("exception", new CIMSessionDisableException()); if(session!=null && session.isConnected())
intent.putExtra("sentBody", body); {
context.sendBroadcast(intent); WriteFuture wf = session.write(body);
} // 消息发送超时 10秒
} wf.awaitUninterruptibly(5, TimeUnit.SECONDS);
});
} if (!wf.isWritten()) {
public void destroy() {
if (manager.session != null) { Intent intent = new Intent();
manager.session.close(false); intent.setAction(ACTION_SENT_FAILED);
manager.session.removeAttribute("account"); intent.putExtra("exception", new WriteToClosedSessionException());
} intent.putExtra("sentBody", body);
context.sendBroadcast(intent);
if (manager.connector != null && !manager.connector.isDisposed()) { }
manager.connector.dispose(); }else
} {
manager = null;
} Intent intent = new Intent();
intent.setAction(ACTION_SENT_FAILED);
public boolean isConnected() { intent.putExtra("exception", new CIMSessionDisableException());
if (session == null || connector == null) { intent.putExtra("sentBody", body);
return false; context.sendBroadcast(intent);
} }
return session.isConnected() ; }
} });
}
public void deliverIsConnected() {
Intent intent = new Intent(); public void destroy() {
intent.setAction(ACTION_CONNECTION_STATUS); IoSession session = getCurrentSession();
intent.putExtra(CIMPushManager.KEY_CIM_CONNECTION_STATUS, isConnected()); if (session != null) {
context.sendBroadcast(intent); session.close(false);
} session.removeAttribute("account");
}
if (connector != null && !connector.isDisposed()) {
public void closeSession() connector.dispose();
{ }
if(session!=null) manager = null;
{ }
session.close(false);
} public boolean isConnected() {
} IoSession session = getCurrentSession();
if (session == null ) {
return false;
IoHandlerAdapter iohandler = new IoHandlerAdapter() { }
return session.isConnected() ;
@Override }
public void sessionCreated(IoSession session) throws Exception {
public void deliverIsConnected() {
System.out.println("******************CIM连接服务器成功:"+session.getLocalAddress()); Intent intent = new Intent();
intent.setAction(ACTION_CONNECTION_STATUS);
Intent intent = new Intent(); intent.putExtra(CIMPushManager.KEY_CIM_CONNECTION_STATUS, isConnected());
intent.setAction(ACTION_CONNECTION_SUCCESS); context.sendBroadcast(intent);
context.sendBroadcast(intent); }
}
@Override public void closeSession()
public void sessionOpened(IoSession session) throws Exception { {
session.getConfig().setBothIdleTime(180); IoSession session = getCurrentSession();
} if(session!=null)
{
@Override session.close(false);
public void sessionClosed(IoSession session) throws Exception { }
}
System.out.println("******************CIM与服务器断开连接:"+session.getLocalAddress());
if(CIMConnectorManager.this.session.getId()==session.getId()) public IoSession getCurrentSession()
{ {
if(connector.getManagedSessionCount()>0)
Intent intent = new Intent(); {
intent.setAction(ACTION_CONNECTION_CLOSED); for(Long key:connector.getManagedSessions().keySet())
context.sendBroadcast(intent); {
return connector.getManagedSessions().get(key);
} }
} }
@Override return null;
public void sessionIdle(IoSession session, IdleStatus status) }
throws Exception {
IoHandlerAdapter iohandler = new IoHandlerAdapter() {
System.out.println("******************CIM与服务器连接空闲:"+session.getLocalAddress());
SentBody sent = new SentBody(); @Override
sent.setKey(CIMConstant.RequestKey.CLIENT_HEARTBEAT); public void sessionCreated(IoSession session) throws Exception {
send(sent);
}
Log.i(TAG, "******************CIM连接服务器成功:"+session.getLocalAddress());
@Override
public void exceptionCaught(IoSession session, Throwable cause) Intent intent = new Intent();
throws Exception { intent.setAction(ACTION_CONNECTION_SUCCESS);
context.sendBroadcast(intent);
Intent intent = new Intent();
intent.setAction(ACTION_UNCAUGHT_EXCEPTION); }
intent.putExtra("exception", cause);
context.sendBroadcast(intent); @Override
} public void sessionOpened(IoSession session) throws Exception {
session.getConfig().setBothIdleTime(180);
@Override }
public void messageReceived(IoSession session, Object obj)
throws Exception { @Override
public void sessionClosed(IoSession session) throws Exception {
if (obj instanceof Message) {
Log.i(TAG, "******************CIM与服务器断开连接:"+session.getLocalAddress());
Intent intent = new Intent();
intent.setAction(ACTION_MESSAGE_RECEIVED); Intent intent = new Intent();
intent.putExtra("message", (Message) obj); intent.setAction(ACTION_CONNECTION_CLOSED);
context.sendBroadcast(intent); context.sendBroadcast(intent);
} }
if (obj instanceof ReplyBody) {
@Override
public void sessionIdle(IoSession session, IdleStatus status)
Intent intent = new Intent(); throws Exception {
intent.setAction(ACTION_REPLY_RECEIVED);
intent.putExtra("replyBody", (ReplyBody) obj); Log.i(TAG, "******************CIM与服务器连接空闲:"+session.getLocalAddress());
context.sendBroadcast(intent); }
}
} @Override
public void exceptionCaught(IoSession session, Throwable cause)
@Override throws Exception {
public void messageSent(IoSession session, Object message)
throws Exception { Intent intent = new Intent();
intent.setAction(ACTION_UNCAUGHT_EXCEPTION);
Intent intent = new Intent(); intent.putExtra("exception", cause);
intent.setAction(ACTION_SENT_SUCCESS); context.sendBroadcast(intent);
intent.putExtra("sentBody", (SentBody) message); }
context.sendBroadcast(intent);
@Override
public void messageReceived(IoSession session, Object obj)
} throws Exception {
};
if (obj instanceof Message) {
public static boolean netWorkAvailable(Context context) {
try { Intent intent = new Intent();
ConnectivityManager nw = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); intent.setAction(ACTION_MESSAGE_RECEIVED);
NetworkInfo networkInfo = nw.getActiveNetworkInfo(); intent.putExtra("message", (Message) obj);
return networkInfo != null; context.sendBroadcast(intent);
} catch (Exception e) {}
}
return false; if (obj instanceof ReplyBody) {
}
Intent intent = new Intent();
intent.setAction(ACTION_REPLY_RECEIVED);
intent.putExtra("replyBody", (ReplyBody) obj);
context.sendBroadcast(intent);
}
}
@Override
public void messageSent(IoSession session, Object message) throws Exception {
if(message instanceof SentBody)
{
Intent intent = new Intent();
intent.setAction(ACTION_SENT_SUCCESS);
intent.putExtra("sentBody", (SentBody) message);
context.sendBroadcast(intent);
}
}
};
public static boolean netWorkAvailable(Context context) {
try {
ConnectivityManager nw = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
NetworkInfo networkInfo = nw.getActiveNetworkInfo();
return networkInfo != null;
} catch (Exception e) {}
return false;
}
public class ClientKeepAliveFactoryImpl implements KeepAliveMessageFactory {
@Override
public Object getRequest(IoSession arg0) {
return null;
}
@Override
public Object getResponse(IoSession arg0, Object arg1) {
return CIMConstant.CMD_HEARTBEAT_RESPONSE;
}
@Override
public boolean isRequest(IoSession arg0, Object arg1) {
return CIMConstant.CMD_HEARTBEAT_REQUEST.equals(arg1);
}
@Override
public boolean isResponse(IoSession arg0, Object arg1) {
return false;
}
}
} }

427
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMEnventListenerReceiver.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/android/CIMEventBroadcastReceiver.java
View File

@ -1,188 +1,239 @@
package com.farsunset.cim.client.android; /**
* probject:cim-android-sdk
import java.util.List; * @version 2.0.0
*
import android.app.ActivityManager; * @author 3979434@qq.com
import android.app.ActivityManager.RunningTaskInfo; */
import android.content.BroadcastReceiver; package com.farsunset.cim.client.android;
import android.content.Context;
import android.content.Intent; import java.util.List;
import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.app.ActivityManager;
import android.os.Handler; import android.app.ActivityManager.RunningTaskInfo;
import com.farsunset.cim.nio.constant.CIMConstant; import android.content.BroadcastReceiver;
import com.farsunset.cim.nio.mutual.Message; import android.content.Context;
import com.farsunset.cim.nio.mutual.ReplyBody; import android.content.Intent;
import com.farsunset.cim.nio.mutual.SentBody; import android.net.ConnectivityManager;
/** import android.net.NetworkInfo;
* 消息入口，所有消息都会经过这里 import android.os.Handler;
* @author 3979434
* import com.farsunset.cim.client.constant.CIMConstant;
*/ import com.farsunset.cim.client.exception.CIMSessionDisableException;
public abstract class CIMEnventListenerReceiver extends BroadcastReceiver implements OnCIMMessageListener { import com.farsunset.cim.client.model.Message;
import com.farsunset.cim.client.model.ReplyBody;
import com.farsunset.cim.client.model.SentBody;
public Context context; /**
@Override * 消息入口，所有消息都会经过这里
public void onReceive(Context ctx, Intent it) { */
public abstract class CIMEventBroadcastReceiver extends BroadcastReceiver implements CIMEventListener {
context = ctx;
if(it.getAction().equals(CIMConnectorManager.ACTION_NETWORK_CHANGED)) public Context context;
{ @Override
ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService("connectivity"); public void onReceive(Context ctx, Intent it) {
android.net.NetworkInfo info = connectivityManager.getActiveNetworkInfo();
context = ctx;
onDevicesNetworkChanged(info);
} /*
* 操作事件广播，用于提高service存活率
if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_CLOSED)) */
{ if(it.getAction().equals(Intent.ACTION_USER_PRESENT)
dispatchConnectionClosed(); ||it.getAction().equals(Intent.ACTION_POWER_CONNECTED)
} ||it.getAction().equals(Intent.ACTION_POWER_DISCONNECTED)
)
if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_FAILED)) {
{ startPushService();
onConnectionFailed((Exception) it.getSerializableExtra("exception")); }
}
if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_SUCCESS)) /*
{ * 设备网络状态变化事件
dispatchConnectionSucceed(); */
} if(it.getAction().equals(CIMConnectorManager.ACTION_NETWORK_CHANGED))
{
if(it.getAction().equals(CIMConnectorManager.ACTION_MESSAGE_RECEIVED)) ConnectivityManager connectivityManager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
{ android.net.NetworkInfo info = connectivityManager.getActiveNetworkInfo();
filterType999Message((Message)it.getSerializableExtra("message")); onDevicesNetworkChanged(info);
} }
if(it.getAction().equals(CIMConnectorManager.ACTION_REPLY_RECEIVED)) /*
{ * cim断开服务器事件
onReplyReceived((ReplyBody)it.getSerializableExtra("replyBody")); */
} if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_CLOSED))
{
if(it.getAction().equals(CIMConnectorManager.ACTION_SENT_FAILED)) if(CIMConnectorManager.netWorkAvailable(context))
{ {
onSentFailed((Exception) it.getSerializableExtra("exception"),(SentBody)it.getSerializableExtra("sentBody")); CIMPushManager.init(context);
} }
onCIMConnectionClosed();
if(it.getAction().equals(CIMConnectorManager.ACTION_SENT_SUCCESS)) }
{
onSentSucceed((SentBody)it.getSerializableExtra("sentBody")); /*
} * cim连接服务器失败事件
*/
if(it.getAction().equals(CIMConnectorManager.ACTION_UNCAUGHT_EXCEPTION)) if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_FAILED))
{ {
onUncaughtException((Exception)it.getSerializableExtra("exception")); onConnectionFailed((Exception) it.getSerializableExtra("exception"));
} }
if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_STATUS)) /*
{ * cim连接服务器成功事件
onConnectionStatus(it.getBooleanExtra(CIMPushManager.KEY_CIM_CONNECTION_STATUS, false)); */
} if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_SUCCESS))
{
}
CIMPushManager.bindAccount(context);
private void dispatchConnectionClosed() { onCIMConnectionSucceed();
}
if(CIMConnectorManager.netWorkAvailable(context))
{ /*
CIMPushManager.init(context); * 收到推送消息事件
} */
if(it.getAction().equals(CIMConnectorManager.ACTION_MESSAGE_RECEIVED))
onConnectionClosed(); {
} filterType999Message((Message)it.getSerializableExtra("message"));
}
protected boolean isInBackground(Context context) {
List<RunningTaskInfo> tasksInfo = ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE)).getRunningTasks(1); /*
if (tasksInfo.size() > 0) { * 获取收到replybody成功事件
*/
if (context.getPackageName().equals( if(it.getAction().equals(CIMConnectorManager.ACTION_REPLY_RECEIVED))
tasksInfo.get(0).topActivity.getPackageName())) { {
onReplyReceived((ReplyBody)it.getSerializableExtra("replyBody"));
return false; }
}
}
return true; /*
} * 获取sendbody发送失败事件
*/
private void onConnectionFailed(Exception e){ if(it.getAction().equals(CIMConnectorManager.ACTION_SENT_FAILED))
{
if(CIMConnectorManager.netWorkAvailable(context)) onSentFailed((Exception) it.getSerializableExtra("exception"),(SentBody)it.getSerializableExtra("sentBody"));
{ }
//间隔30秒后重连
connectionHandler.sendMessageDelayed(connectionHandler.obtainMessage(), 30*1000); /*
} * 获取sendbody发送成功事件
} */
if(it.getAction().equals(CIMConnectorManager.ACTION_SENT_SUCCESS))
{
Handler connectionHandler = new Handler() onSentSucceed((SentBody)it.getSerializableExtra("sentBody"));
{ }
@Override
public void handleMessage(android.os.Message message){
/*
CIMPushManager.init(context); * 获取cim数据传输异常事件
} */
if(it.getAction().equals(CIMConnectorManager.ACTION_UNCAUGHT_EXCEPTION))
}; {
onUncaughtException((Exception)it.getSerializableExtra("exception"));
private void dispatchConnectionSucceed() { }
CIMPushManager.setAccount(context); /*
onConnectionSucceed(); * 获取cim连接状态事件
*/
} if(it.getAction().equals(CIMConnectorManager.ACTION_CONNECTION_STATUS))
{
onConnectionStatus(it.getBooleanExtra(CIMPushManager.KEY_CIM_CONNECTION_STATUS, false));
}
private void onUncaughtException(Throwable arg0) {} }
protected boolean isInBackground(Context context) {
List<RunningTaskInfo> tasksInfo = ((ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE)).getRunningTasks(1);
private void onDevicesNetworkChanged(NetworkInfo info) { if (tasksInfo.size() > 0) {
if(info !=null) if (context.getPackageName().equals(
{ tasksInfo.get(0).topActivity.getPackageName())) {
CIMPushManager.init(context);
} return false;
}
onNetworkChanged(info); }
} return true;
}
private void filterType999Message(com.farsunset.cim.nio.mutual.Message message)
{
if(CIMConstant.MessageType.TYPE_999.equals(message.getType())) private void startPushService()
{ {
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP,true); Intent intent = new Intent(context, CIMPushService.class);
} intent.putExtra(CIMPushManager.SERVICE_ACTION, CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE);
context.startService(intent);
onMessageReceived(message); }
}
private void onSentFailed(Exception e, SentBody body){
//与服务端端开链接，重新连接 private void onConnectionFailed(Exception e){
if(e instanceof CIMSessionDisableException)
{ if(CIMConnectorManager.netWorkAvailable(context))
CIMPushManager.init(context); {
}else //间隔30秒后重连
{ connectionHandler.sendMessageDelayed(connectionHandler.obtainMessage(), 30*1000);
//发送失败 重新发送 }
CIMPushManager.sendRequest(context, body); }
}
} Handler connectionHandler = new Handler()
{
private void onSentSucceed(SentBody body){} @Override
public void handleMessage(android.os.Message message){
@Override
public abstract void onMessageReceived(com.farsunset.cim.nio.mutual.Message message); CIMPushManager.init(context);
@Override }
public abstract void onReplyReceived(ReplyBody body);
};
public abstract void onNetworkChanged(NetworkInfo info);
}
private void onUncaughtException(Throwable arg0) {}
private void onDevicesNetworkChanged(NetworkInfo info) {
if(info !=null)
{
CIMPushManager.init(context);
}
onNetworkChanged(info);
}
private void filterType999Message(com.farsunset.cim.client.model.Message message)
{
if(CIMConstant.MessageType.TYPE_999.equals(message.getType()))
{
CIMCacheTools.putBoolean(context,CIMCacheTools.KEY_MANUAL_STOP,true);
}
onMessageReceived(message);
}
private void onSentFailed(Exception e, SentBody body){
//与服务端端开链接，重新连接
if(e instanceof CIMSessionDisableException)
{
CIMPushManager.init(context);
}else
{
//发送失败 重新发送
CIMPushManager.sendRequest(context, body);
}
}
private void onSentSucceed(SentBody body){}
@Override
public abstract void onMessageReceived(com.farsunset.cim.client.model.Message message);
@Override
public abstract void onReplyReceived(ReplyBody body);
public abstract void onNetworkChanged(NetworkInfo info);
public abstract void onCIMConnectionSucceed();
public abstract void onCIMConnectionClosed();
}

33
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/OnCIMMessageListener.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/android/CIMEventListener.java
View File

@ -1,23 +1,20 @@
/**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.android; package com.farsunset.cim.client.android;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import com.farsunset.cim.nio.mutual.Message; import com.farsunset.cim.client.model.Message;
import com.farsunset.cim.nio.mutual.ReplyBody; import com.farsunset.cim.client.model.ReplyBody;
/** /**
*CIM 主要事件接口 *CIM 主要事件接口
* 类名称：OnCIMMessageListener
* 类描述：
* 创建人： 3979434
* 修改人： 3979434
* 修改时间： 2014-4-28 下午5:07:47
* 修改备注：
* @version 1.0.0
*
*/ */
public interface OnCIMMessageListener public interface CIMEventListener
{ {
@ -25,36 +22,36 @@ public interface OnCIMMessageListener
* 当收到服务端推送过来的消息时调用 * 当收到服务端推送过来的消息时调用
* @param message * @param message
*/ */
public abstract void onMessageReceived(Message message); public void onMessageReceived(Message message);
/** /**
* 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用 * 当调用CIMPushManager.sendRequest()向服务端发送请求，获得相应时调用
* @param replybody * @param replybody
*/ */
public abstract void onReplyReceived(ReplyBody replybody); public void onReplyReceived(ReplyBody replybody);
/** /**
* 当手机网络发生变化时调用 * 当手机网络发生变化时调用
* @param networkinfo * @param networkinfo
*/ */
public abstract void onNetworkChanged(NetworkInfo networkinfo); public void onNetworkChanged(NetworkInfo networkinfo);
/** /**
* 获取到是否连接到服务端 * 获取到是否连接到服务端
* 通过调用CIMPushManager.detectIsConnected()来异步获取 * 通过调用CIMPushManager.detectIsConnected()来异步获取
* *
*/ */
public abstract void onConnectionStatus(boolean isConnected); public void onConnectionStatus(boolean isConnected);
/** /**
* 连接服务端成功 * 连接服务端成功
*/ */
public abstract void onConnectionSucceed(); public void onCIMConnectionSucceed();
/** /**
* 连接断开 * 连接断开
*/ */
public abstract void onConnectionClosed(); public void onCIMConnectionClosed();
} }

101
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/android/CIMListenerManager.java Normal file
View File

@ -0,0 +1,101 @@
/**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.android;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import com.farsunset.cim.client.constant.CIMConstant;
import android.app.Activity;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
/**
* CIM 消息监听器管理
*/
public class CIMListenerManager {
private static ArrayList<CIMEventListener> cimListeners = new ArrayList<CIMEventListener>();
public static void registerMessageListener(CIMEventListener listener,Context mcontext) {
if (!cimListeners.contains(listener)) {
cimListeners.add(listener);
// 按照接收顺序倒序
Collections.sort(cimListeners, new CIMMessageReceiveComparator(mcontext));
}
}
public static void removeMessageListener(CIMEventListener listener) {
for (int i = 0; i < cimListeners.size(); i++) {
if (listener.getClass() == cimListeners.get(i).getClass()) {
cimListeners.remove(i);
}
}
}
public static ArrayList<CIMEventListener> getCIMListeners() {
return cimListeners;
}
/**
* 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序
*/
static class CIMMessageReceiveComparator implements Comparator<CIMEventListener>{
Context mcontext;
public CIMMessageReceiveComparator(Context ctx)
{
mcontext = ctx;
}
@Override
public int compare(CIMEventListener arg1, CIMEventListener arg2) {
Integer order1 = CIMConstant.CIM_DEFAULT_MESSAGE_ORDER;
Integer order2 = CIMConstant.CIM_DEFAULT_MESSAGE_ORDER;
ActivityInfo info;
if (arg1 instanceof Activity ) {
try {
info = mcontext.getPackageManager() .getActivityInfo(((Activity)(arg1)).getComponentName(), PackageManager.GET_META_DATA);
if(info.metaData!=null)
{
order1 = info.metaData.getInt("CIM_RECEIVE_ORDER");
}
} catch (Exception e) {}
}
if (arg1 instanceof Activity ) {
try {
info = mcontext.getPackageManager() .getActivityInfo(((Activity)(arg2)).getComponentName(), PackageManager.GET_META_DATA);
if(info.metaData!=null)
{
order2 = info.metaData.getInt("CIM_RECEIVE_ORDER");
}
} catch (Exception e) {}
}
return order2.compareTo(order1);
}
}
}

404
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMPushManager.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/android/CIMPushManager.java
View File

@ -1,191 +1,215 @@
package com.farsunset.cim.client.android; /**
import android.content.Context; * probject:cim-android-sdk
import android.content.Intent; * @version 2.0.0
import android.telephony.TelephonyManager; *
import java.util.UUID; * @author 3979434@qq.com
import com.farsunset.cim.nio.constant.CIMConstant; */
import com.farsunset.cim.nio.mutual.SentBody; package com.farsunset.cim.client.android;
import java.util.UUID;
/**
* CIM 功能接口 import android.content.Context;
* import android.content.Intent;
* @author 3979434@qq.com import android.content.pm.PackageInfo;
*/ import android.content.pm.PackageManager.NameNotFoundException;
public class CIMPushManager { import android.telephony.TelephonyManager;
static String ACTION_CONNECTION_KEEPALIVE ="ACTION_CONNECTION_KEEPALIVE"; import com.farsunset.cim.client.constant.CIMConstant;
import com.farsunset.cim.client.model.SentBody;
static String ACTION_CONNECTION ="ACTION_CONNECTION";
/**
static String ACTION_CONNECTION_STATUS ="ACTION_CONNECTION_STATUS"; * CIM 功能接口
*/
static String ACTION_SENDREQUEST ="ACTION_SENDREQUEST"; public class CIMPushManager {
static String ACTION_DISCONNECTION ="ACTION_DISSENDREQUEST"; static String ACTION_ACTIVATE_PUSH_SERVICE ="ACTION_ACTIVATE_PUSH_SERVICE";
static String ACTION_DESTORY ="ACTION_DESTORY"; static String ACTION_CONNECTION ="ACTION_CONNECTION";
static String SERVICE_ACTION ="SERVICE_ACTION"; static String ACTION_CONNECTION_STATUS ="ACTION_CONNECTION_STATUS";
static String KEY_SEND_BODY ="KEY_SEND_BODY"; static String ACTION_SENDREQUEST ="ACTION_SENDREQUEST";
static String KEY_CIM_CONNECTION_STATUS ="KEY_CIM_CONNECTION_STATUS"; static String ACTION_DISCONNECTION ="ACTION_DISSENDREQUEST";
/** static String ACTION_DESTORY ="ACTION_DESTORY";
* 初始化,连接服务端，在程序启动页或者 在Application里调用
* @param context static String SERVICE_ACTION ="SERVICE_ACTION";
* @param ip
* @param port static String KEY_SEND_BODY ="KEY_SEND_BODY";
*/
public static void init(Context context,String ip,int port){ static String KEY_CIM_CONNECTION_STATUS ="KEY_CIM_CONNECTION_STATUS";
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED, false); /**
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP, false); * 初始化,连接服务端，在程序启动页或者 在Application里调用
* @param context
Intent serviceIntent = new Intent(context, CIMPushService.class); * @param ip
serviceIntent.putExtra(CIMDataConfig.KEY_CIM_SERVIER_HOST, ip); * @param port
serviceIntent.putExtra(CIMDataConfig.KEY_CIM_SERVIER_PORT, port); */
serviceIntent.putExtra(SERVICE_ACTION, ACTION_CONNECTION); public static void init(Context context,String ip,int port){
context.startService(serviceIntent);
CIMDataConfig.putString(context, CIMDataConfig.KEY_CIM_SERVIER_HOST, ip); CIMCacheTools.putBoolean(context,CIMCacheTools.KEY_CIM_DESTORYED, false);
CIMDataConfig.putInt(context, CIMDataConfig.KEY_CIM_SERVIER_PORT, port); CIMCacheTools.putBoolean(context,CIMCacheTools.KEY_MANUAL_STOP, false);
}
CIMCacheTools.putString(context, CIMCacheTools.KEY_CIM_SERVIER_HOST, ip);
protected static void init(Context context){ CIMCacheTools.putInt(context, CIMCacheTools.KEY_CIM_SERVIER_PORT, port);
boolean isManualStop = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_MANUAL_STOP); Intent serviceIntent = new Intent(context, CIMPushService.class);
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED); serviceIntent.putExtra(CIMCacheTools.KEY_CIM_SERVIER_HOST, ip);
serviceIntent.putExtra(CIMCacheTools.KEY_CIM_SERVIER_PORT, port);
if(isManualStop || isManualDestory) serviceIntent.putExtra(SERVICE_ACTION, ACTION_CONNECTION);
{ context.startService(serviceIntent);
return ;
} }
String host = CIMDataConfig.getString(context, CIMDataConfig.KEY_CIM_SERVIER_HOST); protected static void init(Context context){
int port =CIMDataConfig.getInt(context, CIMDataConfig.KEY_CIM_SERVIER_PORT);
boolean isManualStop = CIMCacheTools.getBoolean(context,CIMCacheTools.KEY_MANUAL_STOP);
init(context,host,port); boolean isManualDestory = CIMCacheTools.getBoolean(context,CIMCacheTools.KEY_CIM_DESTORYED);
} if(isManualStop || isManualDestory)
{
return ;
/** }
* 设置一个账号登录到服务端
* @param account 用户唯一ID String host = CIMCacheTools.getString(context, CIMCacheTools.KEY_CIM_SERVIER_HOST);
*/ int port =CIMCacheTools.getInt(context, CIMCacheTools.KEY_CIM_SERVIER_PORT);
public static void setAccount(Context context,String account){
init(context,host,port);
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED); }
if(isManualDestory || account==null || account.trim().length()==0)
{
return ; /**
} * 设置一个账号登录到服务端
* @param account 用户唯一ID
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP, false); */
CIMDataConfig.putString(context,CIMDataConfig.KEY_ACCOUNT, account); public static void bindAccount(Context context,String account){
String imei = ((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
imei += context.getPackageName(); boolean isManualDestory = CIMCacheTools.getBoolean(context,CIMCacheTools.KEY_CIM_DESTORYED);
SentBody sent = new SentBody(); if(isManualDestory || account==null || account.trim().length()==0)
sent.setKey(CIMConstant.RequestKey.CLIENT_BIND); {
sent.put("account", account); return ;
sent.put("deviceId",UUID.nameUUIDFromBytes(imei.getBytes()).toString().replaceAll("-", "")); }
sent.put("channel", "android");
sent.put("device",android.os.Build.MODEL); CIMCacheTools.putBoolean(context,CIMCacheTools.KEY_MANUAL_STOP, false);
CIMCacheTools.putString(context,CIMCacheTools.KEY_ACCOUNT, account);
sendRequest(context,sent);
String imei = ((TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId();
imei += context.getPackageName();
} SentBody sent = new SentBody();
sent.setKey(CIMConstant.RequestKey.CLIENT_BIND);
protected static void setAccount(Context context){ sent.put("account", account);
sent.put("deviceId",UUID.nameUUIDFromBytes(imei.getBytes()).toString().replaceAll("-", ""));
sent.put("channel", "android");
sent.put("device",android.os.Build.MODEL);
String account = CIMDataConfig.getString(context,CIMDataConfig.KEY_ACCOUNT); sent.put("appVersion",getVersionName(context));
setAccount(context,account); sent.put("osVersion",android.os.Build.VERSION.RELEASE);
} sendRequest(context,sent);
}
/**
* 发送一个CIM请求
* @param context protected static void bindAccount(Context context){
* @body
*/
public static void sendRequest(Context context,SentBody body){
String account = CIMCacheTools.getString(context,CIMCacheTools.KEY_ACCOUNT);
boolean isManualStop = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_MANUAL_STOP); bindAccount(context,account);
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED); }
if(isManualStop || isManualDestory)
{
return ; /**
} * 发送一个CIM请求
* @param context
Intent serviceIntent = new Intent(context, CIMPushService.class); * @body
serviceIntent.putExtra(KEY_SEND_BODY, body); */
serviceIntent.putExtra(SERVICE_ACTION, ACTION_SENDREQUEST); public static void sendRequest(Context context,SentBody body){
context.startService(serviceIntent);
boolean isManualStop = CIMCacheTools.getBoolean(context,CIMCacheTools.KEY_MANUAL_STOP);
} boolean isManualDestory = CIMCacheTools.getBoolean(context,CIMCacheTools.KEY_CIM_DESTORYED);
/** if(isManualStop || isManualDestory)
* 停止接受推送，将会退出当前账号登录，端口与服务端的连接 {
* @param context return ;
*/ }
public static void stop(Context context){
Intent serviceIntent = new Intent(context, CIMPushService.class);
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED); serviceIntent.putExtra(KEY_SEND_BODY, body);
if(isManualDestory){ serviceIntent.putExtra(SERVICE_ACTION, ACTION_SENDREQUEST);
return ; context.startService(serviceIntent);
}
}
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_MANUAL_STOP, true);
/**
Intent serviceIntent = new Intent(context, CIMPushService.class); * 停止接受推送，将会退出当前账号登录，端口与服务端的连接
serviceIntent.putExtra(SERVICE_ACTION, ACTION_DISCONNECTION); * @param context
context.startService(serviceIntent); */
public static void stop(Context context){
}
boolean isManualDestory = CIMCacheTools.getBoolean(context,CIMCacheTools.KEY_CIM_DESTORYED);
if(isManualDestory){
/** return ;
* 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复 }
* @param context
*/ CIMCacheTools.putBoolean(context,CIMCacheTools.KEY_MANUAL_STOP, true);
public static void destory(Context context){
Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.putExtra(SERVICE_ACTION, ACTION_DISCONNECTION);
CIMDataConfig.putBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED, true); context.startService(serviceIntent);
CIMDataConfig.putString(context,CIMDataConfig.KEY_ACCOUNT, null);
}
Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.putExtra(SERVICE_ACTION, ACTION_DESTORY);
context.startService(serviceIntent); /**
* 完全销毁CIM，一般用于完全退出程序，调用resume将不能恢复
} * @param context
*/
public static void destory(Context context){
/**
* 重新恢复接收推送，重新连接服务端，并登录当前账号
* @param context CIMCacheTools.putBoolean(context,CIMCacheTools.KEY_CIM_DESTORYED, true);
*/ CIMCacheTools.putString(context,CIMCacheTools.KEY_ACCOUNT, null);
public static void resume(Context context){
Intent serviceIntent = new Intent(context, CIMPushService.class);
boolean isManualDestory = CIMDataConfig.getBoolean(context,CIMDataConfig.KEY_CIM_DESTORYED); serviceIntent.putExtra(SERVICE_ACTION, ACTION_DESTORY);
if(isManualDestory){ context.startService(serviceIntent);
return ;
} }
setAccount(context);
} /**
* 重新恢复接收推送，重新连接服务端，并登录当前账号
public void detectIsConnected(Context context){ * @param context
Intent serviceIntent = new Intent(context, CIMPushService.class); */
serviceIntent.putExtra(SERVICE_ACTION, ACTION_CONNECTION_STATUS); public static void resume(Context context){
context.startService(serviceIntent);
} boolean isManualDestory = CIMCacheTools.getBoolean(context,CIMCacheTools.KEY_CIM_DESTORYED);
if(isManualDestory){
return ;
}
bindAccount(context);
}
public static void detectIsConnected(Context context){
Intent serviceIntent = new Intent(context, CIMPushService.class);
serviceIntent.putExtra(SERVICE_ACTION, ACTION_CONNECTION_STATUS);
context.startService(serviceIntent);
}
private static String getVersionName(Context context) {
String versionName = null;
try {
PackageInfo mPackageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
versionName = mPackageInfo.versionName;
} catch (NameNotFoundException e) {
}
return versionName;
}
} }

52
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMPushService.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/android/CIMPushService.java
View File

@ -1,15 +1,11 @@
package com.farsunset.cim.client.android; package com.farsunset.cim.client.android;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.Binder;
import android.os.IBinder; import android.os.IBinder;
import android.util.Log; import android.util.Log;
import com.farsunset.cim.nio.mutual.SentBody; import com.farsunset.cim.client.model.SentBody;
/** /**
@ -19,18 +15,12 @@ import com.farsunset.cim.nio.mutual.SentBody;
*/ */
public class CIMPushService extends Service { public class CIMPushService extends Service {
protected final static int DEF_CIM_PORT = 28888;
CIMConnectorManager manager; CIMConnectorManager manager;
AlarmManager localAlarmManager;
private IBinder binder=new CIMPushService.LocalBinder();
PendingIntent localPendingIntent;
@Override @Override
public void onCreate() public void onCreate()
{ {
manager = CIMConnectorManager.getManager(this.getApplicationContext()); manager = CIMConnectorManager.getManager(this.getApplicationContext());
localPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(this, KeepAliveReceiver.class), PendingIntent.FLAG_CANCEL_CURRENT);
localAlarmManager = (AlarmManager)getSystemService(ALARM_SERVICE);
localAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP, 300000L + System.currentTimeMillis(),300000L, localPendingIntent);
} }
@ -41,18 +31,18 @@ import com.farsunset.cim.nio.mutual.SentBody;
if(intent==null) if(intent==null)
{ {
intent = new Intent(CIMPushManager.ACTION_CONNECTION); intent = new Intent(CIMPushManager.ACTION_CONNECTION);
String host = CIMDataConfig.getString(this, CIMDataConfig.KEY_CIM_SERVIER_HOST); String host = CIMCacheTools.getString(this, CIMCacheTools.KEY_CIM_SERVIER_HOST);
int port =CIMDataConfig.getInt(this, CIMDataConfig.KEY_CIM_SERVIER_PORT); int port =CIMCacheTools.getInt(this, CIMCacheTools.KEY_CIM_SERVIER_PORT);
intent.putExtra(CIMDataConfig.KEY_CIM_SERVIER_HOST, host); intent.putExtra(CIMCacheTools.KEY_CIM_SERVIER_HOST, host);
intent.putExtra(CIMDataConfig.KEY_CIM_SERVIER_PORT, port); intent.putExtra(CIMCacheTools.KEY_CIM_SERVIER_PORT, port);
} }
action = intent.getStringExtra(CIMPushManager.SERVICE_ACTION); action = intent.getStringExtra(CIMPushManager.SERVICE_ACTION);
if(CIMPushManager.ACTION_CONNECTION.equals(action)) if(CIMPushManager.ACTION_CONNECTION.equals(action))
{ {
String host = intent.getStringExtra(CIMDataConfig.KEY_CIM_SERVIER_HOST); String host = intent.getStringExtra(CIMCacheTools.KEY_CIM_SERVIER_HOST);
int port = intent.getIntExtra(CIMDataConfig.KEY_CIM_SERVIER_PORT, 28888); int port = intent.getIntExtra(CIMCacheTools.KEY_CIM_SERVIER_PORT, DEF_CIM_PORT);
manager.connect(host,port); manager.connect(host,port);
} }
@ -68,8 +58,6 @@ import com.farsunset.cim.nio.mutual.SentBody;
if(CIMPushManager.ACTION_DESTORY.equals(action)) if(CIMPushManager.ACTION_DESTORY.equals(action))
{ {
localAlarmManager.cancel(localPendingIntent);
localPendingIntent.cancel();
manager.destroy(); manager.destroy();
this.stopSelf(); this.stopSelf();
android.os.Process.killProcess(android.os.Process.myPid()); android.os.Process.killProcess(android.os.Process.myPid());
@ -80,14 +68,14 @@ import com.farsunset.cim.nio.mutual.SentBody;
manager.deliverIsConnected(); manager.deliverIsConnected();
} }
if(CIMPushManager.ACTION_CONNECTION_KEEPALIVE.equals(action)) if(CIMPushManager.ACTION_ACTIVATE_PUSH_SERVICE.equals(action))
{ {
if(!manager.isConnected()) if(!manager.isConnected())
{ {
Log.d(CIMPushService.class.getSimpleName(), "isConnected() = false "); Log.d(CIMPushService.class.getSimpleName(), "cimpush isConnected() = false ");
String host = intent.getStringExtra(CIMDataConfig.KEY_CIM_SERVIER_HOST); String host = intent.getStringExtra(CIMCacheTools.KEY_CIM_SERVIER_HOST);
int port = intent.getIntExtra(CIMDataConfig.KEY_CIM_SERVIER_PORT, 28888); int port = intent.getIntExtra(CIMCacheTools.KEY_CIM_SERVIER_PORT, DEF_CIM_PORT);
manager.connect(host,port); manager.connect(host,port);
}else }else
{ {
@ -98,18 +86,12 @@ import com.farsunset.cim.nio.mutual.SentBody;
return Service.START_REDELIVER_INTENT; return Service.START_REDELIVER_INTENT;
} }
@Override @Override
public IBinder onBind(Intent arg0) { public IBinder onBind(Intent arg0) {
return binder; return null;
} }
public class LocalBinder extends Binder{
public CIMPushService getService()
{
return CIMPushService.this;
}
}
} }

68
cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/constant/CIMConstant.java Normal file
View File

@ -0,0 +1,68 @@
/**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.constant;
/**
* 常量
*/
public interface CIMConstant {
public static String UTF8="UTF-8";
public static byte MESSAGE_SEPARATE='\b';
public static int CIM_DEFAULT_MESSAGE_ORDER=1;
public static class ReturnCode{
public static String CODE_404 ="404";
public static String CODE_403 ="403";
public static String CODE_405 ="405";
public static String CODE_200 ="200";
public static String CODE_206 ="206";
public static String CODE_500 ="500";
}
/**
* 服务端心跳请求命令
*/
public static final String CMD_HEARTBEAT_REQUEST="cmd_server_hb_request";
/**
* 客户端心跳响应命令
*/
public static final String CMD_HEARTBEAT_RESPONSE ="cmd_client_hb_response";
public static class RequestKey{
public static String CLIENT_BIND ="client_bind";
public static String CLIENT_LOGOUT ="client_logout";
public static String CLIENT_OFFLINE_MESSAGE ="client_get_offline_message";
}
public static class MessageType{
//用户会 踢出下线消息类型
public static String TYPE_999 ="999";
}
}

8
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMSessionDisableException.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/exception/CIMSessionDisableException.java
View File

@ -1,4 +1,10 @@
package com.farsunset.cim.client.android; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.exception;
public class CIMSessionDisableException extends Exception { public class CIMSessionDisableException extends Exception {

8
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/NetWorkDisableException.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/exception/NetWorkDisableException.java
View File

@ -1,4 +1,10 @@
package com.farsunset.cim.client.android; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.exception;
public class NetWorkDisableException extends Exception { public class NetWorkDisableException extends Exception {

8
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/WriteToClosedSessionException.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/exception/WriteToClosedSessionException.java
View File

@ -1,4 +1,10 @@
package com.farsunset.cim.client.android; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.exception;
import java.io.Serializable; import java.io.Serializable;

10
cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageCodecFactory.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/filter/ClientMessageCodecFactory.java
View File

@ -1,5 +1,10 @@
/**
package com.farsunset.cim.nio.filter; * probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.filter;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolCodecFactory;
@ -9,7 +14,6 @@ import org.apache.mina.filter.codec.ProtocolEncoder;
/** /**
* android客户端端消息 编码解码器， 可以在 * android客户端端消息 编码解码器， 可以在
* 关于消息加密与加密， 可在 encoder时进行消息加密，在ServerMessageCodecFactory的 decoder时对消息解密 * 关于消息加密与加密， 可在 encoder时进行消息加密，在ServerMessageCodecFactory的 decoder时对消息解密
* @author 3979434@qq.com
*/ */
public class ClientMessageCodecFactory implements ProtocolCodecFactory { public class ClientMessageCodecFactory implements ProtocolCodecFactory {

45
cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageDecoder.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/filter/ClientMessageDecoder.java
View File

@ -1,4 +1,10 @@
package com.farsunset.cim.nio.filter; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.filter;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@ -12,16 +18,19 @@ import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import com.farsunset.cim.nio.constant.CIMConstant;
import com.farsunset.cim.nio.mutual.Message; import android.util.Log;
import com.farsunset.cim.nio.mutual.ReplyBody;
import com.farsunset.cim.client.constant.CIMConstant;
import com.farsunset.cim.client.model.Message;
import com.farsunset.cim.client.model.ReplyBody;
/** /**
* 客户端消息解码 * 客户端消息解码
* @author 3979434@qq.com
*
*/ */
public class ClientMessageDecoder extends CumulativeProtocolDecoder { public class ClientMessageDecoder extends CumulativeProtocolDecoder {
final static String TAG = ClientMessageDecoder.class.getSimpleName();
private IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true); private IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true);
@Override @Override
@ -48,12 +57,21 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
buff.flip(); buff.flip();
byte[] bytes = new byte[buff.limit()]; byte[] bytes = new byte[buff.limit()];
buff.get(bytes); buff.get(bytes);
String message = new String(bytes, "UTF-8"); String message = new String(bytes, CIMConstant.UTF8);
buff.clear(); buff.clear();
System.out.println("ClientMessageDecoder:" + message);
Object msg = mappingMessageObject(message); //打印出收到的消息
out.write(msg); Log.i(TAG,message);
try
{
Object msg = mappingMessageObject(message);
out.write(msg);
}catch(Exception e)
{
e.printStackTrace();
}
} }
return complete; return complete;
@ -61,10 +79,15 @@ public class ClientMessageDecoder extends CumulativeProtocolDecoder {
private Object mappingMessageObject(String message) throws Exception { private Object mappingMessageObject(String message) throws Exception {
if(CIMConstant.CMD_HEARTBEAT_REQUEST.equals(message))
{
return message;
}
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder(); DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = (Document) builder.parse(new ByteArrayInputStream(message.toString().getBytes("UTF-8"))); Document doc = (Document) builder.parse(new ByteArrayInputStream(message.getBytes(CIMConstant.UTF8)));
String name = doc.getDocumentElement().getTagName(); String name = doc.getDocumentElement().getTagName();
if (name.equals("reply")) { if (name.equals("reply")) {

21
cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ClientMessageEncoder.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/filter/ClientMessageEncoder.java
View File

@ -1,4 +1,10 @@
package com.farsunset.cim.nio.filter; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.filter;
@ -7,24 +13,25 @@ import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter; import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput; import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import com.farsunset.cim.nio.constant.CIMConstant; import android.util.Log;
import com.farsunset.cim.client.constant.CIMConstant;
/** /**
* 客户端消息发送前进行编码,可在此加密消息 * 客户端消息发送前进行编码,可在此加密消息
* @author 3979434@qq.com
*
*/ */
public class ClientMessageEncoder extends ProtocolEncoderAdapter { public class ClientMessageEncoder extends ProtocolEncoderAdapter {
final static String TAG = ClientMessageEncoder.class.getSimpleName();
@Override @Override
public void encode(IoSession iosession, Object message, ProtocolEncoderOutput out) throws Exception { public void encode(IoSession iosession, Object message, ProtocolEncoderOutput out) throws Exception {
IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true); IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true);
//buff.putString( message.toString(), charset.newEncoder()); buff.put(message.toString().getBytes(CIMConstant.UTF8));
buff.put(message.toString().getBytes("UTF-8"));
buff.put(CIMConstant.MESSAGE_SEPARATE); buff.put(CIMConstant.MESSAGE_SEPARATE);
buff.flip(); buff.flip();
out.write(buff); out.write(buff);
//打印出收到的消息
Log.i(TAG,message.toString());
} }

14
cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/Message.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/model/Message.java
View File

@ -1,17 +1,17 @@
package com.farsunset.cim.nio.mutual; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.model;
import java.io.Serializable; import java.io.Serializable;
/** /**
* 消息对象 * 消息对象
* @author @author 3979434@qq.com
*
*/ */
public class Message implements Serializable { public class Message implements Serializable {
/**
* @author 3979434@qq.com
* 消息对象
*/
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

15
cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/ReplyBody.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/model/ReplyBody.java
View File

@ -1,18 +1,19 @@
package com.farsunset.cim.nio.mutual; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
/** /**
* 请求应答对象 * 请求应答对象
* @author 3979434@qq.com
* *
*/ */
public class ReplyBody implements Serializable { public class ReplyBody implements Serializable {
/**
* @author 3979434@qq.com
* 服务端返回消息对象
*/
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**

12
cim_for_mina/cim-core/src/com/farsunset/cim/nio/mutual/SentBody.java → cim_for_mina/cim-android-sdk/src/com/farsunset/cim/client/model/SentBody.java
View File

@ -1,17 +1,19 @@
package com.farsunset.cim.nio.mutual; /**
* probject:cim-android-sdk
* @version 2.0.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.client.model;
import java.io.Serializable; import java.io.Serializable;
import java.util.HashMap; import java.util.HashMap;
/** /**
* java |android 客户端请求结构 * java |android 客户端请求结构
* @author 3979434@qq.com
* *
*/ */
public class SentBody implements Serializable { public class SentBody implements Serializable {
/**
* @author 3979434@qq.com 客户端发送消息对象
*/
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private String key; private String key;

10
cim_for_mina/cim-core/.classpath
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="/ichat-server/WebRoot/WEB-INF/lib/mina-core-2.0.7.jar"/>
<classpathentry kind="lib" path="/ichat-server/WebRoot/WEB-INF/lib/log4j.jar"/>
<classpathentry kind="lib" path="D:/soft/adt-bundle-windows-x86_64-20140321/sdk/platforms/android-19/android.jar"/>
<classpathentry kind="lib" path="/ichat-server/WebRoot/WEB-INF/lib/commons-lang-2.3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

40
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMListenerManager.java
View File

@ -1,40 +0,0 @@
package com.farsunset.cim.client.android;
import java.util.ArrayList;
import java.util.Collections;
import android.content.Context;
/**
* CIM 消息监听器管理
*
* @author 3979434@qq.com
*/
public class CIMListenerManager {
private static ArrayList<OnCIMMessageListener> cimListeners = new ArrayList<OnCIMMessageListener>();
public static void registerMessageListener(OnCIMMessageListener listener,Context mcontext) {
if (!cimListeners.contains(listener)) {
cimListeners.add(listener);
// 按照接收顺序倒序
Collections.sort(cimListeners, new CIMMessageReceiveComparator(mcontext));
}
}
public static void removeMessageListener(OnCIMMessageListener listener) {
for (int i = 0; i < cimListeners.size(); i++) {
if (listener.getClass() == cimListeners.get(i).getClass()) {
cimListeners.remove(i);
}
}
}
public static ArrayList<OnCIMMessageListener> getCIMListeners() {
return cimListeners;
}
}

59
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/CIMMessageReceiveComparator.java
View File

@ -1,59 +0,0 @@
package com.farsunset.cim.client.android;
import java.util.Comparator;
import android.app.Activity;
import android.content.Context;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import com.farsunset.cim.nio.constant.CIMConstant;
/**
* 消息接收activity的接收顺序排序，CIM_RECEIVE_ORDER倒序
* @author 3979434
*
*/
public class CIMMessageReceiveComparator implements Comparator<OnCIMMessageListener>{
Context mcontext;
public CIMMessageReceiveComparator(Context ctx)
{
mcontext = ctx;
}
@Override
public int compare(OnCIMMessageListener arg1, OnCIMMessageListener arg2) {
Integer order1 = CIMConstant.CIM_DEFAULT_MESSAGE_ORDER;
Integer order2 = CIMConstant.CIM_DEFAULT_MESSAGE_ORDER;
ActivityInfo info;
if (arg1 instanceof Activity ) {
try {
info = mcontext.getPackageManager() .getActivityInfo(((Activity)(arg1)).getComponentName(), PackageManager.GET_META_DATA);
if(info.metaData!=null)
{
order1 = info.metaData.getInt("CIM_RECEIVE_ORDER");
}
} catch (Exception e) {}
}
if (arg1 instanceof Activity ) {
try {
info = mcontext.getPackageManager() .getActivityInfo(((Activity)(arg2)).getComponentName(), PackageManager.GET_META_DATA);
if(info.metaData!=null)
{
order2 = info.metaData.getInt("CIM_RECEIVE_ORDER");
}
} catch (Exception e) {}
}
return order2.compareTo(order1);
}
}

24
cim_for_mina/cim-core/src/com/farsunset/cim/client/android/KeepAliveReceiver.java
View File

@ -1,24 +0,0 @@
package com.farsunset.cim.client.android;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.util.Log;
/**
* @author 3979434
*
*/
public class KeepAliveReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent it) {
Log.d(KeepAliveReceiver.class.getSimpleName(), "onReceive()");
Intent intent = new Intent(context, CIMPushService.class);
intent.putExtra(CIMPushManager.SERVICE_ACTION, CIMPushManager.ACTION_CONNECTION_KEEPALIVE);
context.startService(intent);
}
}

15
cim_for_mina/cim-core/src/com/farsunset/cim/nio/handler/CIMRequestHandler.java
View File

@ -1,15 +0,0 @@
package com.farsunset.cim.nio.handler;
/**
* 请求处理接口,所有的请求实现必须实现此接口
* @author 3979434@qq.com
*/
import com.farsunset.cim.nio.mutual.ReplyBody;
import com.farsunset.cim.nio.mutual.SentBody;
import com.farsunset.cim.nio.session.CIMSession;
public interface CIMRequestHandler {
public abstract ReplyBody process(CIMSession session,SentBody message);
}

32
cim_for_mina/cim-core/src/com/farsunset/cim/nio/handler/HeartbeatHandler.java
View File

@ -1,32 +0,0 @@
package com.farsunset.cim.nio.handler;
import org.apache.log4j.Logger;
import com.farsunset.cim.nio.constant.CIMConstant;
import com.farsunset.cim.nio.mutual.ReplyBody;
import com.farsunset.cim.nio.mutual.SentBody;
import com.farsunset.cim.nio.session.CIMSession;
/**
*客户端心跳实现
*
* @author
*/
public class HeartbeatHandler implements CIMRequestHandler {
protected final Logger logger = Logger.getLogger(HeartbeatHandler.class);
public ReplyBody process(CIMSession session, SentBody message) {
logger.warn("heartbeat... from "+session.getRemoteAddress().toString());
ReplyBody reply = new ReplyBody();
reply.setKey(CIMConstant.RequestKey.CLIENT_HEARTBEAT);
reply.setCode(CIMConstant.ReturnCode.CODE_200);
session.setHeartbeat(System.currentTimeMillis());
return reply;
}
}

8
cim_for_mina/cim-server-sdk/.classpath Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="/cim-server/WebRoot/WEB-INF/lib/log4j.jar"/>
<classpathentry kind="lib" path="/cim-server/WebRoot/WEB-INF/lib/mina-core-2.0.9.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
cim_for_mina/cim-core/.project → cim_for_mina/cim-server-sdk/.project
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>cim-core</name> <name>cim-server-sdk</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

3
cim_for_mina/cim-server-sdk/.settings/org.eclipse.core.resources.prefs Normal file
View File

@ -0,0 +1,3 @@
#Wed Oct 15 09:31:41 CST 2014
eclipse.preferences.version=1
encoding/<project>=UTF-8

53
cim_for_mina/cim-core/src/com/farsunset/cim/nio/constant/CIMConstant.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/constant/CIMConstant.java
View File

@ -1,10 +1,13 @@
/**
package com.farsunset.cim.nio.constant; * probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.constant;
/** /**
* 常量 * 常量
*
* @author 3979434@qq.com
*/ */
public interface CIMConstant { public interface CIMConstant {
@ -25,50 +28,44 @@ public interface CIMConstant {
} }
public static String UTF8="UTF-8";
public static byte MESSAGE_SEPARATE='\b'; public static byte MESSAGE_SEPARATE='\b';
public static int CIM_DEFAULT_MESSAGE_ORDER=1; public static int CIM_DEFAULT_MESSAGE_ORDER=1;
public static final String SESSION_KEY ="account"; public static final String SESSION_KEY ="account";
public static final String HEARTBEAT_KEY ="heartbeat"; public static final String HEARTBEAT_KEY ="heartbeat";
/** /**
* FLEX 客户端socket请求发的安全策略请求，需要特殊处理，返回安全验证报文 * FLEX 客户端socket请求发的安全策略请求，需要特殊处理，返回安全验证报文
*/ */
public static final String FLEX_POLICY_REQUEST ="<policy-file-request/>"; public static final String FLEX_POLICY_REQUEST ="<policy-file-request/>";
public static final String FLEX_POLICY_RESPONSE ="<?xml version=\"1.0\"?><cross-domain-policy><site-control permitted-cross-domain-policies=\"all\"/><allow-access-from domain=\"*\" to-ports=\"*\"/></cross-domain-policy>\0"; public static final String FLEX_POLICY_RESPONSE ="<?xml version=\"1.0\"?><cross-domain-policy><site-control permitted-cross-domain-policies=\"all\"/><allow-access-from domain=\"*\" to-ports=\"*\"/></cross-domain-policy>\0";
/** /**
* 服务端心跳请求命令
*/
public static final String CMD_HEARTBEAT_REQUEST="cmd_server_hb_request";
/**
* 客户端心跳响应命令
*/
public static final String CMD_HEARTBEAT_RESPONSE ="cmd_client_hb_response";
/**
* 对应ichat 中 spring-cim.xml > bean:mainIoHandler >handlers * 对应ichat 中 spring-cim.xml > bean:mainIoHandler >handlers
* 为 服务端处理对应的handlers，应该继承与com.farsunset.cim.nio.handle.AbstractHandler * 为 服务端处理对应的handlers，应该继承与com.farsunset.cim.nio.handle.AbstractHandler
* @author xiajun
* *
*/ */
public static class RequestKey{
public static String CLIENT_BIND ="client_bind";
public static String CLIENT_HEARTBEAT="client_heartbeat";
public static String CLIENT_LOGOUT ="client_logout";
public static String CLIENT_DIY ="client_diy";
public static String CLIENT_OFFLINE_MESSAGE ="client_get_offline_message";
}
public static class SessionStatus{ public static class SessionStatus{
@ -78,11 +75,11 @@ public interface CIMConstant {
} }
public static class MessageType{ public static class MessageType{
//账号在其他设备绑定时，会收到该类型消息 //用户会 踢出下线消息类型
public static String TYPE_999 ="999"; public static String TYPE_999 ="999";
} }
} }

10
cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageCodecFactory.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/filter/ServerMessageCodecFactory.java
View File

@ -1,5 +1,10 @@
/**
package com.farsunset.cim.nio.filter; * probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.filter;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFactory; import org.apache.mina.filter.codec.ProtocolCodecFactory;
@ -9,7 +14,6 @@ import org.apache.mina.filter.codec.ProtocolEncoder;
/** /**
* 服务端消息 编码解码器， 可以在 * 服务端消息 编码解码器， 可以在
* 关于消息加密与加密， 可在 encoder时进行消息加密，在ClientMessageCodecFactory的 decoder时对消息解密 * 关于消息加密与加密， 可在 encoder时进行消息加密，在ClientMessageCodecFactory的 decoder时对消息解密
* @author 3979434@qq.com
*/ */
public class ServerMessageCodecFactory implements ProtocolCodecFactory { public class ServerMessageCodecFactory implements ProtocolCodecFactory {

67
cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageDecoder.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/filter/ServerMessageDecoder.java
View File

@ -1,7 +1,12 @@
package com.farsunset.cim.nio.filter; /**
* probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.filter;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.nio.charset.Charset;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
@ -15,17 +20,14 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import com.farsunset.cim.nio.constant.CIMConstant; import com.farsunset.cim.server.constant.CIMConstant;
import com.farsunset.cim.nio.mutual.SentBody; import com.farsunset.cim.server.model.SentBody;
/** /**
* 服务端接收消息解码，可在此解密消息 * 服务端接收消息解码，可在此解密消息
* @author 3979434@qq.com
*
*/ */
public class ServerMessageDecoder extends CumulativeProtocolDecoder { public class ServerMessageDecoder extends CumulativeProtocolDecoder {
protected final Logger logger = Logger.getLogger(ServerMessageDecoder.class); protected final Logger logger = Logger.getLogger(ServerMessageDecoder.class);
private final Charset charset = Charset.forName("UTF-8");
private IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true); private IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true);
@Override @Override
public boolean doDecode(IoSession iosession, IoBuffer iobuffer, ProtocolDecoderOutput out) throws Exception { public boolean doDecode(IoSession iosession, IoBuffer iobuffer, ProtocolDecoderOutput out) throws Exception {
@ -45,7 +47,7 @@ public class ServerMessageDecoder extends CumulativeProtocolDecoder {
complete = true; complete = true;
break; break;
} }
else { else {
buff.put(b); buff.put(b);
} }
} }
@ -54,35 +56,42 @@ public class ServerMessageDecoder extends CumulativeProtocolDecoder {
byte[] bytes = new byte[buff.limit()]; byte[] bytes = new byte[buff.limit()];
buff.get(bytes); buff.get(bytes);
String message = new String(bytes, "UTF-8"); String message = new String(bytes, CIMConstant.UTF8);
logger.warn("ServerMessageDecoder:" + message);
logger.debug(message);
buff.clear(); buff.clear();
try{ try{
SentBody body = new SentBody(); Object body = getSentBody(message);
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(new ByteArrayInputStream(bytes));
body.setKey(doc.getElementsByTagName("key").item(0).getTextContent());
NodeList dataNodeList = doc.getElementsByTagName("data");
if(dataNodeList!=null && dataNodeList.getLength()>0)
{
NodeList items = dataNodeList.item(0).getChildNodes();
for (int i = 0; i < items.getLength(); i++) {
Node node = items.item(i);
body.getData().put(node.getNodeName(), node.getTextContent());
}
}
out.write(body); out.write(body);
}catch(Exception e){ }catch(Exception e){
logger.warn(e.getMessage()); out.write(message);//解析xml失败 是返回原始的xml数据到上层处理,比如心跳响应、flex sokcet的 安全验证请求xml
out.write(message);
} }
} }
return complete; return complete;
} }
public Object getSentBody(String message) throws Exception
{
SentBody body = new SentBody();
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder builder = factory.newDocumentBuilder();
Document doc = builder.parse(new ByteArrayInputStream(message.getBytes(CIMConstant.UTF8)));
body.setKey(doc.getElementsByTagName("key").item(0).getTextContent());
NodeList datas = doc.getElementsByTagName("data");
if(datas!=null&&datas.getLength()>0)
{
NodeList items = datas.item(0).getChildNodes();
for (int i = 0; i < items.getLength(); i++) {
Node node = items.item(i);
body.getData().put(node.getNodeName(), node.getTextContent());
}
}
return body;
}
} }

22
cim_for_mina/cim-core/src/com/farsunset/cim/nio/filter/ServerMessageEncoder.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/filter/ServerMessageEncoder.java
View File

@ -1,31 +1,35 @@
package com.farsunset.cim.nio.filter; /**
* probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.filter;
import org.apache.log4j.Logger;
import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.buffer.IoBuffer;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolEncoderAdapter; import org.apache.mina.filter.codec.ProtocolEncoderAdapter;
import org.apache.mina.filter.codec.ProtocolEncoderOutput; import org.apache.mina.filter.codec.ProtocolEncoderOutput;
import com.farsunset.cim.nio.constant.CIMConstant; import com.farsunset.cim.server.constant.CIMConstant;
/** /**
* 服务端发送消息前编码，可在此加密消息 * 服务端发送消息前编码，可在此加密消息
* @author 3979434@qq.com
*
*/ */
public class ServerMessageEncoder extends ProtocolEncoderAdapter { public class ServerMessageEncoder extends ProtocolEncoderAdapter {
protected final Logger logger = Logger.getLogger(ServerMessageEncoder.class);
@Override @Override
public void encode(IoSession iosession, Object message, ProtocolEncoderOutput out) throws Exception { public void encode(IoSession iosession, Object message, ProtocolEncoderOutput out) throws Exception {
IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true); IoBuffer buff = IoBuffer.allocate(320).setAutoExpand(true);
buff.put(message.toString().getBytes("UTF-8")); buff.put(message.toString().getBytes(CIMConstant.UTF8));
buff.put(CIMConstant.MESSAGE_SEPARATE); buff.put(CIMConstant.MESSAGE_SEPARATE);
buff.flip(); buff.flip();
out.write(buff); out.write(buff);
logger.debug(message);
} }

61
cim_for_mina/cim-core/src/com/farsunset/cim/nio/handler/MainIOHandler.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/handler/CIMIoHandler.java
View File

@ -1,5 +1,10 @@
/**
package com.farsunset.cim.nio.handler; * probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.handler;
import java.util.HashMap; import java.util.HashMap;
@ -8,37 +13,35 @@ import org.apache.mina.core.service.IoHandlerAdapter;
import org.apache.mina.core.session.IdleStatus; import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession; import org.apache.mina.core.session.IoSession;
import com.farsunset.cim.nio.constant.CIMConstant; import com.farsunset.cim.server.constant.CIMConstant;
import com.farsunset.cim.nio.mutual.ReplyBody; import com.farsunset.cim.server.model.ReplyBody;
import com.farsunset.cim.nio.mutual.SentBody; import com.farsunset.cim.server.model.SentBody;
import com.farsunset.cim.nio.session.CIMSession; import com.farsunset.cim.server.session.CIMSession;
/** /**
* *
* 客户端请求的入口，所有请求都首先经过它分发处理 * 客户端请求的入口，所有请求都首先经过它分发处理
* @author farsunset (3979434@qq.com)
*/ */
public class MainIOHandler extends IoHandlerAdapter { public class CIMIoHandler extends IoHandlerAdapter {
protected final Logger logger = Logger.getLogger(MainIOHandler.class);
protected final Logger logger = Logger.getLogger(CIMIoHandler.class);
private final static String CIMSESSION_CLOSED_HANDLER_KEY = "client_cimsession_closed";
private HashMap<String, CIMRequestHandler> handlers = new HashMap<String, CIMRequestHandler>(); private HashMap<String, CIMRequestHandler> handlers = new HashMap<String, CIMRequestHandler>();
public void sessionCreated(IoSession session) throws Exception { public void sessionCreated(IoSession session) throws Exception {
logger.warn("sessionCreated()... from "+session.getRemoteAddress().toString()); logger.debug("sessionCreated()... from "+session.getRemoteAddress());
} }
public void sessionOpened(IoSession session) throws Exception { public void sessionOpened(IoSession session) throws Exception {
} }
public void messageReceived(IoSession ios, Object message) public void messageReceived(IoSession ios, Object message)
throws Exception { throws Exception {
logger.debug("message: " + message.toString());
/** /**
* flex 客户端安全策略请求，需要返回特定报文 * flex 客户端安全策略请求，需要返回特定报文
@ -49,6 +52,11 @@ public class MainIOHandler extends IoHandlerAdapter {
return ; return ;
} }
if(!(message instanceof SentBody))
{
return ;
}
CIMSession cimSession =new CIMSession(ios); CIMSession cimSession =new CIMSession(ios);
ReplyBody reply = new ReplyBody(); ReplyBody reply = new ReplyBody();
SentBody body = (SentBody) message; SentBody body = (SentBody) message;
@ -66,12 +74,8 @@ public class MainIOHandler extends IoHandlerAdapter {
{ {
reply.setKey(key); reply.setKey(key);
cimSession.write(reply); cimSession.write(reply);
logger.debug("-----------------------process done. reply: " + reply.toString()); logger.info("-----------------------process done. reply: " + reply.toString());
} }
//设置心跳时间
cimSession.setAttribute(CIMConstant.HEARTBEAT_KEY, System.currentTimeMillis());
} }
/** /**
@ -80,8 +84,8 @@ public class MainIOHandler extends IoHandlerAdapter {
CIMSession cimSession =new CIMSession(ios); CIMSession cimSession =new CIMSession(ios);
try{ try{
logger.warn("sessionClosed()... from "+cimSession.getRemoteAddress()); logger.debug("sessionClosed()... from "+cimSession.getRemoteAddress());
CIMRequestHandler handler = handlers.get("sessionClosedHander"); CIMRequestHandler handler = handlers.get(CIMSESSION_CLOSED_HANDLER_KEY);
if(handler!=null && cimSession.containsAttribute(CIMConstant.SESSION_KEY)) if(handler!=null && cimSession.containsAttribute(CIMConstant.SESSION_KEY))
{ {
handler.process(cimSession, null); handler.process(cimSession, null);
@ -97,19 +101,7 @@ public class MainIOHandler extends IoHandlerAdapter {
*/ */
public void sessionIdle(IoSession session, IdleStatus status) public void sessionIdle(IoSession session, IdleStatus status)
throws Exception { throws Exception {
logger.warn("sessionIdle()... from "+session.getRemoteAddress().toString()); logger.debug("sessionIdle()... from "+session.getRemoteAddress());
if(!session.containsAttribute(CIMConstant.SESSION_KEY))
{
session.close(true);
}else
{
//如果5分钟之内客户端没有发送心态，则可能客户端断网，关闭连接
Object heartbeat = session.getAttribute(CIMConstant.HEARTBEAT_KEY);
if(heartbeat!=null && System.currentTimeMillis()-Long.valueOf(heartbeat.toString()) >= 300000)
{
session.close(false);
}
}
} }
/** /**
@ -124,9 +116,6 @@ public class MainIOHandler extends IoHandlerAdapter {
/** /**
*/ */
public void messageSent(IoSession session, Object message) throws Exception { public void messageSent(IoSession session, Object message) throws Exception {
//设置心跳时间
session.setAttribute(CIMConstant.HEARTBEAT_KEY, System.currentTimeMillis());
} }

62
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/handler/CIMNioSocketAcceptor.java Normal file
View File

@ -0,0 +1,62 @@
package com.farsunset.cim.server.handler;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.util.Map;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IdleStatus;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.codec.ProtocolCodecFilter;
import org.apache.mina.filter.executor.ExecutorFilter;
import org.apache.mina.filter.keepalive.KeepAliveFilter;
import org.apache.mina.filter.keepalive.KeepAliveMessageFactory;
import org.apache.mina.filter.keepalive.KeepAliveRequestTimeoutHandler;
import org.apache.mina.filter.logging.LoggingFilter;
import org.apache.mina.transport.socket.DefaultSocketSessionConfig;
import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
public class CIMNioSocketAcceptor {
IoAcceptor acceptor;
IoHandler ioHandler;
int port;
private final int IDLE_TIME = 60;//秒
private final int TIME_OUT = 30;//秒
public void bind() throws IOException
{
acceptor = new NioSocketAcceptor();
acceptor.getSessionConfig().setReadBufferSize(1024);
((DefaultSocketSessionConfig)acceptor.getSessionConfig()).setTcpNoDelay(true);
acceptor.getFilterChain().addLast("executor",new ExecutorFilter());
acceptor.getFilterChain().addLast("logger",new LoggingFilter());
acceptor.getFilterChain().addLast("codec",new ProtocolCodecFilter(new com.farsunset.cim.server.filter.ServerMessageCodecFactory()));
KeepAliveMessageFactory heartBeatFactory = new ServerKeepAliveFactoryImpl();
KeepAliveFilter keepAliveFilter = new KeepAliveFilter(heartBeatFactory,IdleStatus.BOTH_IDLE,KeepAliveRequestTimeoutHandler.CLOSE,IDLE_TIME,TIME_OUT);
keepAliveFilter.setForwardEvent(true);
acceptor.getFilterChain().addLast("heartbeat",keepAliveFilter);
acceptor.setHandler(ioHandler);
acceptor.bind(new InetSocketAddress(port));
}
public void unbind()
{
acceptor.unbind();
}
public void setAcceptor(IoAcceptor acceptor) {
this.acceptor = acceptor;
}
public void setIoHandler(IoHandler ioHandler) {
this.ioHandler = ioHandler;
}
public void setPort(int port) {
this.port = port;
}
public Map<Long, IoSession> getManagedSessions()
{
return acceptor.getManagedSessions();
}
}

20
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/handler/CIMRequestHandler.java Normal file
View File

@ -0,0 +1,20 @@
/**
* probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.handler;
/**
* 请求处理接口,所有的请求实现必须实现此接口
* @author 3979434@qq.com
*/
import com.farsunset.cim.server.model.ReplyBody;
import com.farsunset.cim.server.model.SentBody;
import com.farsunset.cim.server.session.CIMSession;
public interface CIMRequestHandler {
public abstract ReplyBody process(CIMSession session,SentBody message);
}

29
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/handler/ServerKeepAliveFactoryImpl.java Normal file
View File

@ -0,0 +1,29 @@
package com.farsunset.cim.server.handler;
import org.apache.mina.core.session.IoSession;
import org.apache.mina.filter.keepalive.KeepAliveMessageFactory;
import com.farsunset.cim.server.constant.CIMConstant;
public class ServerKeepAliveFactoryImpl implements KeepAliveMessageFactory {
@Override
public Object getRequest(IoSession arg0) {
return CIMConstant.CMD_HEARTBEAT_REQUEST;
}
@Override
public Object getResponse(IoSession arg0, Object arg1) {
return null;
}
@Override
public boolean isRequest(IoSession arg0, Object arg1) {
return false;
}
@Override
public boolean isResponse(IoSession arg0, Object arg1) {
return CIMConstant.CMD_HEARTBEAT_RESPONSE.equals(arg1);
}
}

174
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/model/Message.java Normal file
View File

@ -0,0 +1,174 @@
/**
* probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.model;
import java.io.Serializable;
/**
* 消息对象
*/
public class Message implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 消息类型，用户自定义消息类别
*/
private String mid;
/**
* 消息类型，用户自定义消息类别
*/
private String type;
/**
* 消息标题
*/
private String title;
/**
* 消息类容，于type 组合为任何类型消息，content 根据 format 可表示为 text,json ,xml数据格式
*/
private String content;
/**
* 消息发送者账号
*/
private String sender;
/**
* 消息发送者接收者
*/
private String receiver;
/**
* 文件 url
*/
private String file;
/**
* 文件类型
*/
private String fileType;
/**
* content 内容格式
*/
private String format = "txt";
private long timestamp;
public Message()
{
timestamp = System.currentTimeMillis();
}
public long getTimestamp() {
return timestamp;
}
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getTitle() {
return title;
}
public void setTitle(String title) {
this.title = title;
}
public String getContent() {
return content;
}
public void setContent(String content) {
this.content = content;
}
public String getSender() {
return sender;
}
public void setSender(String sender) {
this.sender = sender;
}
public String getReceiver() {
return receiver;
}
public void setReceiver(String receiver) {
this.receiver = receiver;
}
public String getFile() {
return file;
}
public void setFile(String file) {
this.file = file;
}
public String getFileType() {
return fileType;
}
public void setFileType(String fileType) {
this.fileType = fileType;
}
public String getFormat() {
return format;
}
public void setFormat(String format) {
this.format = format;
}
public String toString()
{
StringBuffer buffer = new StringBuffer();
buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
buffer.append("<message>");
buffer.append("<mid>").append(mid).append("</mid>");
buffer.append("<type>").append(type).append("</type>");
buffer.append("<title>").append(this.getTitle()==null?"":this.getTitle()).append("</title>");
buffer.append("<content><![CDATA[").append(this.getContent()==null?"":this.getContent()).append("]]></content>");
buffer.append("<file>").append(this.getFile()==null?"":this.getFile()).append("</file>");
buffer.append("<fileType>").append(this.getFileType()==null?"":this.getFileType()).append("</fileType>");
buffer.append("<sender>").append(this.getSender()==null?"":this.getSender()).append("</sender>");
buffer.append("<receiver>").append(this.getReceiver()==null?"":this.getReceiver()).append("</receiver>");
buffer.append("<format>").append(this.getFormat()==null?"":this.getFormat()).append("</format>");
buffer.append("<timestamp>").append(timestamp).append("</timestamp>");
buffer.append("</message>");
return buffer.toString();
}
public String toXmlString()
{
return toString();
}
public String getMid() {
return mid;
}
public void setMid(String mid) {
this.mid = mid;
}
}

124
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/model/ReplyBody.java Normal file
View File

@ -0,0 +1,124 @@
/**
* probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.model;
import java.io.Serializable;
import java.util.HashMap;
/**
* 请求应答对象
*
*/
public class ReplyBody implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 请求key
*/
private String key;
/**
* 返回码
*/
private String code;
/**
* 返回说明
*/
private String message;
/**
* 返回数据集合
*/
private HashMap<String, String> data;
private long timestamp;
public ReplyBody()
{
data = new HashMap<String, String>();
timestamp = System.currentTimeMillis();
}
public long getTimestamp() {
return timestamp;
}
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public void put(String k, String v) {
data.put(k, v);
}
public String get(String k) {
return data.get(k);
}
public void remove(String k) {
data.remove(k);
}
public String getMessage() {
return message;
}
public void setMessage(String message) {
this.message = message;
}
public HashMap<String, String> getData() {
return data;
}
public String getCode() {
return code;
}
public void setCode(String code) {
this.code = code;
}
public String toString()
{
StringBuffer buffer = new StringBuffer();
buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
buffer.append("<reply>");
buffer.append("<key>").append(this.getKey()).append("</key>");
buffer.append("<timestamp>").append(timestamp).append("</timestamp>");
buffer.append("<code>").append(code).append("</code>");
buffer.append("<data>");
for(String key:this.getData().keySet())
{
buffer.append("<"+key+">").append(this.get(key)).append("</"+key+">");
}
buffer.append("</data>");
buffer.append("</reply>");
return buffer.toString();
}
public String toXmlString()
{
return toString();
}
}

84
cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/model/SentBody.java Normal file
View File

@ -0,0 +1,84 @@
/**
* probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.model;
import java.io.Serializable;
import java.util.HashMap;
/**
* java |android 客户端请求结构
*
*/
public class SentBody implements Serializable {
private static final long serialVersionUID = 1L;
private String key;
private HashMap<String, String> data;
private long timestamp;
public SentBody() {
data = new HashMap<String, String>();
timestamp = System.currentTimeMillis();
}
public String getKey() {
return key;
}
public String get(String k) {
return data.get(k);
}
public long getTimestamp() {
return timestamp;
}
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
public void setKey(String key) {
this.key = key;
}
public void put(String k, String v) {
data.put(k, v);
}
public void remove(String k) {
data.remove(k);
}
public HashMap<String, String> getData() {
return data;
}
@Override
public String toString() {
StringBuffer buffer = new StringBuffer();
buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
buffer.append("<sent>");
buffer.append("<key>").append(key).append("</key>");
buffer.append("<timestamp>").append(timestamp).append("</timestamp>");
buffer.append("<data>");
for (String key : data.keySet()) {
buffer.append("<" + key + ">").append(data.get(key)).append(
"</" + key + ">");
}
buffer.append("</data>");
buffer.append("</sent>");
return buffer.toString();
}
public String toXmlString() {
return toString();
}
}

587
cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/CIMSession.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/session/CIMSession.java
View File

@ -1,243 +1,346 @@
package com.farsunset.cim.nio.session; /**
* probject:cim-core
import java.io.Serializable; * @version 1.5.0
import java.net.InetAddress; *
import java.net.SocketAddress; * @author 3979434@qq.com
import java.net.UnknownHostException; */
import java.util.concurrent.TimeUnit; package com.farsunset.cim.server.session;
import org.apache.mina.core.future.WriteFuture; import java.io.Serializable;
import org.apache.mina.core.session.IoSession; import java.net.InetAddress;
import java.net.SocketAddress;
import com.farsunset.cim.nio.constant.CIMConstant; import java.net.UnknownHostException;
/** import org.apache.mina.core.session.IoSession;
* IoSession包装类,集群时 将此对象存入表中
* import com.farsunset.cim.server.constant.CIMConstant;
* @author 3979434@qq.com
*/ /**
* IoSession包装类,集群时 将此对象存入表中
public class CIMSession implements Serializable{ */
/** public class CIMSession implements Serializable{
*
*/ /**
private transient static final long serialVersionUID = 1L; *
public transient static String ID = "ID"; */
public transient static String HOST = "HOST"; private transient static final long serialVersionUID = 1L;
public transient static String ID = "ID";
private transient IoSession session; public transient static String HOST = "HOST";
public transient static final int STATUS_ENABLE=0;
private String gid;//session全局ID public transient static final int STATUS_DISENABLE=1;
private Long nid;//session在本台服务器上的ID public transient static final int APNS_ON=1;
private String deviceId;//客户端ID (设备号码+应用包名) public transient static final int APNS_OFF=0;
private String host;//session绑定的服务器IP
private String account;//session绑定的账号 public transient static String CHANNEL_IOS = "ios";
private String channel;//终端设备类型 public transient static String CHANNEL_ANDROID = "android";
private String deviceModel;//终端设备型号 public transient static String CHANNEL_WINDOWS = "windows";
private Long bindTime;//登录时间 public transient static String CHANNEL_WP = "wp";
private Long heartbeat;//心跳时间
private transient IoSession session;
public CIMSession(IoSession session) {
this.session = session; private String gid;//session全局ID
this.nid = session.getId(); private Long nid;//session在本台服务器上的ID
} private String deviceId;//客户端ID (设备号码+应用包名),ios为devicetoken
private String host;//session绑定的服务器IP
public CIMSession() private String account;//session绑定的账号
{ private String channel;//终端设备类型
private String deviceModel;//终端设备型号
} private String clientVersion;//终端应用版本
private String systemVersion;//终端系统版本
private Long bindTime;//登录时间
private Long heartbeat;//心跳时间
private Double longitude;//经度
public String getAccount() { private Double latitude;//维度
return account; private String location;//位置
} private int apnsAble;//apns推送状态
private int status;// 状态
public void setAccount(String account) { public CIMSession(IoSession session) {
this.account = account; this.session = session;
this.nid = session.getId();
setAttribute(CIMConstant.SESSION_KEY, account); }
}
public CIMSession()
{
}
public String getGid() {
return gid;
} public String getAccount() {
return account;
public void setGid(String gid) { }
this.gid = gid; public void setAccount(String account) {
this.account = account;
setAttribute("gid", gid);
} setAttribute(CIMConstant.SESSION_KEY, account);
}
public Long getNid() {
return nid;
}
public void setNid(Long nid) {
this.nid = nid;
} public Double getLongitude() {
return longitude;
public String getDeviceId() { }
return deviceId;
} public void setLongitude(Double longitude) {
setAttribute("longitude", longitude);
this.longitude = longitude;
public String getChannel() { }
return channel;
} public Double getLatitude() {
return latitude;
public void setChannel(String channel) { }
this.channel = channel;
public void setLatitude(Double latitude) {
setAttribute("channel", channel); setAttribute("latitude", latitude);
} this.latitude = latitude;
}
public String getDeviceModel() {
return deviceModel; public String getLocation() {
} return location;
}
public void setDeviceModel(String deviceModel) {
this.deviceModel = deviceModel; public void setLocation(String location) {
setAttribute("location", location);
setAttribute("deviceModel", deviceModel); this.location = location;
} }
public void setDeviceId(String deviceId) { public String getGid() {
this.deviceId = deviceId; return gid;
}
setAttribute("deviceId", deviceId);
} public void setGid(String gid) {
this.gid = gid;
setAttribute("gid", gid);
public String getHost() { }
return host;
} public Long getNid() {
return nid;
}
public Long getBindTime() { public void setNid(Long nid) {
return bindTime; this.nid = nid;
} }
public void setBindTime(Long bindTime) { public String getDeviceId() {
this.bindTime = bindTime; return deviceId;
setAttribute("bindTime", bindTime); }
}
public Long getHeartbeat() { public String getChannel() {
return heartbeat; return channel;
} }
public void setHeartbeat(Long heartbeat) { public void setChannel(String channel) {
this.heartbeat = heartbeat; this.channel = channel;
setAttribute(CIMConstant.HEARTBEAT_KEY, heartbeat);
} setAttribute("channel", channel);
}
public void setHost(String host) {
this.host = host; public String getDeviceModel() {
return deviceModel;
setAttribute("host", host); }
}
public void setDeviceModel(String deviceModel) {
this.deviceModel = deviceModel;
public void setIoSession(IoSession session) {
this.session = session; setAttribute("deviceModel", deviceModel);
} }
public IoSession getIoSession() { public void setDeviceId(String deviceId) {
return session; this.deviceId = deviceId;
}
setAttribute("deviceId", deviceId);
}
public void setAttribute(String key, Object value) {
if(session!=null)
session.setAttribute(key, value);
} public String getHost() {
return host;
}
public boolean containsAttribute(String key) {
if(session!=null)
return session.containsAttribute(key);
return false; public Long getBindTime() {
} return bindTime;
}
public Object getAttribute(String key) {
if(session!=null) public void setBindTime(Long bindTime) {
return session.getAttribute(key); this.bindTime = bindTime;
return null; setAttribute("bindTime", bindTime);
} }
public void removeAttribute(String key) {
if(session!=null) public String getClientVersion() {
session.removeAttribute(key); return clientVersion;
} }
public SocketAddress getRemoteAddress() { public void setClientVersion(String clientVersion) {
if(session!=null) this.clientVersion = clientVersion;
return session.getRemoteAddress(); setAttribute("clientVersion", clientVersion);
return null; }
}
public boolean write(Object msg) {
if(session!=null)
{
WriteFuture wf = session.write(msg); public String getSystemVersion() {
wf.awaitUninterruptibly(5, TimeUnit.SECONDS); return systemVersion;
return wf.isWritten(); }
}
return false; public void setSystemVersion(String systemVersion) {
} this.systemVersion = systemVersion;
setAttribute("systemVersion", systemVersion);
public boolean isConnected() { }
if(session!=null)
return session.isConnected(); public Long getHeartbeat() {
return false; return heartbeat;
} }
public boolean isLocalhost() public void setHeartbeat(Long heartbeat) {
{ this.heartbeat = heartbeat;
setAttribute(CIMConstant.HEARTBEAT_KEY, heartbeat);
try { }
String ip = InetAddress.getLocalHost().getHostAddress();
return ip.equals(host); public void setHost(String host) {
} catch (UnknownHostException e) { this.host = host;
e.printStackTrace();
} setAttribute("host", host);
return false; }
}
public int getApnsAble() {
return apnsAble;
public void close(boolean immediately) { }
if(session!=null)
session.close(immediately); public void setApnsAble(int apnsAble) {
} this.apnsAble = apnsAble;
setAttribute("apnsAble", apnsAble);
}
public boolean equals(Object o) {
public int getStatus() {
if (o instanceof CIMSession) { return status;
}
CIMSession t = (CIMSession) o;
if(t.deviceId!=null && deviceId!=null && t.nid!=null && nid!=null) public void setStatus(int status) {
{ this.status = status;
return t.deviceId.equals(deviceId) && t.nid.longValue()==nid.longValue() && t.host.equals(host); setAttribute("status", status);
} }
}
return false;
} public void setAttribute(String key, Object value) {
if(session!=null)
session.setAttribute(key, value);
}
public boolean containsAttribute(String key) {
if(session!=null)
return session.containsAttribute(key);
return false;
}
public Object getAttribute(String key) {
if(session!=null)
return session.getAttribute(key);
return null;
}
public void removeAttribute(String key) {
if(session!=null)
session.removeAttribute(key);
}
public SocketAddress getRemoteAddress() {
if(session!=null)
return session.getRemoteAddress();
return null;
}
public void write(Object msg) {
if(session!=null)
{
session.write(msg).isWritten();
}
}
public boolean isConnected() {
if(session!=null)
return session.isConnected();
return false;
}
public boolean isLocalhost()
{
try {
String ip = InetAddress.getLocalHost().getHostAddress();
return ip.equals(host);
} catch (UnknownHostException e) {
e.printStackTrace();
}
return false;
}
public void close(boolean immediately) {
if(session!=null)
session.close(immediately);
}
public boolean equals(Object o) {
if (o instanceof CIMSession) {
CIMSession t = (CIMSession) o;
if(t.deviceId!=null && deviceId!=null && t.nid!=null && nid!=null)
{
return t.deviceId.equals(deviceId) && t.nid.longValue()==nid.longValue() && t.host.equals(host);
}
}
return false;
}
public void setIoSession(IoSession session) {
this.session = session;
}
public IoSession getIoSession() {
return session;
}
public String toString()
{
StringBuffer buffer = new StringBuffer();
buffer.append("{");
buffer.append("\"").append("gid").append("\":").append("\"").append(gid).append("\"").append(",");
buffer.append("\"").append("nid").append("\":").append(nid).append(",");
buffer.append("\"").append("deviceId").append("\":").append("\"").append(deviceId).append("\"").append(",");
buffer.append("\"").append("host").append("\":").append("\"").append(host).append("\"").append(",");
buffer.append("\"").append("account").append("\":").append("\"").append(account).append("\"").append(",");
buffer.append("\"").append("channel").append("\":").append("\"").append(channel).append("\"").append(",");
buffer.append("\"").append("deviceModel").append("\":").append("\"").append(deviceModel).append("\"").append(",");
buffer.append("\"").append("status").append("\":").append(status).append(",");
buffer.append("\"").append("apnsAble").append("\":").append(apnsAble).append(",");
buffer.append("\"").append("bindTime").append("\":").append(bindTime).append(",");
buffer.append("\"").append("heartbeat").append("\":").append(heartbeat);
buffer.append("}");
return buffer.toString();
}
} }

30
cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/DefaultSessionManager.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/session/DefaultSessionManager.java
View File

@ -1,16 +1,20 @@
/**
package com.farsunset.cim.nio.session; * probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.session;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import com.farsunset.cim.nio.constant.CIMConstant; import com.farsunset.cim.server.constant.CIMConstant;
/** /**
* 自带默认 session管理实现， 各位可以自行实现 AbstractSessionManager接口来实现自己的 session管理 * 自带默认 session管理实现， 各位可以自行实现 AbstractSessionManager接口来实现自己的 session管理
*服务器集群时 须要将CIMSession 信息存入数据库或者nosql 等 第三方存储空间中，便于所有服务器都可以访问 *服务器集群时 须要将CIMSession 信息存入数据库或者nosql 等 第三方存储空间中，便于所有服务器都可以访问
* @author farsunset (3979434@qq.com)
*/ */
public class DefaultSessionManager implements SessionManager{ public class DefaultSessionManager implements SessionManager{
@ -63,9 +67,9 @@ public class DefaultSessionManager implements SessionManager{
} }
public boolean containsCIMSession(CIMSession ios) public boolean containsCIMSession(String account)
{ {
return sessions.containsKey(ios.getAttribute(CIMConstant.SESSION_KEY)) || sessions.containsValue(ios); return sessions.containsKey(account);
} }
@ -75,7 +79,7 @@ public class DefaultSessionManager implements SessionManager{
{ {
for(String key:sessions.keySet()) for(String key:sessions.keySet())
{ {
if(sessions.get(key).equals(ios) || sessions.get(key).getNid()==ios.getNid()) if(sessions.get(key).equals(ios) || sessions.get(key).getGid()==ios.getGid())
{ {
return key; return key;
} }
@ -87,5 +91,17 @@ public class DefaultSessionManager implements SessionManager{
return null; return null;
} }
@Override
public void updateSession(CIMSession session) {
sessions.put(session.getAccount(), session);
}
@Override
public void setInvalid(String account) {
sessions.get(account).setStatus(CIMSession.STATUS_DISENABLE);
}
} }

35
cim_for_mina/cim-core/src/com/farsunset/cim/nio/session/SessionManager.java → cim_for_mina/cim-server-sdk/src/com/farsunset/cim/server/session/SessionManager.java
View File

@ -1,5 +1,10 @@
/**
package com.farsunset.cim.nio.session; * probject:cim-core
* @version 1.5.0
*
* @author 3979434@qq.com
*/
package com.farsunset.cim.server.session;
import java.util.Collection; import java.util.Collection;
@ -7,7 +12,6 @@ import java.util.Collection;
/** /**
* 客户端的 session管理接口 * 客户端的 session管理接口
* 可自行实现此接口管理session * 可自行实现此接口管理session
* @author 3979434@qq.com
*/ */
public interface SessionManager { public interface SessionManager {
@ -18,6 +22,11 @@ public interface SessionManager {
*/ */
public void addSession(String account,CIMSession session); public void addSession(String account,CIMSession session);
/**
* 添加新的session
*/
public void updateSession(CIMSession session);
/** /**
* *
* @param account 客户端session的 key 一般可用 用户账号来对应session * @param account 客户端session的 key 一般可用 用户账号来对应session
@ -31,12 +40,6 @@ public interface SessionManager {
*/ */
public Collection<CIMSession> getSessions(); public Collection<CIMSession> getSessions();
/**
* 删除session
* @param session
*/
public void removeSession(CIMSession session) ;
/** /**
* 删除session * 删除session
@ -44,15 +47,17 @@ public interface SessionManager {
*/ */
public void removeSession(String account); public void removeSession(String account);
/**
* 删除session
* @param session
*/
public void setInvalid(String account);
/** /**
* session是否存在 * session是否存在
* @param session * @param session
*/ */
public boolean containsCIMSession(CIMSession ios); public boolean containsCIMSession(String account);
/**
* session获取对应的 用户 key
* @param session
*/
public String getAccount(CIMSession ios);
} }

6
cim_for_mina/ichat-server/.classpath → cim_for_mina/cim-server/.classpath
View File

@ -6,6 +6,7 @@
<classpathentry kind="con" path="melibrary.com.genuitec.eclipse.j2eedt.core.MYECLIPSE_JAVAEE_5_CONTAINER"/> <classpathentry kind="con" path="melibrary.com.genuitec.eclipse.j2eedt.core.MYECLIPSE_JAVAEE_5_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
<classpathentry combineaccessrules="false" kind="src" path="/cim-server-sdk"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/Spring.aop-3.0.2.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/Spring.aop-3.0.2.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/Spring.asm-3.0.2.RELEASE.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/Spring.asm-3.0.2.RELEASE.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/Spring.beans-3.0.2.RELEASE.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/Spring.beans-3.0.2.RELEASE.jar"/>
@ -29,8 +30,8 @@
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/httpcore-4.3.2.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/httpcore-4.3.2.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jstl-1.2.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/jstl-1.2.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/log4j.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mina-core-2.0.7.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mina-core-2.0.9.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mina-integration-beans-2.0.0-RC1.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/mina-integration-beans-2.0.9.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ognl-2.7.3.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ognl-2.7.3.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-1.7.5.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-api-1.7.5.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-nop-1.7.5.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/slf4j-nop-1.7.5.jar"/>
@ -38,6 +39,5 @@
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/struts2-core-2.1.8.1.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/struts2-core-2.1.8.1.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xstream-1.3.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xstream-1.3.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xwork-core-2.1.6.jar"/> <classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xwork-core-2.1.6.jar"/>
<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/cim-core-1.6.jar"/>
<classpathentry kind="output" path="WebRoot/WEB-INF/classes"/> <classpathentry kind="output" path="WebRoot/WEB-INF/classes"/>
</classpath> </classpath>

6
cim_for_mina/ichat-server/.mymetadata → cim_for_mina/cim-server/.mymetadata
View File

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project-module <project-module
type="WEB" type="WEB"
name="ichat-server" name="cim-server"
id="myeclipse.1329027071311" id="myeclipse.1329027071311"
context-root="/ichat-server" context-root="/cim-server"
j2ee-spec="5.0" j2ee-spec="5.0"
archive="ichat-server.war"> archive="cim-server.war">
<attributes> <attributes>
<attribute name="webrootdir" value="WebRoot" /> <attribute name="webrootdir" value="WebRoot" />
</attributes> </attributes>

2
cim_for_mina/ichat-server/.project → cim_for_mina/cim-server/.project
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>ichat-server</name> <name>cim-server</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

0
cim_for_mina/ichat-server/.settings/org.eclipse.core.resources.prefs → cim_for_mina/cim-server/.settings/org.eclipse.core.resources.prefs
View File

0
cim_for_mina/ichat-server/WebRoot/META-INF/MANIFEST.MF → cim_for_mina/cim-server/WebRoot/META-INF/MANIFEST.MF
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/log4j.properties → cim_for_mina/cim-server/WebRoot/WEB-INF/classes/log4j.properties
View File

68
cim_for_mina/cim-server/WebRoot/WEB-INF/classes/spring-cim.xml Normal file
View File

@ -0,0 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tx="http://www.springframework.org/schema/tx"
xmlns:aop="http://www.springframework.org/schema/aop"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://www.springframework.org/schema/tx
http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
http://www.springframework.org/schema/aop
http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
"
>
<!-- =============================================================== -->
<!-- MINA -->
<!-- =============================================================== -->
<bean class="org.springframework.beans.factory.config.CustomEditorConfigurer">
<property name="customEditors">
<map>
<entry key="java.net.SocketAddress">
<bean class="org.apache.mina.integration.beans.InetSocketAddressEditor" />
</entry>
</map>
</property>
</bean>
<bean id="cimIoHandler" class="com.farsunset.cim.server.handler.CIMIoHandler" >
<property name="handlers">
<map>
<entry key="client_bind">
<bean class="com.farsunset.cim.handler.BindHandler" />
</entry>
<entry key="client_logout">
<bean class="com.farsunset.cim.handler.LogoutHandler" />
</entry>
<entry key="client_cimsession_closed">
<bean class="com.farsunset.cim.handler.SessionClosedHandler"/>
</entry>
<entry key="client_get_offline_message">
<bean class="com.farsunset.cim.handler.PushOfflineMessageHandler"/>
</entry>
</map>
</property>
</bean>
<bean id="CIMNioAcceptor" class="com.farsunset.cim.server.handler.CIMNioSocketAcceptor"
init-method="bind" destroy-method="unbind">
<property name="port" value="23456" />
<property name="ioHandler" ref="cimIoHandler" />
</bean>
<bean id="CIMSessionManager" class="com.farsunset.cim.server.session.DefaultSessionManager"/>
<!-- 集群服务器时 CIMSessionManager 配置
<bean id="CIMSessionManager" class="com.farsunset.lvxin.cim.session.ClusterSessionManager">
<property name="CIMSessionDao" ref="CIMSessionDaoImpl" />
</bean>
-->
</beans>

2
cim_for_mina/ichat-server/WebRoot/WEB-INF/classes/spring-config.xml → cim_for_mina/cim-server/WebRoot/WEB-INF/classes/spring-config.xml
View File

@ -12,5 +12,5 @@
http://www.springframework.org/schema/aop/spring-aop-2.5.xsd http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
" "
> >
<bean id="contextHolder" class="com.farsunset.ichat.common.util.ContextHolder"/> <bean id="contextHolder" class="com.farsunset.cim.util.ContextHolder"/>
</beans> </beans>

8
cim_for_mina/ichat-server/src/main/resource/spring-push.xml → cim_for_mina/cim-server/WebRoot/WEB-INF/classes/spring-push.xml
View File

@ -13,11 +13,11 @@
" "
> >
<bean id="messagePusher" class="com.farsunset.ichat.cim.push.DefaultMessagePusher"> <bean id="messagePusher" class="com.farsunset.cim.push.DefaultMessagePusher">
<property name="sessionManager" ref="defaultSessionManager"/> <property name="sessionManager" ref="CIMSessionManager"/>
</bean> </bean>
<bean id="systemMessagePusher" class="com.farsunset.ichat.cim.push.SystemMessagePusher"> <bean id="systemMessagePusher" class="com.farsunset.cim.push.SystemMessagePusher">
<property name="sessionManager" ref="defaultSessionManager"/> <property name="sessionManager" ref="CIMSessionManager"/>
</bean> </bean>
</beans> </beans>

4
cim_for_mina/ichat-server/src/main/resource/struts.xml → cim_for_mina/cim-server/WebRoot/WEB-INF/classes/struts.xml
View File

@ -10,12 +10,12 @@
<constant name="struts.multipart.saveDir" value="/tmp"/> <constant name="struts.multipart.saveDir" value="/tmp"/>
<constant name="struts.multipart.parser" value="jakarta"/> <constant name="struts.multipart.parser" value="jakarta"/>
<package name="admin" extends="struts-default" namespace="/admin"> <package name="admin" extends="struts-default" namespace="/admin">
<action name="session_*" class="com.farsunset.ichat.admin.action.SessionAction" method="{1}"> <action name="session_*" class="com.farsunset.cim.admin.action.SessionAction" method="{1}">
<result name="list" type="dispatcher">/console/session/manage.jsp</result> <result name="list" type="dispatcher">/console/session/manage.jsp</result>
</action> </action>
</package> </package>
<package name="cgi" extends="struts-default" namespace="/cgi"> <package name="cgi" extends="struts-default" namespace="/cgi">
<action name="message_*" class="com.farsunset.ichat.api.action.MessageAction" method="{1}"></action> <action name="message_*" class="com.farsunset.cim.api.action.MessageAction" method="{1}"></action>
</package> </package>
</struts> </struts>

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.aop-3.0.2.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.aop-3.0.2.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.asm-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.asm-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.beans-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.beans-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.context-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.context-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.core-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.core-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.expression-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.expression-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.jdbc-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.jdbc-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.orm-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.orm-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.transaction-3.0.2.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.transaction-3.0.2.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/Spring.web-3.0.2.RELEASE.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/Spring.web-3.0.2.RELEASE.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/antlr-2.7.6.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/antlr-2.7.6.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/asm.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/asm.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/aspectjweaver.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/aspectjweaver.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-fileupload-1.2.1.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/commons-fileupload-1.2.1.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-io-2.4.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/commons-io-2.4.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-lang-2.3.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/commons-lang-2.3.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/commons-logging-1.0.4.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/commons-logging-1.0.4.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/freemarker-2.3.15.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/freemarker-2.3.15.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/gson-2.1.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/gson-2.1.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/httpclient-4.3.4.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/httpclient-4.3.4.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/httpcore-4.3.2.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/httpcore-4.3.2.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/jstl-1.2.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/jstl-1.2.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/log4j.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/log4j.jar
View File

BIN
cim_for_mina/cim-server/WebRoot/WEB-INF/lib/mina-core-2.0.9.jar Normal file
View File

Binary file not shown.

BIN
cim_for_mina/cim-server/WebRoot/WEB-INF/lib/mina-integration-beans-2.0.9.jar Normal file
View File

Binary file not shown.

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/ognl-2.7.3.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/ognl-2.7.3.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/slf4j-api-1.7.5.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/slf4j-api-1.7.5.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/slf4j-nop-1.7.5.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/slf4j-nop-1.7.5.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/spring-context-support.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/spring-context-support.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/struts2-core-2.1.8.1.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/struts2-core-2.1.8.1.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/xstream-1.3.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/xstream-1.3.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/lib/xwork-core-2.1.6.jar → cim_for_mina/cim-server/WebRoot/WEB-INF/lib/xwork-core-2.1.6.jar
View File

0
cim_for_mina/ichat-server/WebRoot/WEB-INF/web.xml → cim_for_mina/cim-server/WebRoot/WEB-INF/web.xml
View File

0
cim_for_mina/ichat-server/WebRoot/console/header.jsp → cim_for_mina/cim-server/WebRoot/console/header.jsp
View File

0
cim_for_mina/ichat-server/WebRoot/console/index.jsp → cim_for_mina/cim-server/WebRoot/console/index.jsp
View File

0
cim_for_mina/ichat-server/WebRoot/console/nav.jsp → cim_for_mina/cim-server/WebRoot/console/nav.jsp
View File

8
cim_for_mina/ichat-server/WebRoot/console/session/manage.jsp → cim_for_mina/cim-server/WebRoot/console/session/manage.jsp
View File

@ -1,6 +1,6 @@
<%@ page language="java" pageEncoding="utf-8"%> <%@ page language="java" pageEncoding="utf-8"%>
<%@ page import="java.util.Collection"%> <%@ page import="java.util.Collection"%>
<%@ page import="com.farsunset.cim.nio.session.CIMSession"%> <%@ page import="com.farsunset.cim.server.session.CIMSession"%>
<% <%
String path = request.getContextPath(); String path = request.getContextPath();
String basePath = request.getScheme() + "://" String basePath = request.getScheme() + "://"
@ -56,7 +56,7 @@
function onImageError(obj) function onImageError(obj)
{ {
obj.src="<%=basePath%>/webclient/images/icon_head_default.png"; obj.src="<%=basePath%>/resource/img/icon.png";
} }
function openWebclient(){ function openWebclient(){
@ -92,6 +92,7 @@
<th width="4%">头像</th> <th width="4%">头像</th>
<th width="15%">账号</th> <th width="15%">账号</th>
<th width="10%">终端</th> <th width="10%">终端</th>
<th width="10%">应用版本</th>
<th width="10%">设备型号</th> <th width="10%">设备型号</th>
<th width="10%">在线时长</th> <th width="10%">在线时长</th>
<th width="28%">位置</th> <th width="28%">位置</th>
@ -117,6 +118,9 @@
<td> <td>
<%=ios.getChannel()%> <%=ios.getChannel()%>
</td> </td>
<td>
<%=ios.getClientVersion()==null?"":ios.getClientVersion()%>
</td>
<td> <td>
<%=ios.getDeviceModel()==null?"":ios.getDeviceModel()%> <%=ios.getDeviceModel()==null?"":ios.getDeviceModel()%>
</td> </td>

0
cim_for_mina/ichat-server/WebRoot/console/webclient/CIMBridge.swf → cim_for_mina/cim-server/WebRoot/console/webclient/CIMBridge.swf
View File

0
cim_for_mina/ichat-server/WebRoot/console/webclient/LoginDialog.jsp → cim_for_mina/cim-server/WebRoot/console/webclient/LoginDialog.jsp
View File

5
cim_for_mina/ichat-server/WebRoot/console/webclient/MessageDialog.jsp → cim_for_mina/cim-server/WebRoot/console/webclient/MessageDialog.jsp
View File

@ -4,10 +4,11 @@
style="display: none; width: 500px; position: absolute;min-height: 600px;box-shadow: 0 0 10px -2px #0B203A;top:50px;left:50px;"> style="display: none; width: 500px; position: absolute;min-height: 600px;box-shadow: 0 0 10px -2px #0B203A;top:50px;left:50px;">
<div class="panel-heading" style="height: 80px;background: #428bca;line-height: 80px;padding: 0 10px;"> <div class="panel-heading" style="height: 80px;background: #428bca;line-height: 80px;padding: 0 10px;">
消息列表 消息列表
<span id="current_account" style="color: white;float: right;font-weight: bold;"></span> <span id="current_account" style="color: white;float: right;font-weight: bold;"></span>
</div> </div>
<div style="text-align: center;padding: 10px;">
请调用接口，或者在后台页面，推送一条消息到客户端
</div>
<div class="panel-body" id="messageList"> <div class="panel-body" id="messageList">

0
cim_for_mina/ichat-server/WebRoot/console/webclient/cim.js → cim_for_mina/cim-server/WebRoot/console/webclient/cim.js
View File

0
cim_for_mina/ichat-server/WebRoot/console/webclient/dingdong.mp3 → cim_for_mina/cim-server/WebRoot/console/webclient/dingdong.mp3
View File

0
cim_for_mina/ichat-server/WebRoot/console/webclient/main.jsp → cim_for_mina/cim-server/WebRoot/console/webclient/main.jsp
View File

0
cim_for_mina/ichat-server/WebRoot/index.jsp → cim_for_mina/cim-server/WebRoot/index.jsp
View File

0
cim_for_mina/ichat-server/WebRoot/resource/bootstrap/css/bootstrap-theme.min.css → cim_for_mina/cim-server/WebRoot/resource/bootstrap/css/bootstrap-theme.min.css vendored
View File

Some files were not shown because too many files have changed in this diff Show More