diff --git a/robot-data/cache/account.secrets b/robot-data/cache/account.secrets
index 79e9cc1..f5b47f1 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 6430585..d7a9fa6 100644
--- a/robot-data/cache/servers.json
+++ b/robot-data/cache/servers.json
@@ -1,6 +1,26 @@
[
{
- "host": "49.7.253.58",
+ "host": "111.30.169.83",
+ "port": 14000
+ },
+ {
+ "host": "39.156.126.247",
+ "port": 80
+ },
+ {
+ "host": "39.156.126.247",
+ "port": 443
+ },
+ {
+ "host": "36.155.163.25",
+ "port": 443
+ },
+ {
+ "host": "36.155.187.225",
+ "port": 8080
+ },
+ {
+ "host": "111.30.169.83",
"port": 443
},
{
@@ -8,35 +28,15 @@
"port": 8080
},
{
- "host": "49.7.253.65",
- "port": 80
- },
- {
- "host": "183.2.144.33",
+ "host": "120.232.65.165",
"port": 14000
},
{
- "host": "183.47.102.193",
- "port": 8080
- },
- {
- "host": "117.62.242.155",
+ "host": "36.155.163.51",
"port": 80
},
{
- "host": "121.229.94.199",
- "port": 8080
- },
- {
- "host": "222.94.109.78",
- "port": 8080
- },
- {
- "host": "49.7.253.177",
- "port": 443
- },
- {
- "host": "42.81.192.158",
+ "host": "120.241.130.195",
"port": 8080
}
]
\ No newline at end of file
diff --git a/robot-data/cache/session.bin b/robot-data/cache/session.bin
index 34c65bd..b3f3fd7 100644
Binary files a/robot-data/cache/session.bin and b/robot-data/cache/session.bin differ
diff --git a/src/main/java/com/mtz/qqbot/Controller/listController.java b/src/main/java/com/mtz/qqbot/Controller/listController.java
new file mode 100644
index 0000000..f963ad6
--- /dev/null
+++ b/src/main/java/com/mtz/qqbot/Controller/listController.java
@@ -0,0 +1,23 @@
+package com.mtz.qqbot.Controller;
+
+import com.mtz.qqbot.Listener.HandleMessageListener;
+import com.mtz.qqbot.Listener.RecallMessageListener;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class listController {
+
+ @GetMapping("/messagelist")
+ public String list() {
+ return "今日好友消息：[" + HandleMessageListener.friendMessageCount + "]条
" +
+ "今日群聊1消息：[" + HandleMessageListener.group1MessageCount + "]条
" +
+ "今日群聊2消息：[" + HandleMessageListener.group2MessageCount + "]条
" +
+ "今日收到的群聊临时会话消息：[" + HandleMessageListener.groupTempMessageCount + "]条
" +
+ "今日群聊1违禁消息：[" + RecallMessageListener.group1InvalidCount + "]条
" +
+ "今日群聊2违禁消息：[" + RecallMessageListener.group2InvalidCount + "]条
" +
+ "今日群聊1违禁超过5次QQ号名单:" + RecallMessageListener.group1InvalidMember + "
" +
+ "今日群聊2违禁超过5次QQ号名单" + RecallMessageListener.group2InvalidMember;
+ }
+
+}
diff --git a/src/main/java/com/mtz/qqbot/Controller/testController.java b/src/main/java/com/mtz/qqbot/Controller/testController.java
deleted file mode 100644
index c2f9123..0000000
--- a/src/main/java/com/mtz/qqbot/Controller/testController.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.mtz.qqbot.Controller;
-
-import com.mtz.qqbot.Listener.HandleMessageListener;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class testController {
-
- @GetMapping("/messagelist")
- public String hello() {
- return "今日好友消息：[" + HandleMessageListener.friendMessageCount + "]条\n" +
- "今日群聊1消息：[" + HandleMessageListener.group1MessageCount + "]条\n" +
- "今日群聊2消息：[" + HandleMessageListener.group2MessageCount + "]条\n" +
- "今日收到的群聊临时会话消息：[" + HandleMessageListener.groupTempMessageCount + "]条\n";
- }
-
-}
diff --git a/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java b/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java
index e909838..cbd7cf4 100644
--- a/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java
+++ b/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java
@@ -13,6 +13,8 @@ public class HandleMessageListener {
public static int group2MessageCount = 0;
public static int groupTempMessageCount = 0;
+
+
@RobotListenerHandler//接收来自好友的消息，打印到控制台
public void handleFriendMessage(FriendMessageEvent event) {
String message = event.getMessage().contentToString();
diff --git a/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java b/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java
index cd7d0d3..c8d7abc 100644
--- a/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java
+++ b/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java
@@ -1,16 +1,26 @@
package com.mtz.qqbot.Listener;
+import com.mtz.qqbot.Tool.invalidMember;
import net.itbaima.robot.event.RobotListener;
import net.itbaima.robot.event.RobotListenerHandler;
import net.itbaima.robot.listener.MessageListener;
import net.mamoe.mirai.event.events.GroupMessageEvent;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+
@RobotListener
public class RecallMessageListener extends MessageListener {
public static int group1InvalidCount = 0;
public static int group2InvalidCount = 0;
+ public Map group1MemberInvalidedCountList = new HashMap();
+ public static List group1InvalidMember = new ArrayList();
+ public Map group2MemberInvalidedCountList = new HashMap();
+ public static List group2InvalidMember = new ArrayList();
+
public RecallMessageListener() {
super(List.of("原神", "OP"), true);//自定义违禁词
}
@@ -18,10 +28,9 @@ 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);
- Thread.sleep(500);//防止操作太快被腾讯封禁
+// event.getSender().mute(60);
+// Thread.sleep(500);//半秒后撤回方便演示
this.recallMessage(event.getMessage());
-
}
}
@@ -29,11 +38,15 @@ public class RecallMessageListener extends MessageListener {
public void recallGroup1Message(GroupMessageEvent event) throws InterruptedException {
recall(event);
group1InvalidCount++;
+ invalidMember.invalidCountList(group1MemberInvalidedCountList, event);
+ invalidMember.invalidMemberList(group1InvalidMember, group1MemberInvalidedCountList, event);
}
@RobotListenerHandler(contactId = 1033597003)//监控增加群聊2
public void recallGroup2Message(GroupMessageEvent event) throws InterruptedException {
recall(event);
group2InvalidCount++;
+ invalidMember.invalidCountList(group2MemberInvalidedCountList, event);
+ invalidMember.invalidMemberList(group2InvalidMember, group2MemberInvalidedCountList, event);
}
}
diff --git a/src/main/java/com/mtz/qqbot/Tool/invalidMember.java b/src/main/java/com/mtz/qqbot/Tool/invalidMember.java
new file mode 100644
index 0000000..cdae99b
--- /dev/null
+++ b/src/main/java/com/mtz/qqbot/Tool/invalidMember.java
@@ -0,0 +1,23 @@
+package com.mtz.qqbot.Tool;
+
+import net.mamoe.mirai.event.events.GroupMessageEvent;
+
+import java.util.List;
+import java.util.Map;
+
+public class invalidMember {
+ public static void invalidCountList(Map groupMemberInvalidedCountList, GroupMessageEvent event) {
+ if (groupMemberInvalidedCountList.get(event.getSender().getId()) == null) {
+ groupMemberInvalidedCountList.put(event.getSender().getId(), 1);//初始化
+ } else {
+ int invalidCount = Integer.parseInt(String.valueOf(groupMemberInvalidedCountList.get(event.getSender().getId()))) + 1;
+ groupMemberInvalidedCountList.put(event.getSender().getId(), invalidCount);
+ }
+ }
+
+ public static void invalidMemberList(List groupInvalidMember, Map groupMemberInvalidedCountList, GroupMessageEvent event) {
+ if (groupMemberInvalidedCountList.get(event.getSender().getId()).equals(5)) {
+ groupInvalidMember.add(event.getSender().getId());
+ }
+ }
+}