Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整了代码结构

Browse Source
This commit is contained in:
wanggeng 2021-11-30 13:59:49 +08:00
parent 87a4d7270b
commit 186d3dcc68
27 changed files with 429 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/exception/BaseSocketException.java → basic-exception/src/main/java/ink/wgink/exceptions/websocket/BaseSocketException.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.instantmessage.websocket.exception;
package ink.wgink.exceptions.websocket;
/**
* When you feel like quitting. Think about why you started

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/exception/BodyException.java → basic-exception/src/main/java/ink/wgink/exceptions/websocket/BodyException.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.instantmessage.websocket.exception;
package ink.wgink.exceptions.websocket;
/**
* When you feel like quitting. Think about why you started

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/exception/CustomHandleException.java → basic-exception/src/main/java/ink/wgink/exceptions/websocket/CustomHandleException.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.instantmessage.websocket.exception;
package ink.wgink.exceptions.websocket;
/**
* @ClassName: CustomHandleException

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/exception/SessionException.java → basic-exception/src/main/java/ink/wgink/exceptions/websocket/SessionException.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.instantmessage.websocket.exception;
package ink.wgink.exceptions.websocket;
/**
* When you feel like quitting. Think about why you started

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/exception/TypeException.java → basic-exception/src/main/java/ink/wgink/exceptions/websocket/TypeException.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.instantmessage.websocket.exception;
package ink.wgink.exceptions.websocket;
/**
* When you feel like quitting. Think about why you started

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/exception/UserException.java → basic-exception/src/main/java/ink/wgink/exceptions/websocket/UserException.java
View File

@ -1,4 +1,4 @@
package ink.wgink.module.instantmessage.websocket.exception;
package ink.wgink.exceptions.websocket;
/**
* When you feel like quitting. Think about why you started

7
basic-interface/pom.xml
View File

@ -22,6 +22,13 @@
<artifactId>basic-pojo</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- netty start -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<scope>provided</scope>
</dependency>
<!-- netty end -->
</dependencies>

7
basic-interface/src/main/java/ink/wgink/interfaces/manager/IAppManager.java
View File

@ -41,4 +41,11 @@ public interface IAppManager {
* @return
*/
List<AppTokenUser> listCurrentUsers();
/**
* 设置redis token 管理器
*
* @param redisAppTokenManager
*/
void setRedisAppTokenManager(IRedisAppTokenManager redisAppTokenManager);
}

46
basic-interface/src/main/java/ink/wgink/interfaces/manager/IRedisAppTokenManager.java Normal file
View File

@ -0,0 +1,46 @@
package ink.wgink.interfaces.manager;
import ink.wgink.pojo.app.AppToken;
import ink.wgink.pojo.app.AppTokenUser;
import java.util.List;
/**
* @ClassName: IRedisAppTokenManager
* @Description: redis app token 管理
* @Author: wanggeng
* @Date: 2021/11/29 4:30 下午
* @Version: 1.0
*/
public interface IRedisAppTokenManager {
String TOKEN_HASH_KEY = "app:tokens";
/**
* 获取token
*
* @param token
* @return
*/
AppToken getToken(String token);
/**
* 添加token
*
* @param appToken
*/
void addToken(AppToken appToken);
/**
* app当前在线用户
*
* @return
*/
List<AppTokenUser> listCurrentUsers();
/**
* 清理超时token
* @param clearTokenKeys
*/
void clearTimeoutToken();
}

19
basic-interface/src/main/java/ink/wgink/interfaces/manager/IWebSocketChannelManager.java Normal file
View File

@ -0,0 +1,19 @@
package ink.wgink.interfaces.manager;
/**
* @ClassName: IWebSocketChannelManager
* @Description: websocket
* @Author: wanggeng
* @Date: 2021/11/29 5:56 下午
* @Version: 1.0
*/
public interface IWebSocketChannelManager {
/**
* 设置redis socket channel 管理器
*
* @param webSocketUserSessionManager
*/
void setWebSocketUserSessionManager(IWebSocketUserSessionManager webSocketUserSessionManager);
}

97
basic-interface/src/main/java/ink/wgink/interfaces/manager/IWebSocketUserSessionManager.java Normal file
View File

