diff --git a/3.6.0.VERSION b/3.7.0.VERSION
similarity index 100%
rename from 3.6.0.VERSION
rename to 3.7.0.VERSION
diff --git a/README.md b/README.md
index a5cd0f7..be791ea 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
#### 项目介绍
-CIM是基于mina和netty框架下的推送系统，我们平常使用第三方的推送SDK，如极光推送，百度推送，小米推送，以及腾讯信鸽等来支撑自己的移动端的业务，或许有一些用户自己实现即时通讯系统的需求，那么CIM为您提供了一个解决方案或者思路，目前CIM支撑 websocket，android，ios，桌面应用，系统应用等多端接入支持，目前CIM服务端使用springboot搭建仅仅拥有消息推送的功能，关于数据缓存与持久化都需要使用者自己开发，但是配备了比较完整的使用文档。最后希望CIM能为您带来一些价值。
+CIM是基于mina或者netty框架下的推送系统，我们平常使用第三方的推送SDK，如极光推送，百度推送，小米推送，以及腾讯信鸽等来支撑自己的移动端的业务，或许有一些用户自己实现即时通讯系统的需求，那么CIM为您提供了一个解决方案或者思路，目前CIM支撑 websocket，android，ios，桌面应用，系统应用等多端接入支持，目前CIM服务端使用springboot搭建仅仅拥有消息推送的功能，关于数据缓存与持久化都需要使用者自己开发，但是配备了比较完整的使用文档。最后希望CIM能为您带来一些价值。
---
## 相关项目
@@ -14,16 +14,13 @@ CIM是基于mina和netty框架下的推送系统，我们平常使用第三方
---
#### 目录说明
+1.cim-use-examples是各个客户端使用示例
+2.cim-client-sdk 是各个客户端的SDK源码
+3.cim-server-sdk 是服务端SDK源码,分为 mina和netty 两个版本，二者任选其一
+4.cim-boot-server是springboot服务端工程源码,使用Idea工具开发
+
+其中所有的sdk均为Eclipse工程，打包成jar导出引入到对应的客户端或服务端工程
-1. cim_for_mina目录下为mina版本实现
-2. cim_for_netty目录下为netty版本实现
-3. doc目录中是相关使用文档，以及protubuf结构体文件
-5. cim-android-sdk 是android客户端封装的的jar包
-6. cim-java-sdk 是java版客户端封装的的jar包
-7. cim-server-sdk 是cim-boot-server 用到的封装的jar
-8. cim-boot-server是springboot服务端工程，是intellij idea基于gradle构建
-9. cim-client-android 是android客户端 android studio工具
-10. 说明.txt是服务端环境搭建说明
#### 建议反馈
@@ -59,7 +56,18 @@ CIM是基于mina和netty框架下的推送系统，我们平常使用第三方
3.消息的id字段名由mid修改为id，类型由String修改为long;
-
+-------------------------------------------------------------------------------------------
+版本:3.7.0/时间:2019-05-13
+
+1.服务端cim-boot-server修改为idea maven工程
+
+2.android sdk优化升级，去除mina或netty相关包的依赖
+
+3.java sdk优化升级，去除mina或netty相关包的依赖
+
+4.新增web sdk，可以由index.html快速启动demo
+
+5.修正文档中一些疏漏
diff --git a/cim-boot-server/cim-boot-server.iml b/cim-boot-server/cim-boot-server.iml
new file mode 100644
index 0000000..8e0a218
--- /dev/null
+++ b/cim-boot-server/cim-boot-server.iml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cim-boot-server/cim-boot-server.ipr b/cim-boot-server/cim-boot-server.ipr
new file mode 100644
index 0000000..fcbe79d
--- /dev/null
+++ b/cim-boot-server/cim-boot-server.ipr
@@ -0,0 +1,640 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cim-boot-server/cim-boot-server.iws b/cim-boot-server/cim-boot-server.iws
new file mode 100644
index 0000000..d186739
--- /dev/null
+++ b/cim-boot-server/cim-boot-server.iws
@@ -0,0 +1,321 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ CIMWebBridge
+
+
+ CIMPushManager
+
+
+ C:\Users\Administrator\Documents\cim\cim-boot-server\src\main\resources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1557734989980
+
+
+ 1557734989980
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.8
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cim_for_mina/cim-boot-server/libs/cim-server-sdk-3.6.jar b/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar
similarity index 60%
rename from cim_for_mina/cim-boot-server/libs/cim-server-sdk-3.6.jar
rename to cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar
index 8d2c84a..3802b34 100644
Binary files a/cim_for_mina/cim-boot-server/libs/cim-server-sdk-3.6.jar and b/cim-boot-server/lib/cim-server-sdk-mina-3.7.0.jar differ
diff --git a/cim_for_netty/cim-boot-server/libs/cim-server-sdk-3.6.jar b/cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar
similarity index 87%
rename from cim_for_netty/cim-boot-server/libs/cim-server-sdk-3.6.jar
rename to cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar
index 1041428..25d3fc3 100644
Binary files a/cim_for_netty/cim-boot-server/libs/cim-server-sdk-3.6.jar and b/cim-boot-server/lib/cim-server-sdk-netty-3.7.0.jar differ
diff --git a/cim-boot-server/pom.xml b/cim-boot-server/pom.xml
new file mode 100644
index 0000000..63679e9
--- /dev/null
+++ b/cim-boot-server/pom.xml
@@ -0,0 +1,140 @@
+
+
+ 4.0.0
+
+ com.farsunset
+ cim-boot-server
+ 1.0.0
+
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 2.1.4.RELEASE
+
+
+
+
+ 1.8
+ 4.1.35.Final
+ 2.0.21
+ 3.7.0
+
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-freemarker
+
+
+
+ com.farsunset
+ cim-server-sdk
+ 3.7
+ system
+
+ ${project.basedir}/lib/cim-server-sdk-mina-3.7.0.jar
+
+
+
+
+
+ org.apache.mina
+ mina-core
+ ${mina.version}
+
+
+
+
+
+
+ io.netty
+ netty-handler
+ ${netty.version}
+
+
+ io.netty
+ netty-buffer
+ ${netty.version}
+
+
+ io.netty
+ netty-codec
+ ${netty.version}
+
+
+ io.netty
+ netty-codec-http
+ ${netty.version}
+
+
+ io.netty
+ netty-common
+ ${netty.version}
+
+
+ io.netty
+ netty-transport
+ ${netty.version}
+
+
+
+
+
+
+ com.google.protobuf
+ protobuf-java
+ ${protobuf.version}
+
+
+
+ cn.teaey.apns4j
+ apns4j
+ 1.1.4
+
+
+
+ commons-io
+ commons-io
+ 2.6
+
+
+
+ org.apache.commons
+ commons-lang3
+ 3.8.1
+
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+ true
+
+
+
+
+
+
+
+ spring-releases
+ Spring Releases
+ https://repo.spring.io/release
+
+
+
+
\ No newline at end of file
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java b/cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java
similarity index 84%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java
index 28d36b9..73da78d 100644
--- a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/CIMConfig.java
@@ -6,6 +6,7 @@ import java.util.HashMap;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
@@ -16,6 +17,7 @@ import com.farsunset.cim.handler.SessionClosedHandler;
import com.farsunset.cim.sdk.server.handler.CIMNioSocketAcceptor;
import com.farsunset.cim.sdk.server.handler.CIMRequestHandler;
import com.farsunset.cim.sdk.server.model.SentBody;
+import com.farsunset.cim.service.CIMSessionService;
import com.farsunset.cim.sdk.server.model.CIMSession;
@Configuration
@@ -54,6 +56,17 @@ public class CIMConfig implements CIMRequestHandler {
nioSocketAcceptor.bind();
return nioSocketAcceptor;
}
+
+ /**
+ *
+ * @param memorySessionService 默认使用内存管理方案
+ * @return
+ */
+ @Bean("cimSessionService")
+ public CIMSessionService getCIMSessionService(@Qualifier("memorySessionService") CIMSessionService cimSessionService) {
+ return cimSessionService;
+
+ }
@Override
public void process(CIMSession session, SentBody body) {
diff --git a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java b/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
similarity index 80%
rename from cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
index e274c69..29783de 100644
--- a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/ServerLauncher.java
@@ -21,12 +21,9 @@
*/
package com.farsunset.cim;
-import java.lang.reflect.Modifier;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
@@ -36,11 +33,6 @@ import org.springframework.boot.autoconfigure.webservices.WebServicesAutoConfigu
import org.springframework.boot.autoconfigure.websocket.reactive.WebSocketReactiveAutoConfiguration;
import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketMessagingAutoConfiguration;
import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketServletAutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.converter.json.GsonHttpMessageConverter;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
/**
*
@@ -59,21 +51,7 @@ import com.google.gson.GsonBuilder;
JacksonAutoConfiguration.class })
public class ServerLauncher {
-
public static void main(String[] args) {
SpringApplication.run(ServerLauncher.class, args);
}
-
-
- @Bean
- @ConditionalOnMissingBean
- public GsonHttpMessageConverter gsonHttpMessageConverter(Gson gson) {
- GsonHttpMessageConverter converter = new GsonHttpMessageConverter();
- gson = new GsonBuilder()
- .excludeFieldsWithModifiers(Modifier.PROTECTED | Modifier.TRANSIENT | Modifier.FINAL | Modifier.STATIC)
- .create();
- converter.setGson(gson);
- return converter;
- }
-
}
\ No newline at end of file
diff --git a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
similarity index 92%
rename from cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
index 5803070..53f4960 100644
--- a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/NavigationController.java
@@ -35,9 +35,9 @@ public class NavigationController {
return model;
}
- @RequestMapping(value = "/webclient/main.action", method = RequestMethod.GET)
+ @RequestMapping(value = "/webclient", method = RequestMethod.GET)
public ModelAndView webclient(ModelAndView model) {
- model.setViewName("console/webclient/main");
+ model.setViewName("console/webclient/index");
return model;
}
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
similarity index 90%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
index 74b1c00..ecf240b 100644
--- a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/admin/controller/SessionController.java
@@ -34,11 +34,11 @@ import com.farsunset.cim.service.CIMSessionService;
public class SessionController {
@Resource
- private CIMSessionService memorySessionService;
+ private CIMSessionService cimSessionService;
- @RequestMapping(value = "/list.action")
+ @RequestMapping(value = "/list")
public String list(Model model) {
- model.addAttribute("sessionList", memorySessionService.list());
+ model.addAttribute("sessionList", cimSessionService.list());
return "console/session/manage";
}
}
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/api/controller/MessageController.java
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/BaseResult.java
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/MessageResult.java b/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/MessageResult.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/MessageResult.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/api/controller/dto/MessageResult.java
diff --git a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java b/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
similarity index 96%
rename from cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
index da7e908..d684c48 100644
--- a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/handler/BindHandler.java
@@ -51,7 +51,7 @@ public class BindHandler implements CIMRequestHandler {
protected final Logger logger = LoggerFactory.getLogger(BindHandler.class);
@Resource
- private CIMSessionService memorySessionService;
+ private CIMSessionService cimSessionService;
@Value("${server.host}")
private String host;
@@ -80,7 +80,7 @@ public class BindHandler implements CIMRequestHandler {
/*
* 由于客户端断线服务端可能会无法获知的情况，客户端重连时，需要关闭旧的连接
*/
- CIMSession oldSession = memorySessionService.get(account);
+ CIMSession oldSession = cimSessionService.get(account);
/*
* 如果是账号已经在另一台终端登录。则让另一个终端下线
@@ -100,7 +100,7 @@ public class BindHandler implements CIMRequestHandler {
closeQuietly(oldSession);
}
- memorySessionService.save(newSession);
+ cimSessionService.save(newSession);
} catch (Exception e) {
diff --git a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java b/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
similarity index 93%
rename from cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
index c41b547..641c866 100644
--- a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/handler/SessionClosedHandler.java
@@ -48,7 +48,7 @@ public class SessionClosedHandler implements CIMRequestHandler {
protected final Logger logger = LoggerFactory.getLogger(SessionClosedHandler.class);
@Resource
- private CIMSessionService memorySessionService;
+ private CIMSessionService cimSessionService;
public void process(CIMSession ios, SentBody message) {
Object quietly = ios.getAttribute(CIMConstant.KEY_QUIETLY_CLOSE);
@@ -61,7 +61,7 @@ public class SessionClosedHandler implements CIMRequestHandler {
return;
}
- CIMSession oldSession = memorySessionService.get(account.toString());
+ CIMSession oldSession = cimSessionService.get(account.toString());
if (oldSession == null || oldSession.isApnsOpend()) {
return;
@@ -69,7 +69,7 @@ public class SessionClosedHandler implements CIMRequestHandler {
oldSession.setState(CIMSession.STATE_DISABLED);
oldSession.setNid(null);
- memorySessionService.save(oldSession);
+ cimSessionService.save(oldSession);
}
}
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/push/CIMMessagePusher.java b/cim-boot-server/src/main/java/com/farsunset/cim/push/CIMMessagePusher.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/push/CIMMessagePusher.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/push/CIMMessagePusher.java
diff --git a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java b/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
similarity index 95%
rename from cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
index e0e49bc..e95e0e9 100644
--- a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/push/DefaultMessagePusher.java
@@ -44,7 +44,7 @@ public class DefaultMessagePusher implements CIMMessagePusher {
private String host;
@Resource
- private CIMSessionService memorySessionService;
+ private CIMSessionService cimSessionService;
@@ -58,7 +58,7 @@ public class DefaultMessagePusher implements CIMMessagePusher {
* @param msg
*/
public void push(Message message) {
- CIMSession session = memorySessionService.get(message.getReceiver());
+ CIMSession session = cimSessionService.get(message.getReceiver());
if(session == null) {
return;
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java b/cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/push/SystemMessagePusher.java
diff --git a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/service/ApnsService.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/ApnsService.java
similarity index 95%
rename from cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/service/ApnsService.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/service/ApnsService.java
index 39e8acf..127c4d2 100644
--- a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/service/ApnsService.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/service/ApnsService.java
@@ -25,5 +25,5 @@ import com.farsunset.cim.sdk.server.model.Message;
public interface ApnsService {
- void push( Message message, String deviceToken);
+ void push(Message message, String deviceToken);
}
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/service/CIMSessionService.java
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java
similarity index 99%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java
index d6beb00..645df62 100644
--- a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/ClusterSessionServiceImpl.java
@@ -46,6 +46,7 @@ public class ClusterSessionServiceImpl implements CIMSessionService {
@Override
public void save(CIMSession session) {
+
}
@Override
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/service/impl/JavaApnsServiceImpl.java
diff --git a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
similarity index 95%
rename from cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
index 57ba29c..200b264 100644
--- a/cim_for_netty/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
+++ b/cim-boot-server/src/main/java/com/farsunset/cim/service/impl/MemorySessionServiceImpl.java
@@ -42,6 +42,10 @@ public class MemorySessionServiceImpl implements CIMSessionService {
@Override
public void save(CIMSession session) {
+ if(session.getState() == CIMSession.STATE_DISABLED ) {
+ remove(session.getAccount());
+ return;
+ }
sessionMap.put(session.getAccount(), session);
}
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java b/cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/util/ApnsPayloadCompat.java
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java b/cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/util/Constants.java
diff --git a/cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java b/cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java
rename to cim-boot-server/src/main/java/com/farsunset/cim/util/StringUtil.java
diff --git a/cim_for_mina/cim-boot-server/src/main/resources/application.properties b/cim-boot-server/src/main/resources/application.properties
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/resources/application.properties
rename to cim-boot-server/src/main/resources/application.properties
diff --git a/cim_for_mina/cim-boot-server/src/main/resources/i18n/messages.properties b/cim-boot-server/src/main/resources/i18n/messages.properties
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/resources/i18n/messages.properties
rename to cim-boot-server/src/main/resources/i18n/messages.properties
diff --git a/cim_for_mina/cim-boot-server/src/main/resources/page/console/header.html b/cim-boot-server/src/main/resources/page/console/header.html
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/resources/page/console/header.html
rename to cim-boot-server/src/main/resources/page/console/header.html
diff --git a/cim_for_mina/cim-boot-server/src/main/resources/page/console/index.html b/cim-boot-server/src/main/resources/page/console/index.html
similarity index 100%
rename from cim_for_mina/cim-boot-server/src/main/resources/page/console/index.html
rename to cim-boot-server/src/main/resources/page/console/index.html
diff --git a/cim_for_netty/cim-boot-server/src/main/resources/page/console/nav.html b/cim-boot-server/src/main/resources/page/console/nav.html
similarity index 79%
rename from cim_for_netty/cim-boot-server/src/main/resources/page/console/nav.html
rename to cim-boot-server/src/main/resources/page/console/nav.html
index afda0c3..dd2630a 100644
--- a/cim_for_netty/cim-boot-server/src/main/resources/page/console/nav.html
+++ b/cim-boot-server/src/main/resources/page/console/nav.html
@@ -2,13 +2,13 @@
<@spring.message "module.console.menu.onlineuser"/>
diff --git a/cim_for_netty/cim-boot-server/src/main/resources/page/console/session/manage.html b/cim-boot-server/src/main/resources/page/console/session/manage.html
similarity index 98%
rename from cim_for_netty/cim-boot-server/src/main/resources/page/console/session/manage.html
rename to cim-boot-server/src/main/resources/page/console/session/manage.html
index ce4feda..232ad7d 100644
--- a/cim_for_netty/cim-boot-server/src/main/resources/page/console/session/manage.html
+++ b/cim-boot-server/src/main/resources/page/console/session/manage.html
@@ -65,7 +65,7 @@ function doSendMessage(){
<#list sessionList as cimsession>
+ 请输入一个帐号用于登录，随后接收推送消息++ + ++ ++++ ++