back_recharge
zhangshanxue 2019-08-21 14:52:38 +08:00
commit 1dc59a7af0
4 changed files with 13 additions and 13 deletions

View File

@ -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<Report37Response> call = new Callable<Report37Response>() {
@Override

View File

@ -25,13 +25,7 @@ public class GetAllMailHandler extends BaseHandler {
@Override
public void process(ISession iSession, PacketNetData netData) throws Exception {
int userId = netData.getUserId();
int token = netData.getToken();
int msgId = netData.getMsgId();
int msgIndex = netData.getIndex();
LOGGER.info("processMessage->uid={},token={},msgId={},msgIndex={}",
userId, token,msgId,msgIndex);
List<CommonProto.Mail> allUserMail = MailLogic.getInstance().getAllUserMail(userId);
List<CommonProto.Mail> allUserMail = MailLogic.getInstance().getAllUserMail(iSession.getUid());
PlayerInfoProto.GetAllMailInfoResponse getPlayerInfoResponse = PlayerInfoProto.GetAllMailInfoResponse.newBuilder()
.addAllMialList(allUserMail)
.build();

View File

@ -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));
}
/**
*
* (Redismongo)
*/
public void accountFamilyFightResult() {
RedisUtil redisUtil = RedisUtil.getInstence();

View File

@ -272,13 +272,16 @@ public class MailLogic {
*
*/
public void checkReadyToMail() throws Exception {
Map<String, MailCache> mails = RedisUtil.getInstence().getMapValues(RedisKey.READY_TO_USER_MAIL, "", String.class, MailCache.class);
RedisUtil redisUtil = RedisUtil.getInstence();
Map<String, MailCache> mails =redisUtil.getMapValues(RedisKey.READY_TO_USER_MAIL, "", String.class, MailCache.class);
if (mails.size()<0){
return;
}
for(Map.Entry<String, MailCache> 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();
}
}