@ -0,0 +1,97 @@
package ink.wgink.interfaces.manager;
import ink.wgink.exceptions.websocket.SessionException;
import ink.wgink.pojo.session.WebSocketSession;
import io.netty.channel.Channel;
import java.util.List;
/**
* @ClassName: IRedisWebSocketChannelManager
* @Description: redis websocket channel 管理器
* @Author: wanggeng
* @Date: 2021/11/29 5:57 下午
* @Version: 1.0
*/
public interface IWebSocketUserSessionManager {
String CHANNEL_HASH_KEY = "websocket:channels";
/**
* 初始化
*
* @param userId
* @param sessionId
* @param clientName
*/
void init(String userId, String sessionId, String clientName);
/**
* 添加通道
*
* @param sessionId
* @param userId
* @param channel
* @return
* @throws SessionException
*/
WebSocketSession addChannel(String sessionId, String userId, Channel channel) throws SessionException;
/**
* 删除通道
*
* @param channel
*/
void removeChannel(Channel channel);
/**
* 在线会话列表
*
* @param userId 用户ID
* @return
*/
List<WebSocketSession> listOnlineUser(String userId);
/**
* 在线会话
*
* @param userId 用户ID
* @param clientName 客户端名称
* @return
*/
WebSocketSession getOnlineUser(String userId, String clientName);
/**
* 在线会话列表
*
* @param userIds 用户ID列表
* @return
*/
List<WebSocketSession> listOnlineUser(List<String> userIds);
/**
* 在线会话列表
*
* @param userIds 用户ID
* @param clientName 客户端名称
* @return
*/
List<WebSocketSession> listOnlineUser(List<String> userIds, String clientName);
/**
* 在线用户
*
* @param sessionId 会话ID
* @return
*/
WebSocketSession getOnlineUserBySessionId(String sessionId);
/**
* 通过通道获取用户
*
* @param channelId
* @return
*/
WebSocketSession getOnlineUserByChannelId(String channelId);
}

8
basic-pojo/pom.xml
View File

@ -96,6 +96,14 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<!-- wgink end -->
<!-- netty start -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<scope>provided</scope>
</dependency>
<!-- netty end -->
</dependencies>
</project>

5
basic-pojo/src/main/java/ink/wgink/pojo/app/AppToken.java
View File

