Commit 7f0c91e6 by lixiaozhong

命名规范

parent 1c48aa4f
...@@ -3,7 +3,7 @@ package com.wecloud.im.netty.core; ...@@ -3,7 +3,7 @@ package com.wecloud.im.netty.core;
import cn.hutool.core.thread.ThreadFactoryBuilder; import cn.hutool.core.thread.ThreadFactoryBuilder;
import com.wecloud.im.executor.BusinessThreadPool; import com.wecloud.im.executor.BusinessThreadPool;
import com.wecloud.im.ws.model.WsConstants; import com.wecloud.im.ws.model.WsConstants;
import com.wecloud.im.ws.receive.ReadWsData; import com.wecloud.im.ws.receive.WsDataReader;
import com.wecloud.im.ws.service.MangerChannelService; import com.wecloud.im.ws.service.MangerChannelService;
import com.wecloud.rtc.service.RtcService; import com.wecloud.rtc.service.RtcService;
import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandler;
...@@ -46,7 +46,7 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram ...@@ -46,7 +46,7 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram
10L, TimeUnit.MILLISECONDS, 10L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(10), NAMED_THREAD_FACTORY, new ThreadPoolExecutor.CallerRunsPolicy()); new LinkedBlockingQueue<Runnable>(10), NAMED_THREAD_FACTORY, new ThreadPoolExecutor.CallerRunsPolicy());
@Resource @Resource
private ReadWsData readWsData; private WsDataReader wsDataReader;
@Autowired @Autowired
private RtcService rtcService; private RtcService rtcService;
@Resource @Resource
...@@ -91,7 +91,7 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram ...@@ -91,7 +91,7 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram
return; return;
} }
readWsData.convertModel(data, ctx, appKey, clientId); wsDataReader.convertModel(data, ctx, appKey, clientId);
} catch (Exception e) { } catch (Exception e) {
log.error("系统繁忙data:" + data + ",appKey:" + appKey + ",clientId:" + clientId + log.error("系统繁忙data:" + data + ",appKey:" + appKey + ",clientId:" + clientId +
",channelId:" + ctx.channel().id().asLongText(), e); ",channelId:" + ctx.channel().id().asLongText(), e);
......
...@@ -28,7 +28,7 @@ import com.wecloud.im.vo.OfflineMsgDto; ...@@ -28,7 +28,7 @@ import com.wecloud.im.vo.OfflineMsgDto;
import com.wecloud.im.ws.enums.WsResponseCmdEnum; import com.wecloud.im.ws.enums.WsResponseCmdEnum;
import com.wecloud.im.ws.model.WsResponseModel; import com.wecloud.im.ws.model.WsResponseModel;
import com.wecloud.im.ws.model.request.PushModel; import com.wecloud.im.ws.model.request.PushModel;
import com.wecloud.im.ws.sender.PushTask; import com.wecloud.im.ws.sender.AsyncPush;
import com.wecloud.im.ws.service.WriteDataService; import com.wecloud.im.ws.service.WriteDataService;
import io.geekidea.springbootplus.framework.common.api.ApiCode; import io.geekidea.springbootplus.framework.common.api.ApiCode;
import io.geekidea.springbootplus.framework.common.api.ApiResult; import io.geekidea.springbootplus.framework.common.api.ApiResult;
...@@ -67,7 +67,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -67,7 +67,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
private ImConversationService imConversationService; private ImConversationService imConversationService;
@Autowired @Autowired
private PushTask pushTask; private AsyncPush asyncPush;
@Autowired @Autowired
private ImApplicationService imApplicationService; private ImApplicationService imApplicationService;
...@@ -249,7 +249,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes ...@@ -249,7 +249,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
PushModel pushModel = imMsgRecall.getPush(); PushModel pushModel = imMsgRecall.getPush();
// 异步推送系统通知消息 // 异步推送系统通知消息
pushTask.push(pushModel, imClientReceiver, imApplication); asyncPush.push(pushModel, imClientReceiver, imApplication);
} }
return ApiResult.ok(); return ApiResult.ok();
......
...@@ -20,8 +20,8 @@ import javax.annotation.Resource; ...@@ -20,8 +20,8 @@ import javax.annotation.Resource;
* @Date 2019-12-03 * @Date 2019-12-03
*/ */
@Service @Service
public class ReadWsData { public class WsDataReader {
private static final Logger log = LoggerFactory.getLogger(ReadWsData.class); private static final Logger log = LoggerFactory.getLogger(WsDataReader.class);
@Resource @Resource
private ImCmdStrategyFactory receiveStrategyContext; private ImCmdStrategyFactory receiveStrategyContext;
......
...@@ -31,7 +31,7 @@ import java.util.Map; ...@@ -31,7 +31,7 @@ import java.util.Map;
*/ */
@Component @Component
@Slf4j @Slf4j
public class PushTask { public class AsyncPush {
/** /**
* 谷歌推送地址 * 谷歌推送地址
......
...@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service; ...@@ -5,7 +5,7 @@ import org.springframework.stereotype.Service;
@Service @Service
@Slf4j @Slf4j
public class WsWriter { public class WsDataWriter {
} }
...@@ -20,7 +20,7 @@ import com.wecloud.im.ws.enums.WsRequestCmdEnum; ...@@ -20,7 +20,7 @@ import com.wecloud.im.ws.enums.WsRequestCmdEnum;
import com.wecloud.im.ws.enums.WsResponseCmdEnum; import com.wecloud.im.ws.enums.WsResponseCmdEnum;
import com.wecloud.im.ws.model.WsResponseModel; import com.wecloud.im.ws.model.WsResponseModel;
import com.wecloud.im.ws.model.request.ReceiveModel; import com.wecloud.im.ws.model.request.ReceiveModel;
import com.wecloud.im.ws.sender.PushTask; import com.wecloud.im.ws.sender.AsyncPush;
import com.wecloud.im.ws.service.WriteDataService; import com.wecloud.im.ws.service.WriteDataService;
import com.wecloud.im.ws.strategy.AbstractImCmdStrategy; import com.wecloud.im.ws.strategy.AbstractImCmdStrategy;
import io.geekidea.springbootplus.framework.common.api.ApiCode; import io.geekidea.springbootplus.framework.common.api.ApiCode;
...@@ -72,7 +72,7 @@ public class NormalChatStrategy extends AbstractImCmdStrategy { ...@@ -72,7 +72,7 @@ public class NormalChatStrategy extends AbstractImCmdStrategy {
private ImClientService imClientService; private ImClientService imClientService;
@Autowired @Autowired
private PushTask systemPush; private AsyncPush systemPush;
@Override @Override
public void process(ReceiveModel receiveModel, ChannelHandlerContext ctx, String data, String appKey, String clientId) throws JsonProcessingException { public void process(ReceiveModel receiveModel, ChannelHandlerContext ctx, String data, String appKey, String clientId) throws JsonProcessingException {
......
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