Skip to content

S
SiEn
Commit 824eb260 by zhangjw
Options

1:类拆分 细节调整 完善

parent 66908976
Showing with 171 additions and 171 deletions
customer-service/src/main/java/com/ym/im/entity/base/BaseSocketInfo.java
...@@ -23,4 +23,8 @@ public class BaseSocketInfo implements Serializable { ...@@ -23,4 +23,8 @@ public class BaseSocketInfo implements Serializable {
public void writeAndFlush(Object object) { public void writeAndFlush(Object object) {
channel.writeAndFlush(object); channel.writeAndFlush(object);
} }
public void close() {
channel.close();
}
} }
customer-service/src/main/java/com/ym/im/entity/base/ChannelAttributeKey.java 0 → 100644
package com.ym.im.entity.base;
import io.netty.util.AttributeKey;
/**
* @author: JJww
* @Date:2020/10/13
*/
public class ChannelAttributeKey {
/**
* 角色 用户ID
*/
public static final AttributeKey<Long> ROLE_ID = AttributeKey.valueOf("role_Id");
/**
* 角色类型
*/
public static final AttributeKey<String> ROLE_TYPE = AttributeKey.valueOf("role_type");
/**
* 当前token
*/
public static final AttributeKey<String> TOKEN_INFO = AttributeKey.valueOf("token");
/**
* 客户端当前语言
*/
public static final AttributeKey<String> COL_INFO = AttributeKey.valueOf("col");
}
customer-service/src/main/java/com/ym/im/entity/base/NettyConstant.java
package com.ym.im.entity.base; package com.ym.im.entity.base;
import io.netty.util.AttributeKey;
/** /**
* @author: JJww * @author: JJww
* @Date:2019-05-17 * @Date:2019-05-17
*/ */
public class NettyConstant { public class NettyConstant {
/**
* ID
*/
public static final AttributeKey<Long> ID = AttributeKey.valueOf("id");
/**
* 用户(0) or 客服(1)
*/
public static final AttributeKey<Integer> TYPE = AttributeKey.valueOf("type");
/**
* 客服ID
*/
public static final AttributeKey<Long> STAFF_ID = AttributeKey.valueOf("staff");
/**
* 当前token
*/
public static final AttributeKey<String> TOKEN_INFO = AttributeKey.valueOf("token");
/**
* 客户端当前语言
*/
public static final AttributeKey<String> COL_INFO = AttributeKey.valueOf("col");
/**
* 连接类型：用户
*/
public static final int CONNECT_TYPE_USER = 0;
/**
* 连接类型：客服
*/
public static final int CONNECT_TYPE_STAFF = 1;
/** /**
* websocket标识 * websocket标识
*/ */
public static final String CS = "/cs"; public static final String CS = "/cs";
/** /**
* 用户 ws标识
*/
public static final String USER_WS = "app";
/**
* 客服 ws标识
*/
public static final String STAFF_WS = "web";
/**
* Token
*/
public static final String TOKEN = "token";
/**
* 当前语言
*/
public static final String COL = "col";
/**
* 最大线程量 * 最大线程量
*/ */
public static final Integer MAX_THREADS = 1024; public static final Integer MAX_THREADS = 1024;
......
customer-service/src/main/java/com/ym/im/entity/enums/LanguageEnum.java
package com.ym.im.entity; package com.ym.im.entity;
import lombok.AllArgsConstructor;
import lombok.Getter;
/** /**
* 语言类型枚举类 * 语言类型枚举类
* *
...@@ -6,30 +10,16 @@ package com.ym.im.entity; ...@@ -6,30 +10,16 @@ package com.ym.im.entity;
* @Description * @Description
* @date 2019/5/16 * @date 2019/5/16
*/ */
@Getter
@AllArgsConstructor
public enum LanguageEnum { public enum LanguageEnum {
en("en", "英文"), en("en", "英文"),
zh("zh", "中文"); zh("zh", "中文");
private String key;
private String remark;
LanguageEnum(String key, String remark) {
this.key = key;
this.remark = remark;
}
public String getKey() { private final String key;
return key;
}
public void setKey(String key) { private final String remark;
this.key = key;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
} }
customer-service/src/main/java/com/ym/im/entity/enums/PlatformEnum.java deleted 100644 → 0
package com.ym.im.entity.enums;
public enum PlatformEnum {
web("web", "后台用户登陆标识"),
app("app", "app用户标识");
private String key;
private String remark;
PlatformEnum(String key, String remark) {
this.key = key;
this.remark = remark;
}
public String getKey() {
return key;
}
public void setKey(String key) {
this.key = key;
}
public String getRemark() {
return remark;
}
public void setRemark(String remark) {
this.remark = remark;
}
}
customer-service/src/main/java/com/ym/im/entity/enums/RoleEnum.java 0 → 100644
package com.ym.im.entity.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* @author JJww
*/
@Getter
@AllArgsConstructor
public enum RoleEnum {
APP("app", 0),
merchant("mer", 1),
system("sys", 2);
private final String type;
private final Integer key;
public static RoleEnum get(String type) {
for (RoleEnum roleEnum : values()) {
if (roleEnum.getType().equals(type)) {
//获取指定的枚举
return roleEnum;
}
}
return null;
}
public static RoleEnum get(Integer key) {
for (RoleEnum roleEnum : values()) {
if (roleEnum.getKey().equals(key)) {
//获取指定的枚举
return roleEnum;
}
}
return null;
}
}
customer-service/src/main/java/com/ym/im/factory/SingleChatFactory.java
package com.ym.im.factory; package com.ym.im.factory;
import com.ym.im.entity.base.NettyConstant; import com.ym.im.entity.enums.RoleEnum;
import com.ym.im.service.ChatService; import com.ym.im.service.ChatService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -24,23 +24,17 @@ public class SingleChatFactory { ...@@ -24,23 +24,17 @@ public class SingleChatFactory {
* @param type * @param type
* @return * @return
*/ */
public ChatService getService(Integer type) { public ChatService getService(String type) {
if (type == null) { switch (RoleEnum.get(type)) {
return null; case APP:
}
switch (type) {
case NettyConstant.CONNECT_TYPE_USER:
return userSingleChatServiceImpl; return userSingleChatServiceImpl;
case merchant:
case NettyConstant.CONNECT_TYPE_STAFF:
return staffSingleChatServiceImpl; return staffSingleChatServiceImpl;
default: default:
return null;
} }
return null;
} }
} }
customer-service/src/main/java/com/ym/im/handler/BaseHandler.java
package com.ym.im.handler; package com.ym.im.handler;
import com.ym.im.entity.base.ChannelAttributeKey;
import com.ym.im.entity.base.NettyConstant; import com.ym.im.entity.base.NettyConstant;
import com.ym.im.factory.SingleChatFactory; import com.ym.im.factory.SingleChatFactory;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
...@@ -17,12 +18,12 @@ public abstract class BaseHandler<T> extends SimpleChannelInboundHandler<T> { ...@@ -17,12 +18,12 @@ public abstract class BaseHandler<T> extends SimpleChannelInboundHandler<T> {
@Override @Override
public void channelInactive(ChannelHandlerContext ctx) throws Exception { public void channelInactive(ChannelHandlerContext ctx) throws Exception {
singleChatFactory.getService(ctx.channel().attr(NettyConstant.TYPE).get()).offline(ctx); singleChatFactory.getService(ctx.channel().attr(ChannelAttributeKey.ROLE_TYPE).get()).offline(ctx);
} }
@Override @Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
singleChatFactory.getService(ctx.channel().attr(NettyConstant.TYPE).get()).offline(ctx); singleChatFactory.getService(ctx.channel().attr(ChannelAttributeKey.ROLE_TYPE).get()).offline(ctx);
} }
} }
customer-service/src/main/java/com/ym/im/handler/WebSocketHandshakerHandler.java
package com.ym.im.handler; package com.ym.im.handler;
import com.ym.im.entity.base.BaseSocketInfo;
import com.ym.im.entity.MsgBody; import com.ym.im.entity.MsgBody;
import com.ym.im.entity.base.BaseSocketInfo;
import com.ym.im.entity.base.ChannelAttributeKey;
import com.ym.im.entity.base.NettyConstant; import com.ym.im.entity.base.NettyConstant;
import com.ym.im.entity.enums.PlatformEnum; import com.ym.im.entity.enums.RoleEnum;
import com.ym.im.exception.HttpException; import com.ym.im.exception.HttpException;
import com.ym.im.factory.SingleChatFactory; import com.ym.im.factory.SingleChatFactory;
import com.ym.im.service.ChannelGroupService; import com.ym.im.service.ChannelGroupService;
...@@ -17,6 +18,7 @@ import org.springframework.stereotype.Component; ...@@ -17,6 +18,7 @@ import org.springframework.stereotype.Component;
import java.util.Optional; import java.util.Optional;
import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST;
import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED; import static io.netty.handler.codec.http.HttpResponseStatus.UNAUTHORIZED;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
...@@ -33,6 +35,10 @@ public class WebSocketHandshakerHandler extends BaseHandler<FullHttpRequest> { ...@@ -33,6 +35,10 @@ public class WebSocketHandshakerHandler extends BaseHandler<FullHttpRequest> {
@Autowired @Autowired
private SingleChatFactory singleChatFactory; private SingleChatFactory singleChatFactory;
public static final String ROLE_TYPE = "roleType";
public static final String MERCHANT_ID = "merchantId";
public static final String AUTHORIZATION = "Authorization"; public static final String AUTHORIZATION = "Authorization";
@Override @Override
...@@ -40,25 +46,36 @@ public class WebSocketHandshakerHandler extends BaseHandler<FullHttpRequest> { ...@@ -40,25 +46,36 @@ public class WebSocketHandshakerHandler extends BaseHandler<FullHttpRequest> {
final String token = fullHttpRequest.headers().get(AUTHORIZATION); final String token = fullHttpRequest.headers().get(AUTHORIZATION);
Optional.ofNullable(token).orElseThrow(() -> new HttpException(ctx, fullHttpRequest, new DefaultFullHttpResponse(HTTP_1_1, UNAUTHORIZED))); Optional.ofNullable(token).orElseThrow(() -> new HttpException(ctx, fullHttpRequest, new DefaultFullHttpResponse(HTTP_1_1, UNAUTHORIZED)));
Long userId = 0L;//待完善鉴权逻辑 final String roleType = fullHttpRequest.headers().get(ROLE_TYPE, null);
Integer type = 1; Optional.ofNullable(roleType).orElseThrow(() -> new HttpException(ctx, fullHttpRequest, new DefaultFullHttpResponse(HTTP_1_1, BAD_REQUEST)));
ctx.channel().attr(NettyConstant.ID).set(userId); final Long merchantId = Long.valueOf(fullHttpRequest.headers().get(MERCHANT_ID, null));
ctx.channel().attr(NettyConstant.TOKEN_INFO).set(token); Optional.ofNullable(merchantId).orElseThrow(() -> new HttpException(ctx, fullHttpRequest, new DefaultFullHttpResponse(HTTP_1_1, BAD_REQUEST)));
this.sso(token, userId, "tokenInfo[0]"); final Long userId = 123L;//待完善鉴权逻辑
singleChatFactory.getService(type).init(ctx); ctx.channel().attr(ChannelAttributeKey.ROLE_ID).set(userId);
ctx.channel().attr(ChannelAttributeKey.TOKEN_INFO).set(token);
ctx.channel().attr(ChannelAttributeKey.ROLE_TYPE).set(roleType);
this.sso(token, userId, roleType);
singleChatFactory.getService(roleType).init(ctx);
fullHttpRequest.setUri(NettyConstant.CS); fullHttpRequest.setUri(NettyConstant.CS);
ctx.fireChannelRead(fullHttpRequest.retain()); ctx.fireChannelRead(fullHttpRequest.retain());
log.info(userId + " 上线");
} }
private void sso(String token, Long userId, String type) { private void sso(String token, Long roleId, String type) {
final BaseSocketInfo baseSocketInfo = PlatformEnum.app.getKey().equals(type) ? ChannelGroupService.USER_GROUP.get(userId) : ChannelGroupService.STAFF_GROUP.get(userId); BaseSocketInfo baseSocketInfo = null;
switch (RoleEnum.get(type)) {
case APP:
baseSocketInfo = ChannelGroupService.USER_GROUP.get(roleId);
break;
case merchant:
baseSocketInfo = ChannelGroupService.STAFF_GROUP.get(roleId);
break;
}
if (baseSocketInfo != null && !token.equals(baseSocketInfo.getToken())) { if (baseSocketInfo != null && !token.equals(baseSocketInfo.getToken())) {
baseSocketInfo.writeAndFlush(new MsgBody<>().setStatus(MsgBody.FORCEDOFFLINE)); baseSocketInfo.writeAndFlush(new MsgBody<>().setStatus(MsgBody.FORCEDOFFLINE));
baseSocketInfo.getChannel().close(); baseSocketInfo.close();
ChannelGroupService.USER_GROUP.remove(userId); ChannelGroupService.USER_GROUP.remove(roleId);//待完善
log.info("用户: " + userId + " 被迫下线"); log.info("用户: " + roleId + " 被迫下线");
} }
} }
} }
customer-service/src/main/java/com/ym/im/mq/Receiver.java
package com.ym.im.mq; package com.ym.im.mq;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ym.im.entity.*; import com.ym.im.entity.ChatRecord;
import com.ym.im.entity.MsgBody;
import com.ym.im.entity.StaffSocketInfo;
import com.ym.im.entity.UserSocketInfo;
import com.ym.im.entity.base.NettyConstant; import com.ym.im.entity.base.NettyConstant;
import com.ym.im.entity.enums.RoleEnum;
import com.ym.im.entity.model.IdModel; import com.ym.im.entity.model.IdModel;
import com.ym.im.entity.model.OrderModel; import com.ym.im.entity.model.OrderModel;
import com.ym.im.service.ChannelGroupService; import com.ym.im.service.ChannelGroupService;
...@@ -88,7 +92,7 @@ public class Receiver { ...@@ -88,7 +92,7 @@ public class Receiver {
final UserSocketInfo userSocketInfo = ChannelGroupService.USER_GROUP.get(Long.valueOf(userId)); final UserSocketInfo userSocketInfo = ChannelGroupService.USER_GROUP.get(Long.valueOf(userId));
if (userSocketInfo != null) { if (userSocketInfo != null) {
userSocketInfo.writeAndFlush(new MsgBody<>().setStatus(MsgBody.LOGOUT)); userSocketInfo.writeAndFlush(new MsgBody<>().setStatus(MsgBody.LOGOUT));
userSocketInfo.getChannel().close(); userSocketInfo.close();
log.info("用户: " + userId + "被禁用"); log.info("用户: " + userId + "被禁用");
} }
} }
...@@ -140,9 +144,9 @@ public class Receiver { ...@@ -140,9 +144,9 @@ public class Receiver {
*/ */
public void retry(MsgBody<ChatRecord> msgBody) throws IOException { public void retry(MsgBody<ChatRecord> msgBody) throws IOException {
ChatRecord chatRecord = msgBody.getData(); final ChatRecord chatRecord = msgBody.getData();
Long userId = Long.valueOf(chatRecord.getUserId()); final Long userId = Long.valueOf(chatRecord.getUserId());
String recordId = String.valueOf(chatRecord.getId()); final String recordId = String.valueOf(chatRecord.getId());
if (msgBody != null && chatRecord.getRetryCount().intValue() < NettyConstant.RETRY_COUNT.intValue()) { if (msgBody != null && chatRecord.getRetryCount().intValue() < NettyConstant.RETRY_COUNT.intValue()) {
...@@ -151,18 +155,15 @@ public class Receiver { ...@@ -151,18 +155,15 @@ public class Receiver {
return; return;
} }
MsgBody<ChatRecord> msg = JsonUtils.json2Obj( MsgBody<ChatRecord> msg = JsonUtils.json2Obj(String.valueOf(redisTemplate.opsForHash().get(NettyConstant.MSG_KEY + userId, recordId)), JsonUtils.getJavaType(MsgBody.class, ChatRecord.class));
String.valueOf(redisTemplate.opsForHash().get(NettyConstant.MSG_KEY + userId, recordId)),
JsonUtils.getJavaType(MsgBody.class, ChatRecord.class));
if (msg != null && msg.getStatus().equals(MsgBody.HAVE_READ)) { if (msg != null && msg.getStatus().equals(MsgBody.HAVE_READ)) {
redisTemplate.opsForHash().delete(NettyConstant.MSG_KEY + userId, recordId); redisTemplate.opsForHash().delete(NettyConstant.MSG_KEY + userId, recordId);
return; return;
} }
final Integer sendReceive = chatRecord.getSendReceive();
switch (RoleEnum.get(sendReceive)) {
switch (chatRecord.getSendReceive()) { case APP:
case NettyConstant.CONNECT_TYPE_USER:
Long staffId = userSocketInfo.getStaffId() == null ? chatRecord.getStaffId() : userSocketInfo.getStaffId(); Long staffId = userSocketInfo.getStaffId() == null ? chatRecord.getStaffId() : userSocketInfo.getStaffId();
StaffSocketInfo staffSocketInfo = ChannelGroupService.STAFF_GROUP.get(staffId); StaffSocketInfo staffSocketInfo = ChannelGroupService.STAFF_GROUP.get(staffId);
if (staffSocketInfo != null) { if (staffSocketInfo != null) {
...@@ -170,7 +171,7 @@ public class Receiver { ...@@ -170,7 +171,7 @@ public class Receiver {
} }
break; break;
case NettyConstant.CONNECT_TYPE_STAFF: case merchant:
userSocketInfo.writeAndFlush(msgBody); userSocketInfo.writeAndFlush(msgBody);
break; break;
......
customer-service/src/main/java/com/ym/im/service/impl/MsgBodyServiceImpl.java
...@@ -3,6 +3,7 @@ package com.ym.im.service.impl; ...@@ -3,6 +3,7 @@ package com.ym.im.service.impl;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.ym.im.entity.ChatRecord; import com.ym.im.entity.ChatRecord;
import com.ym.im.entity.MsgBody; import com.ym.im.entity.MsgBody;
import com.ym.im.entity.base.ChannelAttributeKey;
import com.ym.im.entity.base.NettyConstant; import com.ym.im.entity.base.NettyConstant;
import com.ym.im.factory.SingleChatFactory; import com.ym.im.factory.SingleChatFactory;
import com.ym.im.mq.Queue; import com.ym.im.mq.Queue;
...@@ -48,13 +49,13 @@ public class MsgBodyServiceImpl implements MsgBodyService { ...@@ -48,13 +49,13 @@ public class MsgBodyServiceImpl implements MsgBodyService {
@Override @Override
public void msgBodyHandle(@NotNull ChannelHandlerContext ctx, @Valid MsgBody<ChatRecord> msgBody) throws JsonProcessingException { public void msgBodyHandle(@NotNull ChannelHandlerContext ctx, @Valid MsgBody<ChatRecord> msgBody) throws JsonProcessingException {
final ChatService chatService = singleChatFactory.getService(ctx.channel().attr(NettyConstant.TYPE).get()); final ChatService chatService = singleChatFactory.getService(ctx.channel().attr(ChannelAttributeKey.ROLE_TYPE).get());
switch (msgBody.getStatus()) { switch (msgBody.getStatus()) {
case SEND_MSG: case SEND_MSG:
// 获取用户、客服Id // 获取用户、客服Id
final Long id = ctx.channel().attr(NettyConstant.ID).get(); final Long id = ctx.channel().attr(ChannelAttributeKey.ROLE_ID).get();
// 先保存聊天消息 // 先保存聊天消息
chatService.save(id, msgBody); chatService.save(id, msgBody);
// 再发送回执 // 再发送回执
......
customer-service/src/main/java/com/ym/im/service/impl/StaffSingleChatServiceImpl.java
...@@ -2,7 +2,11 @@ package com.ym.im.service.impl; ...@@ -2,7 +2,11 @@ package com.ym.im.service.impl;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.ym.im.entity.*; import com.ym.im.entity.ChatRecord;
import com.ym.im.entity.MsgBody;
import com.ym.im.entity.StaffSocketInfo;
import com.ym.im.entity.UserSocketInfo;
import com.ym.im.entity.base.ChannelAttributeKey;
import com.ym.im.entity.base.NettyConstant; import com.ym.im.entity.base.NettyConstant;
import com.ym.im.entity.model.IdModel; import com.ym.im.entity.model.IdModel;
import com.ym.im.mq.Queue; import com.ym.im.mq.Queue;
...@@ -55,11 +59,10 @@ public class StaffSingleChatServiceImpl implements ChatService { ...@@ -55,11 +59,10 @@ public class StaffSingleChatServiceImpl implements ChatService {
@Override @Override
public void init(ChannelHandlerContext ctx) { public void init(ChannelHandlerContext ctx) {
ctx.channel().attr(NettyConstant.TYPE).set(NettyConstant.CONNECT_TYPE_STAFF); final Long staffId = ctx.channel().attr(ChannelAttributeKey.ROLE_ID).get();
final Long staffId = ctx.channel().attr(NettyConstant.ID).get();
StaffSocketInfo staffSocketInfo = new StaffSocketInfo(); StaffSocketInfo staffSocketInfo = new StaffSocketInfo();
staffSocketInfo.setStaffId(staffId); staffSocketInfo.setStaffId(staffId);
staffSocketInfo.setToken(ctx.channel().attr(NettyConstant.TOKEN_INFO).get()); staffSocketInfo.setToken(ctx.channel().attr(ChannelAttributeKey.TOKEN_INFO).get());
staffSocketInfo.setChannel((NioSocketChannel) ctx.channel()); staffSocketInfo.setChannel((NioSocketChannel) ctx.channel());
staffSocketInfo.setUserIds(redisTemplate.opsForSet().members(NettyConstant.STAFF_USERIDS_KEY + staffId)); staffSocketInfo.setUserIds(redisTemplate.opsForSet().members(NettyConstant.STAFF_USERIDS_KEY + staffId));
ChannelGroupService.STAFF_GROUP.put(staffId, staffSocketInfo); ChannelGroupService.STAFF_GROUP.put(staffId, staffSocketInfo);
...@@ -69,9 +72,9 @@ public class StaffSingleChatServiceImpl implements ChatService { ...@@ -69,9 +72,9 @@ public class StaffSingleChatServiceImpl implements ChatService {
@Override @Override
public void offline(ChannelHandlerContext ctx) { public void offline(ChannelHandlerContext ctx) {
final Long staffId = ctx.channel().attr(NettyConstant.ID).get(); final Long staffId = ctx.channel().attr(ChannelAttributeKey.ROLE_ID).get();
final StaffSocketInfo staffSocketInfo = ChannelGroupService.STAFF_GROUP.get(staffId); final StaffSocketInfo staffSocketInfo = ChannelGroupService.STAFF_GROUP.get(staffId);
if (ctx.channel().attr(NettyConstant.TOKEN_INFO).get().equals(staffSocketInfo.getToken())) { if (ctx.channel().attr(ChannelAttributeKey.TOKEN_INFO).get().equals(staffSocketInfo.getToken())) {
final Set<Long> userIds = staffSocketInfo.getUserIds(); final Set<Long> userIds = staffSocketInfo.getUserIds();
if (userIds.size() != 0) { if (userIds.size() != 0) {
final String userListKey = NettyConstant.STAFF_USERIDS_KEY + staffId; final String userListKey = NettyConstant.STAFF_USERIDS_KEY + staffId;
...@@ -80,7 +83,7 @@ public class StaffSingleChatServiceImpl implements ChatService { ...@@ -80,7 +83,7 @@ public class StaffSingleChatServiceImpl implements ChatService {
queue.staffOfflineQueue(new StaffSocketInfo(staffId, userIds)); //NioSocketChannel无法序列化 所以new StaffSocketInfo queue.staffOfflineQueue(new StaffSocketInfo(staffId, userIds)); //NioSocketChannel无法序列化 所以new StaffSocketInfo
} }
ChannelGroupService.STAFF_GROUP.remove(staffId); ChannelGroupService.STAFF_GROUP.remove(staffId);
ctx.channel().close(); ctx.close();
log.info("客服: " + staffId + " 下线:"); log.info("客服: " + staffId + " 下线:");
} }
} }
......
customer-service/src/main/java/com/ym/im/service/impl/UserSingleChatServiceImpl.java
...@@ -2,7 +2,11 @@ package com.ym.im.service.impl; ...@@ -2,7 +2,11 @@ package com.ym.im.service.impl;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.ym.im.entity.*; import com.ym.im.entity.ChatRecord;
import com.ym.im.entity.MsgBody;
import com.ym.im.entity.StaffSocketInfo;
import com.ym.im.entity.UserSocketInfo;
import com.ym.im.entity.base.ChannelAttributeKey;
import com.ym.im.entity.base.NettyConstant; import com.ym.im.entity.base.NettyConstant;
import com.ym.im.entity.model.IdModel; import com.ym.im.entity.model.IdModel;
import com.ym.im.service.*; import com.ym.im.service.*;
...@@ -42,21 +46,20 @@ public class UserSingleChatServiceImpl implements ChatService { ...@@ -42,21 +46,20 @@ public class UserSingleChatServiceImpl implements ChatService {
private StaffService staffService; private StaffService staffService;
@Autowired @Autowired
private ChatRecordService chatRecordService; private MsgBodyService msgBodyService;
@Autowired @Autowired
private MsgBodyService msgBodyService; private ChatRecordService chatRecordService;
@Override @Override
public void init(ChannelHandlerContext ctx) { public void init(ChannelHandlerContext ctx) {
ctx.channel().attr(NettyConstant.TYPE).set(NettyConstant.CONNECT_TYPE_USER); final Long userId = ctx.channel().attr(ChannelAttributeKey.ROLE_ID).get();
final Long userId = ctx.channel().attr(NettyConstant.ID).get();
UserSocketInfo userSocketInfo = new UserSocketInfo(); UserSocketInfo userSocketInfo = new UserSocketInfo();
userSocketInfo.setUserId(userId); userSocketInfo.setUserId(userId);
userSocketInfo.setChannel((NioSocketChannel) ctx.channel()); userSocketInfo.setChannel((NioSocketChannel) ctx.channel());
userSocketInfo.setCol(ctx.channel().attr(NettyConstant.COL_INFO).get()); userSocketInfo.setCol(ctx.channel().attr(ChannelAttributeKey.COL_INFO).get());
userSocketInfo.setToken(ctx.channel().attr(NettyConstant.TOKEN_INFO).get()); userSocketInfo.setToken(ctx.channel().attr(ChannelAttributeKey.TOKEN_INFO).get());
userSocketInfo.setPushToken(null); userSocketInfo.setPushToken(null);
ChannelGroupService.USER_GROUP.put(userId, userSocketInfo); ChannelGroupService.USER_GROUP.put(userId, userSocketInfo);
//恢复历史绑定关系 //恢复历史绑定关系
...@@ -71,13 +74,13 @@ public class UserSingleChatServiceImpl implements ChatService { ...@@ -71,13 +74,13 @@ public class UserSingleChatServiceImpl implements ChatService {
@Override @Override
public void offline(ChannelHandlerContext ctx) { public void offline(ChannelHandlerContext ctx) {
final Long userId = ctx.channel().attr(NettyConstant.ID).get(); final Long userId = ctx.channel().attr(ChannelAttributeKey.ROLE_ID).get();
final UserSocketInfo userSocketInfo = ChannelGroupService.USER_GROUP.get(userId); final UserSocketInfo userSocketInfo = ChannelGroupService.USER_GROUP.get(userId);
if (userSocketInfo != null && ctx.channel().attr(NettyConstant.TOKEN_INFO).get().equals(userSocketInfo.getToken())) { if (userSocketInfo != null && ctx.channel().attr(ChannelAttributeKey.TOKEN_INFO).get().equals(userSocketInfo.getToken())) {
final Long staffId = userSocketInfo.getStaffId(); final Long staffId = userSocketInfo.getStaffId();
ChannelGroupService.USER_GROUP.remove(userId); ChannelGroupService.USER_GROUP.remove(userId);
ctx.channel().close(); ctx.close();
if (staffId != null && ChannelGroupService.STAFF_GROUP.get(staffId) != null) { if (staffId != null && ChannelGroupService.STAFF_GROUP.get(staffId) != null) {
// 保存最后的客服 // 保存最后的客服
redisTemplate.opsForHash().put(NettyConstant.IM_USERS, userId, staffId); redisTemplate.opsForHash().put(NettyConstant.IM_USERS, userId, staffId);
...@@ -210,4 +213,5 @@ public class UserSingleChatServiceImpl implements ChatService { ...@@ -210,4 +213,5 @@ public class UserSingleChatServiceImpl implements ChatService {
staffSocketInfo.writeAndFlush(new MsgBody<>().setStatus(MsgBody.USERS_ONLINE).setData(new IdModel().setStaffId(staffId).setUserId(userId))); staffSocketInfo.writeAndFlush(new MsgBody<>().setStatus(MsgBody.USERS_ONLINE).setData(new IdModel().setStaffId(staffId).setUserId(userId)));
}); });
} }
} }
customer-service/target/classes/application.yml
...@@ -2,7 +2,7 @@ spring: ...@@ -2,7 +2,7 @@ spring:
profiles: profiles:
active: dev active: dev
application: application:
name: pathfinder-im name: customer-service
# 404抛出异常 # 404抛出异常
mvc: mvc:
throw-exception-if-no-handler-found: true throw-exception-if-no-handler-found: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment