diff --git a/robot-data/cache/account.secrets b/robot-data/cache/account.secrets
index f5b47f1..5efe46b 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 d7a9fa6..7e743b0 100644
--- a/robot-data/cache/servers.json
+++ b/robot-data/cache/servers.json
@@ -1,28 +1,4 @@
[
- {
- "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
- },
{
"host": "msfwifi.3g.qq.com",
"port": 8080
@@ -32,11 +8,35 @@
"port": 14000
},
{
- "host": "36.155.163.51",
+ "host": "36.155.197.218",
"port": 80
},
{
- "host": "120.241.130.195",
+ "host": "111.30.187.201",
+ "port": 443
+ },
+ {
+ "host": "39.156.125.20",
+ "port": 80
+ },
+ {
+ "host": "36.155.163.117",
+ "port": 8080
+ },
+ {
+ "host": "36.155.207.230",
+ "port": 443
+ },
+ {
+ "host": "39.156.126.247",
+ "port": 443
+ },
+ {
+ "host": "39.156.140.102",
+ "port": 14000
+ },
+ {
+ "host": "120.233.17.147",
"port": 8080
}
]
\ No newline at end of file
diff --git a/robot-data/cache/session.bin b/robot-data/cache/session.bin
index b3f3fd7..de56e58 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
index f963ad6..1312bd4 100644
--- a/src/main/java/com/mtz/qqbot/Controller/listController.java
+++ b/src/main/java/com/mtz/qqbot/Controller/listController.java
@@ -2,6 +2,8 @@ package com.mtz.qqbot.Controller;
import com.mtz.qqbot.Listener.HandleMessageListener;
import com.mtz.qqbot.Listener.RecallMessageListener;
+import com.mtz.qqbot.Listener.ReceiveGroupListener;
+import com.mtz.qqbot.Listener.fishListener;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -17,7 +19,9 @@ public class listController {
"今日群聊1违禁消息：[" + RecallMessageListener.group1InvalidCount + "]条
" +
"今日群聊2违禁消息：[" + RecallMessageListener.group2InvalidCount + "]条
" +
"今日群聊1违禁超过5次QQ号名单:" + RecallMessageListener.group1InvalidMember + "
" +
- "今日群聊2违禁超过5次QQ号名单" + RecallMessageListener.group2InvalidMember;
+ "今日群聊2违禁超过5次QQ号名单" + RecallMessageListener.group2InvalidMember + "
" +
+ "今日机器人被骚扰次数：[" + ReceiveGroupListener.receiveCount + "]
" +
+ "今日钓鱼次数：[" + fishListener.fishCount + "]
";
}
}
diff --git a/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java b/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java
index cbd7cf4..9cd965e 100644
--- a/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java
+++ b/src/main/java/com/mtz/qqbot/Listener/HandleMessageListener.java
@@ -14,7 +14,6 @@ public class HandleMessageListener {
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 c8d7abc..95a17fe 100644
--- a/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java
+++ b/src/main/java/com/mtz/qqbot/Listener/RecallMessageListener.java
@@ -28,8 +28,8 @@ 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);//禁言60秒
+ Thread.sleep(500);//半秒后撤回方便演示
this.recallMessage(event.getMessage());
}
}
diff --git a/src/main/java/com/mtz/qqbot/Listener/ReceiveGroupListener.java b/src/main/java/com/mtz/qqbot/Listener/ReceiveGroupListener.java
index 02ddea8..9bad37f 100644
--- a/src/main/java/com/mtz/qqbot/Listener/ReceiveGroupListener.java
+++ b/src/main/java/com/mtz/qqbot/Listener/ReceiveGroupListener.java
@@ -10,10 +10,13 @@ import java.util.List;
@RobotListener//群聊里发关键词,bot自动艾特并回复
public class ReceiveGroupListener extends MessageListener {
+ public static int receiveCount = 0;
+
public ReceiveGroupListener() {
super(List.of("111"), false);//自定义关键词
}
+ @RobotListenerHandler(contactId = {518909220, 1033597003})
public void receive(GroupMessageEvent event) {
String message = event.getMessage().contentToString();
if (this.invalidText(message)) {//当检测到关键词
@@ -23,18 +26,9 @@ public class ReceiveGroupListener extends MessageListener {
.append(new PlainText("请问有什么可以帮到你"))
.build();
//上面的代码构建了一个MessageChain集合，用来储存要发送的内容
- event.getGroup().sendMessage(chain);//将储存的内容发送
+ event.getGroup().sendMessage(chain);//发送消息到群聊
System.out.println(chain);
+ receiveCount++;
}
}
-
- @RobotListenerHandler(contactId = 518909220)//监控增加群聊1
- public void receiveGroup1Message(GroupMessageEvent event) {
- receive(event);
- }
-
- @RobotListenerHandler(contactId = 1033597003)//监控增加群聊2
- public void receiveGroup2Message(GroupMessageEvent event) {
- receive(event);
- }
}
diff --git a/src/main/java/com/mtz/qqbot/Listener/fishListener.java b/src/main/java/com/mtz/qqbot/Listener/fishListener.java
index 52daf10..274c36a 100644
--- a/src/main/java/com/mtz/qqbot/Listener/fishListener.java
+++ b/src/main/java/com/mtz/qqbot/Listener/fishListener.java
@@ -14,6 +14,7 @@ import java.util.Random;
@RobotListener
public class fishListener extends MessageListener {
+ public static int fishCount = 0;
String[] fishes = {"鲨鱼", "金龙鱼", "鲤鱼", "鲫鱼", "鲅鱼", "罗非鱼", "鲸鱼", "闲鱼", ""};
public fishListener() {
@@ -30,7 +31,7 @@ public class fishListener extends MessageListener {
.append(new At(event.getSender().getId()))
.append(" 开始钓鱼，10秒后收杆")
.build();
- event.getGroup().sendMessage(chain);
+ event.getGroup().sendMessage(chain);//发送消息到群聊
System.out.println(chain);
Thread.sleep(10000);
int whichFish = random.nextInt(fishes.length);
@@ -46,9 +47,10 @@ public class fishListener extends MessageListener {
.append(new At(event.getSender().getId()))
.append(" 你钓上来了一条" + fishes[whichFish])
.build();
- event.getGroup().sendMessage(chain);
+ event.getGroup().sendMessage(chain);//发送消息到群聊
System.out.println(chain);
}
+ fishCount++;
}
}
}
diff --git a/src/main/java/com/mtz/qqbot/Listener/sendByConsoleListener.java b/src/main/java/com/mtz/qqbot/Listener/sendByConsoleListener.java
index 5d419a0..d692710 100644
--- a/src/main/java/com/mtz/qqbot/Listener/sendByConsoleListener.java
+++ b/src/main/java/com/mtz/qqbot/Listener/sendByConsoleListener.java
@@ -5,7 +5,8 @@ import net.itbaima.robot.event.RobotListenerHandler;
import net.itbaima.robot.listener.MessageListener;
import net.mamoe.mirai.event.events.FriendMessageEvent;
import net.mamoe.mirai.event.events.GroupMessageEvent;
-import net.mamoe.mirai.event.events.GroupTempMessageEvent;import net.mamoe.mirai.message.data.At;
+import net.mamoe.mirai.event.events.GroupTempMessageEvent;
+import net.mamoe.mirai.message.data.At;
import net.mamoe.mirai.message.data.MessageChain;
import net.mamoe.mirai.message.data.MessageChainBuilder;
@@ -21,12 +22,12 @@ public class sendByConsoleListener extends MessageListener {
@RobotListenerHandler(concurrency = true)//收到好友消息后，通过控制台给好友发一条消息
public void sendMessageToFriend(FriendMessageEvent event) {
Scanner input = new Scanner(System.in);
- String str = input.nextLine();
- event.getFriend().sendMessage(str);
+ String str = input.nextLine();//控制台输入
+ event.getFriend().sendMessage(str);//发送到群聊
System.out.println("机器人发送：" + str);
}
- @RobotListenerHandler(contactId = 518909220, concurrency = true)//当有人消息中带有“呼叫bot”时，可以从控制台输入一条消息发送
+ @RobotListenerHandler(contactId = {518909220, 1033597003}, concurrency = true)//当有人消息中带有“呼叫bot”时，可以从控制台输入一条消息发送
public void sendMessageToGroup(GroupMessageEvent event) {
String message = event.getMessage().contentToString();
if (this.invalidText(message)) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4410466..9c1984b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,14 +15,16 @@ itbaima:
contact-cache: true
work-dir: robot-data
cache-dir: cache
+
spring:
datasource:
- driverClassName: com.mysql.jdbc.Driver
- url: jdbc:mysql://localhost:3306/microservice
+ driverClassName: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://localhost:3306/database
username: root
- password: root
+ password: 123456
# thymeleaf:
# suffix: .html
# prefix: classpath:/templates/
+
server:
port: 8080
\ No newline at end of file