@ -1,5 +1,7 @@
package ink.wgink.pojo.app;
import java.io.Serializable;
/**
* When you feel like quitting. Think about why you started
* 当你想要放弃的时候，想想当初你为何开始
@ -10,8 +12,9 @@ package ink.wgink.pojo.app;
* @Date: 2019-08-02 11:19
* @Version: 1.0
**/
public class AppToken {
public class AppToken implements Serializable {
private static final long serialVersionUID = 1338652146163739437L;
private String token;
private AppTokenTypeEnum appTokenTypeEnum;
private long lastTime;

4
basic-pojo/src/main/java/ink/wgink/pojo/app/AppTokenUser.java
View File

@ -1,5 +1,6 @@
package ink.wgink.pojo.app;
import java.io.Serializable;
import java.util.List;
/**
@ -12,8 +13,9 @@ import java.util.List;
* @Date: 2019-08-02 11:20
* @Version: 1.0
**/
public class AppTokenUser {
public class AppTokenUser implements Serializable {
private static final long serialVersionUID = -1803419036314192907L;
private String id;
private String name;
private String avatar;

5
basic-pojo/src/main/java/ink/wgink/pojo/app/AppTokenUserDepartment.java
View File

@ -1,5 +1,7 @@
package ink.wgink.pojo.app;
import java.io.Serializable;
/**
* When you feel like quitting. Think about why you started
* 当你想要放弃的时候，想想当初你为何开始
@ -10,8 +12,9 @@ package ink.wgink.pojo.app;
* @Date: 2019-08-10 14:21
* @Version: 1.0
**/
public class AppTokenUserDepartment {
public class AppTokenUserDepartment implements Serializable {
private static final long serialVersionUID = -4352969540408749470L;
private String departmentId;
private String departmentName;

5
basic-pojo/src/main/java/ink/wgink/pojo/app/AppTokenUserGroup.java
View File

@ -1,5 +1,7 @@
package ink.wgink.pojo.app;
import java.io.Serializable;
/**
* When you feel like quitting. Think about why you started
* 当你想要放弃的时候，想想当初你为何开始
@ -10,8 +12,9 @@ package ink.wgink.pojo.app;
* @Date: 2020/2/10 9:33 下午
* @Version: 1.0
**/
public class AppTokenUserGroup {
public class AppTokenUserGroup implements Serializable {
private static final long serialVersionUID = -4130999187990640889L;
private String groupId;
private String groupName;

5
basic-pojo/src/main/java/ink/wgink/pojo/app/AppTokenUserPosition.java
View File

@ -1,5 +1,7 @@
package ink.wgink.pojo.app;
import java.io.Serializable;
/**
* When you feel like quitting. Think about why you started
* 当你想要放弃的时候，想想当初你为何开始
@ -10,8 +12,9 @@ package ink.wgink.pojo.app;
* @Date: 2019-08-10 14:22
* @Version: 1.0
**/
public class AppTokenUserPosition {
public class AppTokenUserPosition implements Serializable {
private static final long serialVersionUID = -3348976168384827012L;
private String positionId;
private String positionName;

5
basic-pojo/src/main/java/ink/wgink/pojo/app/AppTokenUserRole.java
View File

@ -1,5 +1,7 @@
package ink.wgink.pojo.app;
import java.io.Serializable;
/**
* When you feel like quitting. Think about why you started
* 当你想要放弃的时候，想想当初你为何开始
@ -10,8 +12,9 @@ package ink.wgink.pojo.app;
* @Date: 2019-08-10 12:25
* @Version: 1.0
**/
public class AppTokenUserRole {
public class AppTokenUserRole implements Serializable {
private static final long serialVersionUID = 2153811587508975532L;
private String roleId;
private String roleName;

6
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/pojo/WebSocketSession.java → basic-pojo/src/main/java/ink/wgink/pojo/session/WebSocketSession.java
View File

@ -1,7 +1,9 @@
package ink.wgink.module.instantmessage.websocket.pojo;
package ink.wgink.pojo.session;
import io.netty.channel.Channel;
import java.io.Serializable;
/**
* @ClassName: WebSocketUser
* @Description: webSocket用户
@ -9,7 +11,7 @@ import io.netty.channel.Channel;
* @Date: 2021/9/11 11:28 下午
* @Version: 1.0
*/
public class WebSocketSession {
public class WebSocketSession implements Serializable {
/**
* 会话ID，登录时返回，socket注册时携带

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/IMessageService.java
View File

@ -4,7 +4,7 @@ import ink.wgink.module.instantmessage.pojo.bos.NoticeBO;
import ink.wgink.module.instantmessage.pojo.bos.NoticeTargetBO;
import ink.wgink.module.instantmessage.pojo.vos.NoticeSendVO;
import ink.wgink.module.instantmessage.pojo.vos.NoticeVO;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketSession;
import ink.wgink.pojo.session.WebSocketSession;
import java.util.List;

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/IWebSocketTextCustomService.java
View File

@ -1,6 +1,6 @@
package ink.wgink.module.instantmessage.service;
import ink.wgink.module.instantmessage.websocket.exception.CustomHandleException;
import ink.wgink.exceptions.websocket.CustomHandleException;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketClientMessage;
import io.netty.channel.Channel;

2
module-instant-message/src/main/java/ink/wgink/module/instantmessage/service/impl/MessageServiceImpl.java
View File

@ -15,7 +15,7 @@ import ink.wgink.module.instantmessage.service.INoticeService;
import ink.wgink.module.instantmessage.websocket.enums.MessageTypeEnum;
import ink.wgink.module.instantmessage.websocket.manager.WebSocketChannelManager;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketClientMessage;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketSession;
import ink.wgink.pojo.session.WebSocketSession;
import ink.wgink.module.instantmessage.websocket.pojo.body.CountNeedToDealWithBody;
import ink.wgink.module.instantmessage.websocket.pojo.body.NoticeBody;
import ink.wgink.pojo.dtos.user.UserDTO;

5
module-instant-message/src/main/java/ink/wgink/module/instantmessage/startup/WebSocketStartUp.java
View File

@ -1,5 +1,7 @@
package ink.wgink.module.instantmessage.startup;
import ink.wgink.interfaces.manager.IWebSocketUserSessionManager;
import ink.wgink.module.instantmessage.websocket.manager.WebSocketChannelManager;
import ink.wgink.module.instantmessage.websocket.server.WebSocketServer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
@ -18,9 +20,12 @@ public class WebSocketStartUp implements ApplicationRunner {
@Autowired
private WebSocketServer webSocketServer;
@Autowired
private IWebSocketUserSessionManager webSocketUserSessionManager;
@Override
public void run(ApplicationArguments args) throws Exception {
WebSocketChannelManager.getInstance().setWebSocketUserSessionManager(webSocketUserSessionManager);
new Thread(webSocketServer).start();
}

4
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/handler/text/WebSocketTextHandler.java
View File

@ -2,14 +2,14 @@ package ink.wgink.module.instantmessage.websocket.handler.text;
import com.alibaba.fastjson.JSONException;
import com.alibaba.fastjson.JSONObject;
import ink.wgink.exceptions.websocket.*;
import ink.wgink.module.instantmessage.service.IMessageService;
import ink.wgink.module.instantmessage.websocket.enums.MessageTypeEnum;
import ink.wgink.module.instantmessage.websocket.enums.StatusEnum;
import ink.wgink.module.instantmessage.websocket.exception.*;
import ink.wgink.module.instantmessage.service.IWebSocketTextCustomService;
import ink.wgink.module.instantmessage.websocket.manager.WebSocketChannelManager;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketClientMessage;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketSession;
import ink.wgink.pojo.session.WebSocketSession;
import ink.wgink.module.instantmessage.websocket.pojo.body.IdsBody;
import ink.wgink.module.instantmessage.websocket.pojo.body.RegisterBody;
import ink.wgink.module.instantmessage.websocket.pojo.body.StatusBody;

164
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/manager/DefaultWebSocketUserSessionManager.java Normal file
View File

@ -0,0 +1,164 @@
package ink.wgink.module.instantmessage.websocket.manager;
import ink.wgink.exceptions.websocket.SessionException;
import ink.wgink.interfaces.manager.IWebSocketUserSessionManager;
import ink.wgink.pojo.session.WebSocketSession;
import io.netty.channel.Channel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
* @ClassName: DefaultWebSocketChannelManager
* @Description: 默认websocket管理器
* @Author: wanggeng
* @Date: 2021/11/30 9:46 上午
* @Version: 1.0
*/
@Service
public class DefaultWebSocketUserSessionManager implements IWebSocketUserSessionManager {
private ConcurrentMap<String, List<WebSocketSession>> webSocketUserMap = new ConcurrentHashMap<>();
@Override
public void init(String userId, String sessionId, String clientName) {
WebSocketSession onlineUser = getOnlineUser(userId, clientName);
if (onlineUser == null) {
onlineUser = new WebSocketSession();
onlineUser.setUserId(userId);
onlineUser.setClientName(clientName);
// 更新到session队列中
List<WebSocketSession> webSocketSessions = listOnlineUser(userId);
webSocketSessions.add(onlineUser);
webSocketUserMap.put(userId, webSocketSessions);
}
// 更新最后时间
onlineUser.setSessionId(sessionId);
onlineUser.setUpdateTime(System.currentTimeMillis());
}
@Override
public WebSocketSession addChannel(String sessionId, String userId, Channel channel) throws SessionException {
WebSocketSession onlineUser = getOnlineUserBySessionId(sessionId);
if (onlineUser == null) {
throw new SessionException("无效会话，请登录");
}
if (!StringUtils.equals(userId, onlineUser.getUserId())) {
throw new SessionException("from错误");
}
// 更新会话通道
onlineUser.setChannel(channel);
onlineUser.setChannelId(channel.id().asLongText());
return onlineUser;
}
@Override
public void removeChannel(Channel channel) {
// 获取session
for (Map.Entry<String, List<WebSocketSession>> kv : webSocketUserMap.entrySet()) {
List<WebSocketSession> webSocketSessions = kv.getValue();
for (int i = 0; i < webSocketSessions.size(); i++) {
WebSocketSession webSocketSession = webSocketSessions.get(i);
if (StringUtils.equals(webSocketSession.getChannelId(), channel.id().asLongText())) {
webSocketSessions.remove(i);
return;
}
}
}
}
@Override
public List<WebSocketSession> listOnlineUser(String userId) {
if (StringUtils.isBlank(userId)) {
return new ArrayList<>();
}
List<WebSocketSession> webSocketSessions = webSocketUserMap.get(userId);
if (webSocketSessions == null) {
return new ArrayList<>();
}
return webSocketSessions;
}
@Override
public WebSocketSession getOnlineUser(String userId, String clientName) {
if (StringUtils.isBlank(userId) || StringUtils.isBlank(clientName)) {
return null;
}
List<WebSocketSession> webSocketSessions = listOnlineUser(userId);
if (webSocketSessions.isEmpty()) {
return null;
}
for (WebSocketSession webSocketSession : webSocketSessions) {
if (StringUtils.equals(clientName, webSocketSession.getClientName())) {
return webSocketSession;
}
}
return null;
}
@Override
public List<WebSocketSession> listOnlineUser(List<String> userIds) {
if (userIds == null || userIds.isEmpty()) {
return new ArrayList<>();
}
List<WebSocketSession> webSocketSessions = new ArrayList<>();
for (String userId : userIds) {
List<WebSocketSession> users = webSocketUserMap.get(userId);
if (users != null) {
webSocketSessions.addAll(users);
}
}
return webSocketSessions;
}
@Override
public List<WebSocketSession> listOnlineUser(List<String> userIds, String clientName) {
if (userIds == null || userIds.isEmpty() || StringUtils.isBlank(clientName)) {
return new ArrayList<>();
}
List<WebSocketSession> webSocketSessions = new ArrayList<>();
for (String userId : userIds) {
List<WebSocketSession> users = webSocketUserMap.get(userId);
if (users == null) {
continue;
}
for (WebSocketSession user : users) {
if (StringUtils.equals(clientName, user.getClientName())) {
webSocketSessions.add(user);
}
}
}
return webSocketSessions;
}
@Override
public WebSocketSession getOnlineUserBySessionId(String sessionId) {
for (Map.Entry<String, List<WebSocketSession>> kv : webSocketUserMap.entrySet()) {
for (WebSocketSession webSocketSession : kv.getValue()) {
if (StringUtils.equals(sessionId, webSocketSession.getSessionId())) {
return webSocketSession;
}
}
}
return null;
}
@Override
public WebSocketSession getOnlineUserByChannelId(String channelId) {
for (Map.Entry<String, List<WebSocketSession>> kv : webSocketUserMap.entrySet()) {
for (WebSocketSession webSocketSession : kv.getValue()) {
if (StringUtils.equals(channelId, webSocketSession.getChannelId())) {
return webSocketSession;
}
}
}
return null;
}
}

136
module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/manager/WebSocketChannelManager.java
View File

@ -1,21 +1,18 @@
package ink.wgink.module.instantmessage.websocket.manager;
import com.alibaba.fastjson.JSONObject;
import ink.wgink.module.instantmessage.websocket.exception.SessionException;
import ink.wgink.exceptions.websocket.SessionException;
import ink.wgink.interfaces.manager.IWebSocketUserSessionManager;
import ink.wgink.interfaces.manager.IWebSocketChannelManager;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketClientMessage;
import ink.wgink.module.instantmessage.websocket.pojo.WebSocketSession;
import ink.wgink.pojo.session.WebSocketSession;
import io.netty.channel.Channel;
import io.netty.channel.group.ChannelGroup;
import io.netty.channel.group.DefaultChannelGroup;
import io.netty.handler.codec.http.websocketx.TextWebSocketFrame;
import io.netty.util.concurrent.GlobalEventExecutor;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
/**
* @ClassName: WebSocketChannelManager
@ -24,14 +21,13 @@ import java.util.concurrent.ConcurrentMap;
* @Date: 2021/9/11 11:56 上午
* @Version: 1.0
*/
public class WebSocketChannelManager {
public class WebSocketChannelManager implements IWebSocketChannelManager {
public static final String FORM_SYSTEM = "SYSTEM";
private static final WebSocketChannelManager webSocketChannelManager = WebSocketChannelManagerBuilder.webSocketChannelManager;
private ChannelGroup globalGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
private ConcurrentMap<String, List<WebSocketSession>> webSocketUserMap = new ConcurrentHashMap<>();
private IWebSocketUserSessionManager webSocketUserSessionManager;
private WebSocketChannelManager() {
}
private WebSocketChannelManager() {}
public static WebSocketChannelManager getInstance() {
return webSocketChannelManager;
@ -45,23 +41,12 @@ public class WebSocketChannelManager {
* @param clientName 客户端名称
*/
public void init(String userId, String sessionId, String clientName) {
WebSocketSession onlineUser = getOnlineUser(userId, clientName);
if (onlineUser == null) {
onlineUser = new WebSocketSession();
onlineUser.setUserId(userId);
onlineUser.setClientName(clientName);
// 更新到session队列中
List<WebSocketSession> webSocketSessions = listOnlineUser(userId);
webSocketSessions.add(onlineUser);
webSocketUserMap.put(userId, webSocketSessions);
}
// 更新最后时间
onlineUser.setSessionId(sessionId);
onlineUser.setUpdateTime(System.currentTimeMillis());
webSocketUserSessionManager.init(userId, sessionId, clientName);
}
/**
* 添加通道，绑定通道与会话
*
* @param sessionId
* @param userId
* @param channel
@ -69,32 +54,19 @@ public class WebSocketChannelManager {
* @throws SessionException
*/
public WebSocketSession addChannel(String sessionId, String userId, Channel channel) throws SessionException {
WebSocketSession onlineUser = getOnlineUserBySessionId(sessionId);
if (onlineUser == null) {
throw new SessionException("无效会话，请登录");
}
if (!StringUtils.equals(userId, onlineUser.getUserId())) {
throw new SessionException("from错误");
}
// 更新会话通道
onlineUser.setChannel(channel);
onlineUser.setChannelId(channel.id().asLongText());
WebSocketSession onlineUser = webSocketUserSessionManager.addChannel(sessionId, userId, channel);
globalGroup.add(channel);
return onlineUser;
}
/**
* 删除通道
*
* @param channel
*/
public void removeChannel(Channel channel) {
webSocketUserSessionManager.removeChannel(channel);
globalGroup.remove(channel);
for (Map.Entry<String, List<WebSocketSession>> kv : webSocketUserMap.entrySet()) {
List<WebSocketSession> webSocketSessions = kv.getValue();
for (int i = 0; i < webSocketSessions.size(); i++) {
WebSocketSession webSocketSession = webSocketSessions.get(i);
if (StringUtils.equals(webSocketSession.getChannelId(), channel.id().asLongText())) {
webSocketSessions.remove(i);
return;
}
}
}
}
/**
@ -104,17 +76,9 @@ public class WebSocketChannelManager {
* @return
*/
public List<WebSocketSession> listOnlineUser(String userId) {
if (StringUtils.isBlank(userId)) {
return new ArrayList<>();
}
List<WebSocketSession> webSocketSessions = webSocketUserMap.get(userId);
if (webSocketSessions == null) {
return new ArrayList<>();
}
return webSocketSessions;
return webSocketUserSessionManager.listOnlineUser(userId);
}
/**
* 获取在线用户
*
@ -123,19 +87,7 @@ public class WebSocketChannelManager {
* @return
*/
public WebSocketSession getOnlineUser(String userId, String clientName) {
if (StringUtils.isBlank(userId) || StringUtils.isBlank(clientName)) {
return null;
}
List<WebSocketSession> webSocketSessions = listOnlineUser(userId);
if (webSocketSessions.isEmpty()) {
return null;
}
for (WebSocketSession webSocketSession : webSocketSessions) {
if (StringUtils.equals(clientName, webSocketSession.getClientName())) {
return webSocketSession;
}
}
return null;
return webSocketUserSessionManager.getOnlineUser(userId, clientName);
}
/**
@ -145,17 +97,7 @@ public class WebSocketChannelManager {
* @return
*/
public List<WebSocketSession> listOnlineUser(List<String> userIds) {
if (userIds == null || userIds.isEmpty()) {
return new ArrayList<>();
}
List<WebSocketSession> webSocketSessions = new ArrayList<>();
for (String userId : userIds) {
List<WebSocketSession> users = webSocketUserMap.get(userId);
if (users != null) {
webSocketSessions.addAll(users);
}
}
return webSocketSessions;
return webSocketUserSessionManager.listOnlineUser(userIds);
}
/**
@ -166,22 +108,7 @@ public class WebSocketChannelManager {
* @return
*/
public List<WebSocketSession> listOnlineUser(List<String> userIds, String clientName) {
if (userIds == null || userIds.isEmpty() || StringUtils.isBlank(clientName)) {
return new ArrayList<>();
}
List<WebSocketSession> webSocketSessions = new ArrayList<>();
for (String userId : userIds) {
List<WebSocketSession> users = webSocketUserMap.get(userId);
if (users == null) {
continue;
}
for (WebSocketSession user : users) {
if (StringUtils.equals(clientName, user.getClientName())) {
webSocketSessions.add(user);
}
}
}
return webSocketSessions;
return webSocketUserSessionManager.listOnlineUser(userIds, clientName);
}
/**
@ -191,14 +118,7 @@ public class WebSocketChannelManager {
* @return
*/
private WebSocketSession getOnlineUserBySessionId(String sessionId) {
for (Map.Entry<String, List<WebSocketSession>> kv : webSocketUserMap.entrySet()) {
for (WebSocketSession webSocketSession : kv.getValue()) {
if (StringUtils.equals(sessionId, webSocketSession.getSessionId())) {
return webSocketSession;
}
}
}
return null;
return webSocketUserSessionManager.getOnlineUserBySessionId(sessionId);
}
/**
@ -208,14 +128,7 @@ public class WebSocketChannelManager {
* @return
*/
private WebSocketSession getOnlineUserByChannelId(String channelId) {
for (Map.Entry<String, List<WebSocketSession>> kv : webSocketUserMap.entrySet()) {
for (WebSocketSession webSocketSession : kv.getValue()) {
if (StringUtils.equals(channelId, webSocketSession.getChannelId())) {
return webSocketSession;
}
}
}
return null;
return webSocketUserSessionManager.getOnlineUserByChannelId(channelId);
}
/**
@ -253,6 +166,11 @@ public class WebSocketChannelManager {
}
}
@Override
public void setWebSocketUserSessionManager(IWebSocketUserSessionManager webSocketUserSessionManager) {
this.webSocketUserSessionManager = webSocketUserSessionManager;
}
private static class WebSocketChannelManagerBuilder {
public static final WebSocketChannelManager webSocketChannelManager = new WebSocketChannelManager();
}

12
pom.xml
View File

@ -41,6 +41,7 @@
<module>login-oauth2-client</module>
<module>module-oauth2-client</module>
<module>mongo-module-dictionary</module>
<module>redis-cache</module>
</modules>
<packaging>pom</packaging>
@ -70,9 +71,9 @@
<commonLang3.version>3.4</commonLang3.version>
<common-io.version>2.11.0</common-io.version>
<common-net.version>3.3</common-net.version>
<common-compress>1.18</common-compress>
<common-fileupload.version>1.3.1</common-fileupload.version>
<common-codec.version>1.12</common-codec.version>
<common-compress>1.18</common-compress>
<common-beanutils.version>1.9.4</common-beanutils.version>
<httpclient.version>4.5.13</httpclient.version>
<saaj.version>1.3.18</saaj.version>
@ -92,6 +93,7 @@
<xmlgraphics.version>1.10</xmlgraphics.version>
<minio.version>7.0.2</minio.version>
<mongo.version>3.2.5</mongo.version>
<redis.version>2.5.5</redis.version>
<freemarker.version>2.3.31</freemarker.version>
</properties>
@ -521,6 +523,14 @@
</dependency>
<!-- mongo end -->
<!-- redis start -->
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>${redis.version}</version>
</dependency>
<!-- redis end -->
<!-- freemarker start -->
<dependency>
<groupId>org.freemarker</groupId>