From 21fc5dd12b79ab420c47ff047cfc1faefb374be0 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 11 Jan 2024 16:01:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E6=9C=8D=E5=90=8E=E5=85=AC?= =?UTF-8?q?=E4=BC=9A=E5=8C=BA=E6=9C=8Did=E6=9C=AA=E6=9B=B4=E6=AD=A3?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/GameApplication.java | 4 +-- .../ljsd/jieling/chat/logic/ChatLogic.java | 2 +- .../jieling/logic/family/GuildFightLogic.java | 4 +-- .../ljsd/jieling/logic/family/GuildLogic.java | 26 ++++++++++++++++--- .../jieling/logic/rank/CrossRankManager.java | 9 ------- .../ljsd/jieling/util/ShieldedWordUtils.java | 3 +-- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GameApplication.java b/serverlogic/src/main/java/com/ljsd/GameApplication.java index 59ae8f1c2..1ddefecd4 100644 --- a/serverlogic/src/main/java/com/ljsd/GameApplication.java +++ b/serverlogic/src/main/java/com/ljsd/GameApplication.java @@ -9,7 +9,7 @@ import com.ljsd.jieling.hotfix.HotfixUtil; import com.ljsd.jieling.logic.GlobleSystemLogic; import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic; import com.ljsd.jieling.logic.dao.ServerConfig; -import com.ljsd.jieling.logic.rank.CrossRankManager; +import com.ljsd.jieling.logic.family.GuildLogic; import com.ljsd.jieling.network.NetManager; import com.ljsd.jieling.util.ConfigurableApplicationContextManager; import config.SGameSetting; @@ -60,7 +60,7 @@ public class GameApplication { SkyEyeService.getInstance().onStart(); CrossServiceLogic.serverInit(); GlobleSystemLogic.getInstence().getCrossGroup(); - CrossRankManager.getInstance().guildCacheHandle(); + GuildLogic.getInstance().guildCacheHandle(); HotfixUtil.getInstance(); //控制台gm Scanner sc = new Scanner(System.in); 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 e709efaae..7a40a8627 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 @@ -163,7 +163,7 @@ public class ChatLogic { case 1: //0|content需要解字符串 String s = message; - String[] strs = message.split("|",3); + String[] strs = message.split("//|",3); if(strs.length==3){ s = strs[2]; } 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 735bcace1..eb90e5632 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 @@ -173,7 +173,7 @@ public class GuildFightLogic { public static void quickSetDefend(ISession session, int buildId, int uid, MessageTypeProto.MessageType messageType) throws Exception { User user = UserManager.getUser(uid); TeamPosManager teamPosManager = user.getTeamPosManager(); - if (teamPosManager.getTeamPosForHero().get(501) == null || teamPosManager.getTeamPosForHero().get(501).size() < 1) { + if (teamPosManager.getTeamPosForHero().get(501) == null || teamPosManager.getTeamPosForHero().get(501).isEmpty()) { teamPosManager.updateTeamPosByTeamId(501, teamPosManager.getTeamPosForHero().get(1)); } if (buildId == 0) { @@ -976,7 +976,7 @@ public class GuildFightLogic { if(status==0){ LOGGER.info("阶段变为布防"); Map guildInfoMap = GuilidManager.getAllGuildInfos(); - if(guildInfoMap.size()>0){ + if(!guildInfoMap.isEmpty()){ for(Map.Entry entry:guildInfoMap.entrySet()){ int build = 0; Map> members = entry.getValue().getMembers(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 155834be7..b9a4cf36a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -50,6 +50,7 @@ import config.*; import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.data.mongodb.core.MongoTemplate; import rpc.protocols.CommonProto; import rpc.protocols.Family; import rpc.protocols.MessageTypeProto; @@ -61,7 +62,7 @@ import java.util.*; import java.util.stream.Collectors; public class GuildLogic { - + private static final Logger LOGGER = LoggerFactory.getLogger(GuildLogic.class); static GuildLogic guildLogicInstance = new GuildLogic(); public static GuildLogic getInstance(){ return guildLogicInstance; @@ -126,8 +127,6 @@ public class GuildLogic { MailLogic.getInstance().sendMail(user.getId(), title, content, mailReward, nowTime, Global.MAIL_EFFECTIVE_TIME); } - private static final Logger LOGGER = LoggerFactory.getLogger(GuildLogic.class); - public static int getMemberType(int targetUid, Map> members ){ for(Map.Entry> memberEntry : members.entrySet()){ Integer position = memberEntry.getKey(); @@ -1727,4 +1726,25 @@ public class GuildLogic { } } + /** + * 工会缓存处理 + */ + public void guildCacheHandle(){ + int serverId = GameApplication.serverId; + MongoTemplate mongoTemplate = MongoUtil.getInstence().getMonogTemplate(serverId); + List all = mongoTemplate.findAll(GuildInfo.class); + if (all == null || all.isEmpty()){ + return; + } + for (GuildInfo info : all) { + if (info.getServerId() == serverId){ + continue; + } + info.setServerId(serverId); + GuilidManager.saveOrUpdateGuildInfo(info); + LOGGER.info("================合服后处理公会区服id, guildid:{}, guildname:{}", info.getId(), info.getName()); + } + LOGGER.info("================工会缓存处理完成============="); + } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java index 39675592d..59ba0413f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/CrossRankManager.java @@ -93,13 +93,4 @@ public class CrossRankManager { return true; } - /** - * 工会缓存处理 - */ - public void guildCacheHandle(){ -// Map mapValues = RedisUtil.getInstence().getMapValues(RedisKey.FAMILY_INFO, "", String.class, GuildInfo.class); - - LOGGER.info("==================工会缓存处理============="); - } - } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ShieldedWordUtils.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ShieldedWordUtils.java index 2021f7add..5c012184e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ShieldedWordUtils.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ShieldedWordUtils.java @@ -23,12 +23,11 @@ public class ShieldedWordUtils { result = validateUserName(name); } // 校验违禁字符 - if (result == true){ + if (result){ try { result = !SensitivewordFilter.isContaintSensitiveWord(name,1); } catch (Exception e) { LOGGER.error("检查名称,报错:"+e.getMessage()); - result = true; } } return result; From 31477063888135e35cb920fb8c103b7abbfe6fcc Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Thu, 11 Jan 2024 16:06:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=85=A8=E6=B8=A0=E9=81=93=E5=94=AF?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java index 568f0489f..24ab14a75 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuilidManager.java @@ -53,7 +53,7 @@ public class GuilidManager { public static GuildInfo getGuildInfoByName(String guildName){ Map guildInfoMap = RedisUtil.getInstence().getmapvaluekeyclass(getFamilyKey(), String.class, GuildInfo.class); for (GuildInfo value : guildInfoMap.values()) { - if (value.getName().equals(guildName) && value.getServerId() == GameApplication.serverId){ + if (value.getName().equals(guildName)){ return value; } }