diff --git a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java index c5472d38b..eeccce801 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/chat/logic/ChatLogic.java @@ -186,27 +186,27 @@ public class ChatLogic { break; case 3: //好友 List friends = friendManager.getFriends(); - if (!friends.contains(friendId)){ + if (!friends.contains(friendId)) { throw new ErrorCodeException(ErrorCode.CHAT_NOT_FRIENDS); } //现在好友推送 - if (OnlineUserManager.checkUidOnline(friendId)){ + if (OnlineUserManager.checkUidOnline(friendId)) { ISession sessionByUid = OnlineUserManager.getSessionByUid(friendId); - chatInfo = CBean2Proto.getChatInfoBuilder(user,message,nowTime,0); + chatInfo = CBean2Proto.getChatInfoBuilder(user, message, nowTime, 0); sendChatInfoIndication = ChatProto.SendChatInfoIndication.newBuilder() .setChatInfo(chatInfo) .setType(1) .build(); assert sessionByUid != null; MessageUtil.sendIndicationMessage(sessionByUid, 1, MessageTypeProto.MessageType.SEND_CHAT_INFO_INDICATION_VALUE, sendChatInfoIndication, true); - }else{ - RedisUtil.getInstence().hset(GameApplication.serverId +RedisKey.CUser_Chat+friendId,uid +"#"+ nowTime,message, -1); + } else { + RedisUtil.getInstence().hset(GameApplication.serverId + RedisKey.CUser_Chat + friendId, uid + "#" + nowTime, message, -1); } break; - default:{ - break; - } + default: { + break; + } } onSendChatSuccess(user,chatType,message); ReportUtil.onReportEvent(user, ReportEventEnum.SEND_MESSAGE.getType(),String.valueOf(chatType),message); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java index 4eec58441..a39a26dc7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java @@ -2,13 +2,15 @@ package com.ljsd.jieling.db.mongo; import com.google.gson.*; import com.ljsd.jieling.util.SysUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.*; import java.nio.charset.Charset; import java.nio.file.Files; public class MongoUtiltest { - + private static final Logger LOGGER = LoggerFactory.getLogger(MongoUtiltest.class); public static void main(String[] args) { try { @@ -30,7 +32,7 @@ public class MongoUtiltest { StringBuilder stringBuilder2 = new StringBuilder(); if (MongoUtil.equill(obj1, obj, stringBuilder,stringBuilder2)) { - System.out.println("匹配"); + LOGGER.info("匹配"); } else { File file3 = new File(SysUtil.getPath("conf/checkout_diffmem__" +dbf3.getName()+ ".txt")); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java index 0334f87d4..c756225f5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java @@ -57,7 +57,7 @@ public class FamilyFeteRequestHandler extends BaseHandler sendUids = new HashSet<>(); @@ -20,7 +23,7 @@ public class Cmd_test_lock extends GmAbstract { while (i++<10){ String name = Thread.currentThread().getName(); Thread.currentThread().sleep(1000); - System.out.println("name"+name+" = [" + i + "]"); + LOGGER.info("name=>{}, i=>{}",name, i); } return true; } 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 ca3955b46..1eecb89be 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 @@ -909,8 +909,8 @@ public class ActivityLogic implements IEventHandler{ temp[0] = costConfig[0][0]; temp[1] = (int) MathUtils.calABX(activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss(), costConfig[1]); cost[0] = temp; - LOGGER.info("本次为第{}次抽取,消耗{}个数为{}", activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss(), temp[0], temp[1]); - boolean costResult = ItemUtil.itemCost(user, cost, BIReason.BLESS_CHOOSE_CONSUME, 1); + LOGGER.info("blessChoose uid=>{} 本次为第{}次抽取,消耗{}个数为{}", user.getId(), activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss(), temp[0], temp[1]); + boolean costResult = ItemUtil.itemCost(user, cost, BIReason.BLESS_CHOOSE_CONSUME, locationId); if (!costResult) { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } @@ -930,7 +930,7 @@ public class ActivityLogic implements IEventHandler{ break; } } - LOGGER.info("本次抽取的Id为{}", resultRewardId); + LOGGER.info("blessChoose uid=>{}本次抽取的Id为{}", user.getId(), resultRewardId); Map poolMap = STableManager.getConfig(SBlessingRewardPool.class); int[][] dropItem = new int[1][]; for (Integer count : SBlessingConfig.blessingConfigMap.get(blessActivityId).getCounts()) { @@ -1266,7 +1266,7 @@ public class ActivityLogic implements IEventHandler{ int[][] costItems = new int[1][]; int[] costTemp = {cost[0][0],num}; costItems[0]=costTemp; - boolean result = ItemUtil.itemCost(user,costItems,BIReason.TREASURE_BUY_LEVEL_CONSUME,1); + boolean result = ItemUtil.itemCost(user,costItems,BIReason.TREASURE_BUY_LEVEL_CONSUME, level); if(result) { user.getPlayerInfoManager().setTreasureLevel(level); }else{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index 83dbfb9fa..ec171fcfc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -391,7 +391,7 @@ public class ChampionshipLogic { MailLogic.getInstance().sendMail(user.getId(), title, content, ItemUtil.getMailReward(sChampionshipReward.getSeasonReward()), nowTime, Global.MAIL_EFFECTIVE_TIME); } }catch (Exception e){ - System.out.println("Exception e = "+"size"+ arenaRankInfo.size()+ e.toString()); + LOGGER.info("Exception e = "+"size"+ arenaRankInfo.size()+ e.toString()); } MongoUtil.getLjsdMongoTemplate().lastUpdate(); @@ -411,7 +411,7 @@ public class ChampionshipLogic { costs[0] = new int[2]; costs[0][0] = arenaItemId; costs[0][1] = itemNum; - ItemUtil.itemCost(user, costs, BIReason.CHAMPIONM_EXCHANGE_CONSUME, 0); + ItemUtil.itemCost(user, costs, BIReason.CHAMPIONM_EXCHANGE_CONSUME, sendId); Map itemReward = new HashMap<>(1); itemReward.put(rewardItemId, itemNum / sChampionshipSetting.getExchangeItem()); ItemUtil.addItem(user, itemReward, null, BIReason.CHAMPIONM_EXCHANGE_REWARD); 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 e374e237e..6aeea7c99 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 @@ -1230,7 +1230,7 @@ public class GuildFightLogic { public static Family.CarDelayProgressIndication carDelayProgressIndication; public static void minuteCheckForCarFight() throws Exception { - LOGGER.info("车迟斗法progress={}",carProgress); + LOGGER.info("minuteCheckForCarFight 车迟斗法progress={}",carProgress); int carProgressTmp =carProgress; int id =1; @@ -1288,7 +1288,7 @@ public class GuildFightLogic { }else{ carProgressTmp = -1; } - System.out.println("当前状态"+carProgressTmp); + LOGGER.info("minuteCheckForCarFight 当前状态=>{}", carProgressTmp); if(carProgressTmp!=carProgress){ int battleStartTime = 0; int grapStartTime = 0; @@ -1318,7 +1318,7 @@ public class GuildFightLogic { public static void sendAllProgressUpdate(){ //向全服玩家广播进度变更信息 - System.out.println("状态更改发送推送"); + LOGGER.info("sendAllProgressUpdate 状态更改发送推送"); for(ISession session : OnlineUserManager.sessionMap.values()){ MessageUtil.sendIndicationMessage(session,1, MessageTypeProto.MessageType.CAR_DELAY_PROGRESS_INDICATION_VALUE,carDelayProgressIndication,true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index e1fc6a815..e7af9647e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -406,7 +406,7 @@ public class HeroLogic{ for(int mustId:mustSet){ maxId = mustId>maxId?mustId:maxId; } - System.out.println("触发必出"+maxId); + LOGGER.info("randomOne uid=>{} 触发必出=>{}", user.getId(), maxId); SLotterySpecialConfig onConfig = null; for(SLotterySpecialConfig everyConfig:specialConfigs){ if(everyConfig.getDifferentType()!=maxId){ @@ -783,6 +783,9 @@ public class HeroLogic{ } for(;oldLevel= Integer.MAX_VALUE) { + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } int composeNum = itemNum/sItem.getUsePerCount(); SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); if (composeNum <= 0 || composeNum > gameSetting.getHeroCompoundLimit()){ @@ -2028,7 +2037,7 @@ public class HeroLogic{ if (hasHeroNum + composeNum > gameSetting.getHeroNumlimit()){ throw new ErrorCodeException(ErrorCode.HERO_HERO_MAX); } - boolean result = ItemUtil.checkCost(user, sItem, itemNum,BIReason.COMPOS_HERO_CONSUME,0); + boolean result = ItemUtil.checkCost(user, sItem, itemNum,BIReason.COMPOS_HERO_CONSUME,itemId); if (!result){ throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } 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 afe1457ca..80f90a88d 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 @@ -6,6 +6,8 @@ import com.ljsd.jieling.ktbeans.sendbeans.ReportServerEvent; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Date; import java.util.HashMap; @@ -18,6 +20,9 @@ import java.util.Set; * @discribe */ public class OnlineUserReportTask extends Thread { + + private static final Logger LOGGER = LoggerFactory.getLogger(OnlineUserReportTask.class); + public OnlineUserReportTask(){ setName("OnlineUserReportTask"); } @@ -53,7 +58,7 @@ public class OnlineUserReportTask extends Thread { properties.put("platform","DEFAULT_platform"); properties.put("#time",new Date()); ReportServerEvent reportServerEvent = new ReportServerEvent("online_user_amount",properties); - System.out.println(reportServerEvent.toString()); + LOGGER.info("OnlineUserReportTask reportServerEvent=>{}", reportServerEvent.toString()); ReportUtil.doReport(reportServerEvent); }catch (Exception e){ e.printStackTrace(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 35f0379cb..5e858a363 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1261,7 +1261,10 @@ public class ItemUtil { } return false; } - + if (entry.getValue() <= 0) { + LOGGER.info("checkCost uid=>{} use negative item itemId=>{} count=>{}", user.getId(), entry.getKey(), entry.getValue()); + return false; + } if (temporaryItem == null && item.getItemNum() < entry.getValue()) { return false; } 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 908a1d741..a76cca1e2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -39,7 +39,7 @@ public class MessageUtil { } else { backMessage = generatedMessage.toByteArray(); if (backMessage.length != 0) - LOGGER.info("\r\n" + "uid:" + uid + ":\r\n" + JsonFormat.printToString(generatedMessage)); + LOGGER.info("wrappedBuffer uid=>{}, generatedMessage=>{}", uid, JsonFormat.printToString(generatedMessage)); } int length = PackageConstant.UID_FIELD_LEN + PackageConstant.TOKEN_LEN @@ -64,7 +64,7 @@ public class MessageUtil { int[] secretKey = Tea.KEY; byte[] bytes1 = Tea.encrypt2(bytes, secretKey); if (backMessage.length != 0) { - LOGGER.info("sendbyte"+bytes1.length); + LOGGER.info("wrappedBuffer uid=>{} sendbyte=>{}", uid, bytes1.length); } return bytes1; } diff --git a/tablemanager/src/main/java/config/SExchangeRate.java b/tablemanager/src/main/java/config/SExchangeRate.java index 7b88fbee8..3305aa6fd 100644 --- a/tablemanager/src/main/java/config/SExchangeRate.java +++ b/tablemanager/src/main/java/config/SExchangeRate.java @@ -67,9 +67,6 @@ public class SExchangeRate implements BaseConfig { } - - - System.out.println(""); } diff --git a/test/src/main/java/com/ljsd/network/client/NettyTCPClientHandler.java b/test/src/main/java/com/ljsd/network/client/NettyTCPClientHandler.java index 6a5a590c3..31a29af6e 100644 --- a/test/src/main/java/com/ljsd/network/client/NettyTCPClientHandler.java +++ b/test/src/main/java/com/ljsd/network/client/NettyTCPClientHandler.java @@ -124,9 +124,9 @@ public class NettyTCPClientHandler extends SimpleChannelInboundHandler { if(msgId == RECONNECT_RESPONSE_VALUE){ rec =true; } - - System.out.println("back hartbeat id : "+msgId); + + LOGGER.info("channelRead0 back hartbeat id : {}", msgId); //System.out.println(JsonFormat.printToString());