From 33bcd9be80f868fae692a1c36fb16437a5db0d5f Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 23 Jun 2021 11:53:57 +0800 Subject: [PATCH 1/6] =?UTF-8?q?appid=E6=9A=82=E6=97=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 2249b8cf9..373e68b78 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -310,7 +310,8 @@ public class BuyGoodsNewLogic { rechargeEvent.setModule("GameAnalysis"); rechargeEvent.setIp(""); rechargeEvent.setName("charge"); - rechargeEvent.setIndex(GameApplication.serverProperties.getAppId()==null?"APPID":GameApplication.serverProperties.getAppId()); + //rechargeEvent.setIndex(GameApplication.serverProperties.getAppId()==null?"APPID":GameApplication.serverProperties.getAppId()); + rechargeEvent.setIndex("98k3j3yxkb8ux2zj"); rechargeEvent.setIdentify(String.valueOf(user.getPlayerInfoManager().getOpenId())); rechargeEvent.setProperties(new RechargeEventProp(orderId,amount*100,virtualAmount,currency_type,"","")); String s = DataMessageUtils.sendRechargePost(rechargeEvent); From 7331168ef539a718f7b724d590de1e0be973eba3 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 23 Jun 2021 15:23:48 +0800 Subject: [PATCH 2/6] =?UTF-8?q?onlineUserReport=E4=BA=94=E5=88=86=E9=92=9F?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/store/BuyGoodsNewLogic.java | 3 +-- .../com/ljsd/jieling/thread/ThreadManager.java | 6 +++--- .../jieling/thread/task/OnlineUserReportTask.java | 15 ++++++++++++++- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 373e68b78..2249b8cf9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -310,8 +310,7 @@ public class BuyGoodsNewLogic { rechargeEvent.setModule("GameAnalysis"); rechargeEvent.setIp(""); rechargeEvent.setName("charge"); - //rechargeEvent.setIndex(GameApplication.serverProperties.getAppId()==null?"APPID":GameApplication.serverProperties.getAppId()); - rechargeEvent.setIndex("98k3j3yxkb8ux2zj"); + rechargeEvent.setIndex(GameApplication.serverProperties.getAppId()==null?"APPID":GameApplication.serverProperties.getAppId()); rechargeEvent.setIdentify(String.valueOf(user.getPlayerInfoManager().getOpenId())); rechargeEvent.setProperties(new RechargeEventProp(orderId,amount*100,virtualAmount,currency_type,"","")); String s = DataMessageUtils.sendRechargePost(rechargeEvent); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java index 2378aec38..9ac0f2560 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java @@ -29,7 +29,7 @@ public class ThreadManager implements IManager { private static MongoDataHandlerTask mongoDataHandlerTask; private static ItemLogTask itemLogTask; public static int SLEEP_INTEVAL_TIME = 60; //每1分钟检查一次 - private static OnlineUserTapTask onlineUserTapTask;//5分钟上报一次 + //private static OnlineUserTapTask onlineUserTapTask;//5分钟上报一次 private static Set> scheduledFutureSets = new HashSet<>(); @@ -42,13 +42,13 @@ public class ThreadManager implements IManager { mongoDataHandlerTask = ConfigurableApplicationContextManager.getBean(MongoDataHandlerTask.class); dataReportTask = ConfigurableApplicationContextManager.getBean(DataReportTask.class); itemLogTask = ConfigurableApplicationContextManager.getBean(ItemLogTask.class); - onlineUserTapTask = ConfigurableApplicationContextManager.getBean(OnlineUserTapTask.class); + //onlineUserTapTask = ConfigurableApplicationContextManager.getBean(OnlineUserTapTask.class); new RetrySendIndicationThread("retry-indi").start(); mongoDataHandlerTask.start(); dataReportTask.start(); itemLogTask.start(); - onlineUserTapTask.start(); + //onlineUserTapTask.start(); scheduledExecutor = new ScheduledThreadPoolExecutor(8, new ScheduleThreadFactory()); scheduledExecutor.setExecuteExistingDelayedTasksAfterShutdownPolicy(false); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java index 80f90a88d..eecea22cc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java @@ -1,6 +1,9 @@ package com.ljsd.jieling.thread.task; import com.ljsd.GameApplication; +import com.ljsd.jieling.config.reportData.DataMessageUtils; +import com.ljsd.jieling.ktbeans.OnlineProp; +import com.ljsd.jieling.ktbeans.OnlineUserCalEvent; import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.ktbeans.sendbeans.ReportServerEvent; import com.ljsd.jieling.logic.OnlineUserManager; @@ -8,7 +11,7 @@ import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import util.TimeUtils; import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -30,6 +33,16 @@ public class OnlineUserReportTask extends Thread { @Override public void run() { try{ + //5分钟上报一次 + if(TimeUtils.getMiunte()%5 == 0){ + int serverId = GameApplication.serverId; + Set uids = OnlineUserManager.sessionMap.keySet(); + OnlineUserCalEvent onlineUserCalEvent = new OnlineUserCalEvent(); + onlineUserCalEvent.setAppid(GameApplication.serverProperties.getAppId()==null?"APPID":GameApplication.serverProperties.getAppId()); + onlineUserCalEvent.setOnlines(new OnlineProp[]{new OnlineProp(String.valueOf(serverId),uids.size(), TimeUtils.now()/1000)}); + DataMessageUtils.sendOnlinePost(onlineUserCalEvent); + } + Set uids = OnlineUserManager.sessionMap.keySet(); Map channelMap = new HashMap<>(); for(int uid:uids){ From 611dc9cdc89c4396919d6e04d7616c808fff8b03 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Thu, 24 Jun 2021 11:24:03 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=A9=E7=9C=BClog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index 4bbb53d26..ad2032ff2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -497,6 +497,7 @@ public class MessageUtil { if(url == null){ return v3; } + LOGGER.info("天眼封禁URL:{}",url); skyEyeExtraMap.put("url",url); v3.setExtra(JSON.toJSONString(skyEyeExtraMap)); return v3; From 0711bfd7525d448bfdff0af3939fd0d5cd94e772 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Thu, 24 Jun 2021 11:49:52 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=A4=A9=E7=9C=BClog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/MessageUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index ad2032ff2..19a112a89 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -497,7 +497,7 @@ public class MessageUtil { if(url == null){ return v3; } - LOGGER.info("天眼封禁URL:{}",url); + LOGGER.info("天眼封禁userId:{},zonId:{},content:{},URL:{}",me.getId(),String.valueOf(GameApplication.serverId),msg,url); skyEyeExtraMap.put("url",url); v3.setExtra(JSON.toJSONString(skyEyeExtraMap)); return v3; From d9e4e29bb641eb07f375593c55c9f20ac72f11b7 Mon Sep 17 00:00:00 2001 From: duhui Date: Sun, 27 Jun 2021 22:59:52 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=83=8A=E5=96=9C=E7=A4=BC=E7=9B=92,bug?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 2 ++ .../java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 9264dba6c..3653f0d2b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -14,6 +14,7 @@ import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.event.NewWelfareEvent; import com.ljsd.jieling.logic.activity.event.NewWelfareTypeEnum; import com.ljsd.jieling.logic.activity.event.Poster; +import com.ljsd.jieling.logic.activity.event.SuperBoxEvent; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.User; @@ -221,6 +222,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ ReportUtil.onReportEvent(user, ReportEventEnum.APP_LOGIN.getType()); try { //hotfix + Poster.getPoster().dispatchEvent(new SuperBoxEvent(user.getId(),-1)); user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_TASK_TYPE,0,user); MessageUtil.sendIndicationMessage(iSession, 1, MessageTypeProto.MessageType.WorldLevelIndication_VALUE, PlayerInfoProto.WorldLevelIndication.newBuilder().setWorldLeve(GlobleSystemLogic.getGloableWorldLeveCache()).build(), true); MessageUtil.sendMessage(iSession, 1, MessageTypeProto.MessageType.GET_PLAYERINFO_RESPONSE_VALUE, getPlayerInfoResponse, true); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java index 48ebe0491..0ef35ae6c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java @@ -161,8 +161,11 @@ public class SuperBoxActivity extends AbstractActivity { } } v.setProgrss(progrss); + mission.getActivityMissionMap().put(k,v); } + LOGGER.info("========================惊喜礼盒状态刷新,uid={}",user.getId()); + // 客户端推送 ISession session = OnlineUserManager.getSessionByUid(user.getId()); sendActivityProgress(session, mission, null); From b3a35321d6a7ac67316494eda12a3ff69f73871d Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 28 Jun 2021 10:46:27 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/SuperBoxActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java index 0ef35ae6c..a1594e738 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SuperBoxActivity.java @@ -84,7 +84,11 @@ public class SuperBoxActivity extends AbstractActivity { return; } - Map missionMap = user.getActivityManager().getActivityMissionMap().get(id).getActivityMissionMap(); + ActivityMission mission = user.getActivityManager().getActivityMissionMap().get(id); + if (mission == null){ + return; + } + Map missionMap = mission.getActivityMissionMap(); Collection boxes = SSurpriseBox.map.getOrDefault(id, new HashMap<>(0)).values(); for (SSurpriseBox box : boxes) {