From a4a81a34f5deb49271159aa2c437dcaf612ae0a5 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 18 Sep 2019 19:25:12 +0800 Subject: [PATCH] test gm --- .../src/main/java/com/ljsd/GmService.java | 69 ++++--------------- 1 file changed, 14 insertions(+), 55 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GmService.java b/serverlogic/src/main/java/com/ljsd/GmService.java index 8d16b8a23..bb693fcc6 100644 --- a/serverlogic/src/main/java/com/ljsd/GmService.java +++ b/serverlogic/src/main/java/com/ljsd/GmService.java @@ -45,58 +45,6 @@ public class GmService implements RPCRequestGMIFace.Iface { GmInterface obj; try { - if(cmd.contains("force")){ - int uid = Integer.valueOf(arg[1]); - List uids = new LinkedList<>(); - uids.add(uid); - /* InnerMessageUtil.broadcastWithRandom(new AyyncWorker() { - @Override - public void work(User user) throws Exception { - int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, 1, false); - LOGGER.info("cmd_________fore"+user.getId()+":"+teamForce); - user.getPlayerInfoManager().setMaxForce(teamForce); - String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false); - RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), teamForce); - } - },uids , 10);*/ - User userInMem = UserManager.getUserInMem(uid); - AyyncWorker ayyncWorker = new AyyncWorker(userInMem,true) { - @Override - public void work(User user) throws Exception { - int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, 1, false); - LOGGER.info("cmd_________fore"+user.getId()+":"+teamForce); - user.getPlayerInfoManager().setMaxForce(teamForce); - String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false); - RedisUtil.getInstence().zsetAddOne(key, String.valueOf(user.getId()), teamForce); - } - }; - ProtocolsManager instance = ProtocolsManager.getInstance(); - HandlerLogicThread handlerThread = instance.handlerThreads[uid % instance.HANDLER_THREAD_NUM]; - handlerThread.addAyyncWorker(ayyncWorker); - return result; - } - - if(cmd.contains("hotfix")){ - List usersInDB = MongoUtil.getLjsdMongoTemplate().findAll("user", User.class); - List sendIds = new ArrayList<>(usersInDB.size()); - for(User user1 : usersInDB){ - User userInMem = UserManager.getUserInMem(user1.getId()); - if(userInMem == null){ - continue; - } - sendIds.add(user1.getId()); - } - /* InnerMessageUtil.broadcastWithRandom(new AyyncWorker() { - @Override - public void work(User user) throws Exception { - LOGGER.info("hotfix user={}",user.getId()); - MongoUtil.getLjsdMongoTemplate().save(user); - } - }, sendIds, Math.min(10, 10)); - result.setResultCode(1);*/ - return result; - } - obj = (GmInterface) Class.forName( GmInterface.class.getPackage().getName() + ".Cmd_" + arg[0].toLowerCase()).newInstance(); @@ -117,9 +65,20 @@ public class GmService implements RPCRequestGMIFace.Iface { sendIds.add(session.getUid()); } } else { - String[] ids = parameters[0].split("#"); - for (String id : ids) { - sendIds.add(Integer.valueOf(id)); + if(cmd.contains("hotfix")){ + List usersInDB = MongoUtil.getLjsdMongoTemplate().findAll("user", User.class); + for(User user1 : usersInDB){ + User userInMem = UserManager.getUserInMem(user1.getId()); + if(userInMem == null){ + continue; + } + sendIds.add(user1.getId()); + } + }else{ + String[] ids = parameters[0].split("#"); + for (String id : ids) { + sendIds.add(Integer.valueOf(id)); + } } } int randomTime = sendIds.size() * 1;