diff --git a/pom.xml b/pom.xml index 31836cf..404b48c 100644 --- a/pom.xml +++ b/pom.xml @@ -47,6 +47,10 @@ mysql-connector-java 8.0.31 + + org.projectlombok + lombok + diff --git a/robot-data/cache/account.secrets b/robot-data/cache/account.secrets index 7532458..b4ebb9b 100644 Binary files a/robot-data/cache/account.secrets and b/robot-data/cache/account.secrets differ diff --git a/robot-data/cache/servers.json b/robot-data/cache/servers.json index 500434e..c545c06 100644 --- a/robot-data/cache/servers.json +++ b/robot-data/cache/servers.json @@ -1,42 +1,42 @@ [ { - "host": "111.30.187.201", - "port": 14000 - }, - { - "host": "39.156.140.250", - "port": 443 - }, - { - "host": "39.156.126.247", + "host": "111.30.187.245", "port": 80 }, { - "host": "36.155.163.25", + "host": "36.155.163.66", "port": 8080 }, + { + "host": "36.155.207.230", + "port": 80 + }, + { + "host": "111.30.169.83", + "port": 14000 + }, + { + "host": "39.156.126.229", + "port": 443 + }, + { + "host": "120.241.130.216", + "port": 14000 + }, { "host": "msfwifi.3g.qq.com", "port": 8080 }, { - "host": "111.30.187.201", - "port": 443 - }, - { - "host": "36.155.207.230", + "host": "36.155.197.218", "port": 8080 }, - { - "host": "36.155.163.51", - "port": 80 - }, - { - "host": "120.232.27.24", - "port": 14000 - }, { "host": "120.232.31.250", "port": 8080 + }, + { + "host": "111.30.169.83", + "port": 443 } ] \ No newline at end of file diff --git a/src/main/java/com/mtz/qqbot/Controller/listController.java b/src/main/java/com/mtz/qqbot/Controller/listController.java index a5ac5c9..0727f50 100644 --- a/src/main/java/com/mtz/qqbot/Controller/listController.java +++ b/src/main/java/com/mtz/qqbot/Controller/listController.java @@ -18,8 +18,8 @@ public class listController { "今日收到的群聊临时会话消息:[" + HandleMessageListener.groupTempMessageCount + "]条

" + "今日群聊1违禁消息:[" + RecallMessageListener.group1InvalidCount + "]条
" + "今日群聊2违禁消息:[" + RecallMessageListener.group2InvalidCount + "]条
" + - "今日群聊1违禁超过5次名单:" + RecallMessageListener.group1InvalidMember + "
" + - "今日群聊2违禁超过5次名单:" + RecallMessageListener.group2InvalidMember + "

" + + "今日群聊1违禁超过5次的QQ号名单:" + RecallMessageListener.group1InvalidMember + "
" + + "今日群聊2违禁超过5次的QQ号名单:" + RecallMessageListener.group2InvalidMember + "

" + "今日机器人被骚扰次数:[" + ReceiveGroupListener.receiveCount + "]
" + "今日钓鱼次数:[" + fishListener.fishCount + "]

" + "返回标题页面"; diff --git a/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java b/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java index 6acb242..e74945a 100644 --- a/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java +++ b/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java @@ -17,9 +17,9 @@ public class RecallMessageListener extends MessageListener { public static int group2InvalidCount = 0; public Map group1MemberInvalidedCountList = new HashMap(); - public static List group1InvalidMember = new ArrayList(); + public static List group1InvalidMember = new ArrayList(); public Map group2MemberInvalidedCountList = new HashMap(); - public static List group2InvalidMember = new ArrayList(); + public static List group2InvalidMember = new ArrayList(); public RecallMessageListener() { super(List.of("原神", "OP"), true);//自定义违禁词 @@ -28,7 +28,7 @@ public class RecallMessageListener extends MessageListener { public void recall(GroupMessageEvent event) throws InterruptedException {//当有人发违禁词自动撤回并禁言一分钟 String message = event.getMessage().contentToString(); if (this.invalidText(message)) { - event.getSender().mute(60);//禁言60秒 +// event.getSender().mute(60);//禁言60秒 Thread.sleep(500);//半秒后撤回方便演示 this.recallMessage(event.getMessage()); } diff --git a/src/main/java/com/mtz/qqbot/Tool/invalidMember.java b/src/main/java/com/mtz/qqbot/Tool/invalidMember.java index a6ab1ce..cdae99b 100644 --- a/src/main/java/com/mtz/qqbot/Tool/invalidMember.java +++ b/src/main/java/com/mtz/qqbot/Tool/invalidMember.java @@ -15,9 +15,9 @@ public class invalidMember { } } - public static void invalidMemberList(List groupInvalidMember, Map groupMemberInvalidedCountList, GroupMessageEvent event) { + public static void invalidMemberList(List groupInvalidMember, Map groupMemberInvalidedCountList, GroupMessageEvent event) { if (groupMemberInvalidedCountList.get(event.getSender().getId()).equals(5)) { - groupInvalidMember.add(event.getSenderName()); + groupInvalidMember.add(event.getSender().getId()); } } }