From 5c1946e7f730a71b0cfffd282a8196fbcd1b0f30 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Wed, 29 Apr 2020 18:17:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/core/HandlerLogicThread.java | 3 ++- .../java/com/ljsd/jieling/exception/ErrorUtil.java | 2 -- .../java/com/ljsd/jieling/handler/BaseHandler.java | 2 +- .../jieling/handler/TakeActivityRewardHandler.java | 8 +++----- .../main/java/com/ljsd/jieling/util/AyyncWorker.java | 11 +++++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java index 375412fb0..480224529 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java @@ -113,7 +113,7 @@ public class HandlerLogicThread extends Thread{ try { AyyncWorker ayyncWorker =null; while ( (ayyncWorker = ayyncWorkerConcurrentLinkedQueue.poll())!=null){ - ayyncWorker.exec(); + ayyncWorker.work(ayyncWorker.getUser()); } PacketNetData packetNetData = handlerLinkedQueue.poll(); if(packetNetData == null){ @@ -177,6 +177,7 @@ public class HandlerLogicThread extends Thread{ LOGGER.error(ErrorUtil.getExceptionStackTraceFileLineAndMethod(e)); }else { LOGGER.info(e.toString()); + LOGGER.debug(ErrorUtil.getExceptionStackTraceFileLineAndMethod(e)); } MessageUtil.sendErrorResponse(session, errCode, session.getLastMsgId() + 1,(ErrorCodeException)e); return; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorUtil.java index 91217fc05..07f99429a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorUtil.java @@ -67,8 +67,6 @@ public class ErrorUtil { StackTraceElement[] stackTraceElements = t.getStackTrace(); if (stackTraceElements != null && stackTraceElements.length > 0) { builder.append(System.getProperty("line.separator")); - int var5 = stackTraceElements.length; - for (StackTraceElement stackTraceElement : stackTraceElements) { builder.append(" at ").append(stackTraceElement).append(System.getProperty("line.separator")); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java index aa556bf24..7202dd398 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java @@ -48,7 +48,7 @@ public abstract class BaseHandler { throw new LogicException("解析协议失败",var5); }catch (Exception var4) { if(null !=proto){ - LOGGER.error("processWithProtoException\r\nprotoID:"+netData.getMsgId()+"\r\n"+proto.toString()); + LOGGER.error("processWithProtoException\r\nprotoID:"+netData.getMsgId()+"\r\nuid"+netData.getUserId()+"\r\n"+proto.toString()); } throw var4; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java index 977e98b3d..7de47ce64 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/TakeActivityRewardHandler.java @@ -16,16 +16,14 @@ import com.ljsd.jieling.util.MessageUtil; import org.springframework.stereotype.Component; @Component -public class TakeActivityRewardHandler extends BaseHandler { +public class TakeActivityRewardHandler extends BaseHandler { @Override public MessageTypeProto.MessageType getMessageCode() { return MessageTypeProto.MessageType.TAKE_ACTIVITY_REWARD_REQUEST; } @Override - public void process(ISession iSession, PacketNetData netData) throws Exception { - byte[] bytes = netData.parseClientProtoNetData(); - PlayerInfoProto.TakeActivityRewardRequest takeActivityRewardRequest = PlayerInfoProto.TakeActivityRewardRequest.parseFrom(bytes); + public void processWithProto(ISession iSession, PlayerInfoProto.TakeActivityRewardRequest takeActivityRewardRequest) throws Exception { int missionId = takeActivityRewardRequest.getMissionId(); int activityId = takeActivityRewardRequest.getActivityId(); AbstractActivity abstractActivity = ActivityTypeEnum.getActicityType(activityId); @@ -37,6 +35,6 @@ public class TakeActivityRewardHandler extends BaseHandler { User user = UserManager.getUser(iSession.getUid()); user.getUserMissionManager().onGameEvent(user,GameEvent.TAKE_ACTIVITY_REWARD,activityId); } - } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java b/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java index 4317a7ddb..01da7002a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/AyyncWorker.java @@ -3,9 +3,9 @@ package com.ljsd.jieling.util; import com.ljsd.jieling.logic.dao.root.User; /** - * 异步任务代理类 + * 代理模式 异步任务代理类 */ -public class AyyncWorker{ +public class AyyncWorker implements AyncWorkerRunnable { private User user; private boolean isTask; private AyncWorkerRunnable ayncWorkerRunnable; @@ -17,8 +17,11 @@ public class AyyncWorker{ this.ayncWorkerRunnable = ayncWorkerRunnable; } - public void exec() throws Exception { - ayncWorkerRunnable.work(user); + + @Override + public void work(User user) throws Exception { + if (null != ayncWorkerRunnable) + ayncWorkerRunnable.work(user); } public void setUser(User user) {