From 58d3b8621284e7cd76d65a1ea002f51c90485324 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 21 Aug 2019 14:45:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=AE=9A=E6=97=B6=E5=8F=91?= =?UTF-8?q?=E9=80=81=EF=BC=8C37=E4=B8=8A=E6=8A=A5=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataReport/reportBeans_37/Repot37EventUtil.java | 5 +++++ .../com/ljsd/jieling/logic/family/GuildFightLogic.java | 6 ++---- .../main/java/com/ljsd/jieling/logic/mail/MailLogic.java | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) 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 a0d882e90..cabd6e7f7 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 @@ -3,6 +3,7 @@ package com.ljsd.jieling.dataReport.reportBeans_37; import com.alibaba.fastjson.JSONObject; import com.ljsd.GameApplication; import com.ljsd.jieling.config.json.SDK37Constans; +import com.ljsd.jieling.config.json.ServerProperties; import com.ljsd.jieling.config.reportData.DataMessageUtils; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.util.MD5Util; @@ -76,6 +77,10 @@ public class Repot37EventUtil { public static boolean Report37Chat(User user,Object... parm){ + ServerProperties serverProperties = GameApplication.serverProperties; + if(!serverProperties.isSendlog37()){ + return true; + } final ExecutorService exec = Executors.newFixedThreadPool(1); Callable call = new Callable() { @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java index 23025af05..59372ff18 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildFightLogic.java @@ -335,9 +335,6 @@ public class GuildFightLogic { /** * 战斗之后数据更新 - * - * @param userAttack - * @param userDefend */ public static void familyFightResult(ISession session, int defendUid, MessageTypeProto.MessageType messageType) throws Exception { User userAttack = UserManager.getUser(session.getUid()); @@ -531,6 +528,7 @@ public class GuildFightLogic { } else if (hour > FamilyRound.FAMILY_FIGHT_END || hour < FamilyRound.FAMILY_FIGHT_START) { status = 0; removeMatchingInfo(); + startMatching = true; } } @@ -572,7 +570,7 @@ public class GuildFightLogic { // redisUtil.removeZSetRangeByRank(matchingKey,0,redisUtil.getZsetSize(matchingKey)); } /** - * 公会战结算 + * 公会战结算(Redis中数据同到mongo) */ public void accountFamilyFightResult() { RedisUtil redisUtil = RedisUtil.getInstence(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java index ec23ccf56..984306126 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailLogic.java @@ -272,13 +272,16 @@ public class MailLogic { *每分钟检测是否有需要发的邮件 */ public void checkReadyToMail() throws Exception { - Map mails = RedisUtil.getInstence().getMapValues(RedisKey.READY_TO_USER_MAIL, "", String.class, MailCache.class); + RedisUtil redisUtil = RedisUtil.getInstence(); + Map mails =redisUtil.getMapValues(RedisKey.READY_TO_USER_MAIL, "", String.class, MailCache.class); if (mails.size()<0){ return; } for(Map.Entry mail:mails.entrySet()){ sendMail(Integer.parseInt(mail.getKey()),mail.getValue().getTitle(),mail.getValue().getContent(),mail.getValue().getReward(),mail.getValue().getTime(),0); } - + redisUtil.del(RedisKey.getKey(RedisKey.READY_TO_USER_MAIL,"",false)); + MongoUtil.getLjsdMongoTemplate().lastUpdate(); } + }