日志优化

master_ob2
PC-202302260912\Administrator 2023-08-07 14:39:07 +08:00
parent b96c008047
commit 22c1544335
2 changed files with 39 additions and 64 deletions

View File

@ -6,23 +6,20 @@ import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityMission;
import com.ljsd.jieling.jbean.ActivityProgressInfo; import com.ljsd.jieling.jbean.ActivityProgressInfo;
import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.activity.event.*; import com.ljsd.jieling.logic.activity.event.IEvent;
import com.ljsd.jieling.logic.activity.event.Poster;
import com.ljsd.jieling.logic.activity.event.SuperBoxEvent;
import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.rank.RankEnum; import com.ljsd.jieling.logic.rank.RankEnum;
import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank;
import com.ljsd.jieling.logic.rank.rankImpl.DuoduiRank; import com.ljsd.jieling.logic.rank.rankImpl.DuoduiRank;
import com.ljsd.jieling.logic.store.newRechargeInfo.bean.ReceiveWelfareBag;
import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.ItemUtil;
import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.MessageUtil;
import config.SGlobalActivity; import config.SGlobalActivity;
import config.SSummonTreasure; import config.SSummonTreasure;
import config.SSurpriseBox;
import manager.STableManager;
import rpc.protocols.CommonProto; import rpc.protocols.CommonProto;
import rpc.protocols.PlayerInfoProto; import rpc.protocols.PlayerInfoProto;
import util.TimeUtils;
import java.text.MessageFormat; import java.text.MessageFormat;
import java.util.*; import java.util.*;
@ -59,13 +56,10 @@ class FengshenTreasureActivity extends AbstractActivity {
/** /**
* *
* @param uid
* @param gift
* @throws Exception
*/ */
public void verifyGift(int uid, int gift) throws Exception { public void verifyGift(int uid, int gift) throws Exception {
if (gift <= 0){ if (gift <= 0){
LOGGER.error("封神礼包退出礼包id为负uid{}礼包id{}",uid,gift); // LOGGER.error("封神礼包退出礼包id为负uid{}礼包id{}",uid,gift);
return; return;
} }
User user = UserManager.getUser(uid); User user = UserManager.getUser(uid);
@ -182,20 +176,14 @@ class FengshenTreasureActivity extends AbstractActivity {
/** /**
* *
* @param user
* @param treasure
* @return
* @throws Exception
*/ */
boolean checkRewardsProcess(User user, SSummonTreasure treasure) throws Exception { boolean checkRewardsProcess(User user, SSummonTreasure treasure) {
int count = treasure.getCount(); int count = treasure.getCount();
return getTier(user.getId()) >= count; return getTier(user.getId()) >= count;
} }
/** /**
* *
* @param uid
* @return
*/ */
public int getTier(int uid){ public int getTier(int uid){
SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id); SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(id);

View File

@ -78,18 +78,18 @@ public class MailLogic {
} }
// 有限时间不为0并且当前时间大于 发送时间+有效时间 // 有限时间不为0并且当前时间大于 发送时间+有效时间
if (cMail.getEffectiveTime() != 0 && nowTime > (cMail.getEffectiveTime() + cMail.getSendTime())){ if (cMail.getEffectiveTime() != 0 && nowTime > (cMail.getEffectiveTime() + cMail.getSendTime())){
LOGGER.error("邮件删除,过期了,邮件信息:{},当前时间:{}", cMail,nowTime); LOGGER.info("邮件删除,过期了,邮件信息:{},当前时间:{}", cMail,nowTime);
removeIds.add(cMail.getId()); removeIds.add(cMail.getId());
continue; continue;
} }
String mailItem = cMail.getMailItem(); String mailItem = cMail.getMailItem();
if(mailItem != null && mailItem.contains("null")){ if(mailItem != null && mailItem.contains("null")){
LOGGER.error("邮件删除,邮件道具为空,邮件信息:{}", cMail); LOGGER.info("邮件删除,邮件道具为空,邮件信息:{}", cMail);
removeIds.add(cMail.getId()); removeIds.add(cMail.getId());
continue; continue;
} }
if(cMail.getNoUseDeleteTime()!=0&&cMail.getNoUseDeleteTime()<TimeUtils.now()){ if(cMail.getNoUseDeleteTime()!=0&&cMail.getNoUseDeleteTime()<TimeUtils.now()){
LOGGER.error("邮件删除,邮件删除时间到,邮件信息:{},当前时间:{}", cMail,nowTime); LOGGER.info("邮件删除,邮件删除时间到,邮件信息:{},当前时间:{}", cMail,nowTime);
removeIds.add(cMail.getId()); removeIds.add(cMail.getId());
continue; continue;
} }
@ -105,8 +105,6 @@ public class MailLogic {
/** /**
* *
* @param systemMailList
* @param mailMap
*/ */
private void systemMailToUserMail(List<SystemMail> systemMailList, Map<String, Mail> mailMap,int userId) throws Exception { private void systemMailToUserMail(List<SystemMail> systemMailList, Map<String, Mail> mailMap,int userId) throws Exception {
MailingSystem mailingSystem = MailingSystemManager.getMailingSystem(); MailingSystem mailingSystem = MailingSystemManager.getMailingSystem();
@ -136,7 +134,7 @@ public class MailLogic {
} }
private void initUserMail(int userId, SystemMail systemMail,MailManager mailManager,Map<String, Mail> mailMap) throws Exception { private void initUserMail(int userId, SystemMail systemMail,MailManager mailManager,Map<String, Mail> mailMap) {
int sendTime = TimeUtils.nowInt(); int sendTime = TimeUtils.nowInt();
if(systemMail.getId() == 1){ if(systemMail.getId() == 1){
return; return;
@ -191,7 +189,7 @@ public class MailLogic {
mail.setState(Global.MAIL_DRAW_ST_UNGET); mail.setState(Global.MAIL_DRAW_ST_UNGET);
} }
} }
LOGGER.error("玩家读取了邮件,邮件信息:{},当前时间:{}", mail, TimeUtils.now()); LOGGER.info("玩家读取了邮件,邮件信息:{},当前时间:{}", mail, TimeUtils.now());
mailManager.addMail(mail); mailManager.addMail(mail);
ReportUtil.onReportEvent(user, ReportEventEnum.OPEN_MAIL.getType()); ReportUtil.onReportEvent(user, ReportEventEnum.OPEN_MAIL.getType());
PlayerInfoProto.MailReadResponse.Builder builder = PlayerInfoProto.MailReadResponse.newBuilder().setMailInfo(CBean2Proto.getMail(mail, false)); PlayerInfoProto.MailReadResponse.Builder builder = PlayerInfoProto.MailReadResponse.newBuilder().setMailInfo(CBean2Proto.getMail(mail, false));
@ -200,10 +198,6 @@ public class MailLogic {
/** /**
* *
* @param iSession
* @param mailIdsList
* @param userId
* @throws Exception
*/ */
public void takeMail(ISession iSession,List<String> mailIdsList, int userId) throws Exception { public void takeMail(ISession iSession,List<String> mailIdsList, int userId) throws Exception {
int msgId = MessageTypeProto.MessageType.MAIL_TAKE_MAIL_ITEM_RESPONESE_VALUE; int msgId = MessageTypeProto.MessageType.MAIL_TAKE_MAIL_ITEM_RESPONESE_VALUE;
@ -211,12 +205,7 @@ public class MailLogic {
MailManager mailManager = user.getMailManager(); MailManager mailManager = user.getMailManager();
CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder(); CommonProto.Drop.Builder dropBuilder = CommonProto.Drop.newBuilder();
// 返回值默认为1 // (默认为1) 1:成功, 0道具为空, 2背包已满
/**
* 1:
* 0
* 2
*/
int result = 1; int result = 1;
for (String mailId : mailIdsList){ for (String mailId : mailIdsList){
@ -247,7 +236,7 @@ public class MailLogic {
mail.setState(Global.MAIL_DRAW_ST_GOT); mail.setState(Global.MAIL_DRAW_ST_GOT);
mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME); mail.setNoUseDeleteTime(TimeUtils.now()+TimeUtils.DAY*Global.MAIL_NOUSE_DELETE_TIME);
mailManager.addMail(mail); mailManager.addMail(mail);
LOGGER.error("玩家领取了邮件uid{},邮件信息:{},当前时间:{}",userId, mail, TimeUtils.now()); LOGGER.info("玩家领取了邮件uid{},邮件信息:{},当前时间:{}",userId, mail, TimeUtils.now());
} }
} }
if (state != 1) { if (state != 1) {
@ -286,34 +275,32 @@ public class MailLogic {
// return cnt; // return cnt;
// } // }
/** //有附件已领取, 无附件已读取的邮件
* , // public void delUserMail(int userId) throws Exception {
*/ // User user = UserManager.getUser(userId);
public void delUserMail(int userId) throws Exception { // MailManager mailManager = user.getMailManager();
User user = UserManager.getUser(userId); // Map<String, Mail> mailMap = mailManager.getMailMap();
MailManager mailManager = user.getMailManager(); // List<String> delMailIds = new CopyOnWriteArrayList<>();
Map<String, Mail> mailMap = mailManager.getMailMap(); // for (Map.Entry<String, Mail> entry : mailMap.entrySet()) {
List<String> delMailIds = new CopyOnWriteArrayList<>(); // Mail cMail = entry.getValue();
for (Map.Entry<String, Mail> entry : mailMap.entrySet()) { // if (cMail.getState() == Global.MAIL_STATE_NEW) {
Mail cMail = entry.getValue(); // continue;
if (cMail.getState() == Global.MAIL_STATE_NEW) { // }
continue; // String mailItem = cMail.getMailItem();
} // if (mailItem.isEmpty() && cMail.getState() != Global.MAIL_STATE_READ) {
String mailItem = cMail.getMailItem(); // continue;
if (mailItem.isEmpty() && cMail.getState() != Global.MAIL_STATE_READ) { // }
continue; // if (!mailItem.isEmpty() && cMail.getState() != Global.MAIL_DRAW_ST_GOT) {
} // continue;
if (!mailItem.isEmpty() && cMail.getState() != Global.MAIL_DRAW_ST_GOT) { // }
continue; // delMailIds.add(cMail.getId());
} // }
delMailIds.add(cMail.getId()); // if (delMailIds.size() != 0){
} // for (String mailId : delMailIds){
if (delMailIds.size() != 0){ // mailManager.removeMail(mailId);
for (String mailId : delMailIds){ // }
mailManager.removeMail(mailId); // }
} // }
}
}
/** /**
* *
@ -431,7 +418,7 @@ public class MailLogic {
MongoUtil.getLjsdMongoTemplate().lastUpdate(); MongoUtil.getLjsdMongoTemplate().lastUpdate();
}catch(Exception e){ }catch(Exception e){
LOGGER.info("发送邮件异常{}",e); LOGGER.error("发送邮件异常{}",e);
e.printStackTrace(); e.printStackTrace();
} }
} }