From 133e0acac782920f25f3a9886d5be46f33bbc7d1 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 21 Aug 2019 18:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/dataReport/reportBeans_37/Repot37EventUtil.java | 2 +- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java index ab0e326e3..0965b9418 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/dataReport/reportBeans_37/Repot37EventUtil.java @@ -77,7 +77,7 @@ public class Repot37EventUtil { } String signChat =SDK37Constans.chatKey+report37CheckChat.getUid()+report37CheckChat.getGid()+report37CheckChat.getDsid()+report37CheckChat.getTime()+report37CheckChat.getType(); report37CheckChat.setSign(MD5Util.encrypByMd5(signChat)); - System.out.println(gson.toJson(report37CheckChat)); +// System.out.println(gson.toJson(report37CheckChat)); JSONObject jsonObject = DataMessageUtils.immediateSendPost(report37CheckChat); T t = jsonObject.toJavaObject(clazz); return t; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 5833d435f..26c2ba2fc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -139,6 +139,9 @@ public class ActivityLogic { public Set checkActivityOfUser(User user, PlayerInfoProto.ActivityUpateIndication.Builder builder) throws Exception { long now = TimeUtils.now(); + if(user==null){ + return new HashSet<>(1); + } ActivityManager activityManager = user.getActivityManager(); Map sGlobalActivityMap = SGlobalActivity.getsGlobalActivityMap(); Set openNewActivityIds = new HashSet<>();