diff --git a/src/main/java/com/yutou/qqbot/MessageEvent/AdminMessage.java b/src/main/java/com/yutou/qqbot/MessageEvent/AdminMessage.java index 9942225..c22a44f 100644 --- a/src/main/java/com/yutou/qqbot/MessageEvent/AdminMessage.java +++ b/src/main/java/com/yutou/qqbot/MessageEvent/AdminMessage.java @@ -10,6 +10,7 @@ import com.yutou.qqbot.utlis.AppTools; import com.yutou.qqbot.utlis.Log; import com.yutou.qqbot.utlis.StringUtils; +import java.lang.reflect.InvocationTargetException; import java.util.List; public class AdminMessage extends Message { @@ -82,6 +83,12 @@ public class AdminMessage extends Message { if (msgGroup.length == 1) { StringBuilder builder = new StringBuilder(); for (Class aClass : Model.classList) { + try { + Model model= (Model) aClass.getDeclaredConstructor().newInstance(); + builder.append("[").append(model.getModelName()).append("]"); + } catch (Exception e) { + e.printStackTrace(); + } builder.append(aClass.getName()).append("\n"); } QQBotManager.getInstance().sendMessage(qq, "使用方法：" + QQCommands.MODEL_ADD + " [qqnumber] 模块" + "\n" + "可设置以下模块，用&分割"); diff --git a/src/main/java/com/yutou/qqbot/QQBotManager.java b/src/main/java/com/yutou/qqbot/QQBotManager.java index a4df99f..e0aeba9 100644 --- a/src/main/java/com/yutou/qqbot/QQBotManager.java +++ b/src/main/java/com/yutou/qqbot/QQBotManager.java @@ -235,5 +235,7 @@ public class QQBotManager { } - + public Bot getBot() { + return bot; + } } diff --git a/src/main/java/com/yutou/qqbot/interfaces/ModelInterface.java b/src/main/java/com/yutou/qqbot/interfaces/ModelInterface.java index d44a9e6..28b64a1 100644 --- a/src/main/java/com/yutou/qqbot/interfaces/ModelInterface.java +++ b/src/main/java/com/yutou/qqbot/interfaces/ModelInterface.java @@ -3,4 +3,5 @@ package com.yutou.qqbot.interfaces; public interface ModelInterface { boolean isUserPublic(); String[] getUsePowers(); + String getModelName(); } diff --git a/src/main/java/com/yutou/qqbot/models/Animal/TurnipProphet.java b/src/main/java/com/yutou/qqbot/models/Animal/TurnipProphet.java index 1c5b0b2..a3534c2 100644 --- a/src/main/java/com/yutou/qqbot/models/Animal/TurnipProphet.java +++ b/src/main/java/com/yutou/qqbot/models/Animal/TurnipProphet.java @@ -54,6 +54,11 @@ public class TurnipProphet extends Model { }; } + @Override + public String getModelName() { + return "大头菜"; + } + Long user, sendQQ; @Override @@ -270,8 +275,8 @@ public class TurnipProphet extends Model { } @Override - public void onTime(String time) { - super.onTime(time); + public void onTime(Long qq,String time) { + super.onTime(qq,time); nowTime = Integer.parseInt(time.split(":")[0]); } diff --git a/src/main/java/com/yutou/qqbot/models/Commands/BTDownload.java b/src/main/java/com/yutou/qqbot/models/Commands/BTDownload.java index 6b44242..0c41c27 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/BTDownload.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/BTDownload.java @@ -20,6 +20,11 @@ public class BTDownload extends Model { }; } + @Override + public String getModelName() { + return "添加BT下载"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/BaiduDown.java b/src/main/java/com/yutou/qqbot/models/Commands/BaiduDown.java index 3b0b710..c4f4f05 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/BaiduDown.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/BaiduDown.java @@ -22,6 +22,11 @@ public class BaiduDown extends Model { }; } + @Override + public String getModelName() { + return "同步百度云"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/Bangumi.java b/src/main/java/com/yutou/qqbot/models/Commands/Bangumi.java index c8f7dbf..9ba35c5 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/Bangumi.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/Bangumi.java @@ -124,10 +124,15 @@ public class Bangumi extends Model { } @Override - public void onTime(String time) { - super.onTime(time); + public String getModelName() { + return "新番列表"; + } + + @Override + public void onTime(Long qq,String time) { + super.onTime(qq,time); switch (time) { - case "08:00:00", "20:00:00" -> QQBotManager.getInstance().sendMessage(QQBotManager.defGroup,BangumiTools.reportToDayBangumi()); + case "08:00:00", "20:00:00" -> QQBotManager.getInstance().sendMessage(qq,BangumiTools.reportToDayBangumi()); } } } diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/Audio.java b/src/main/java/com/yutou/qqbot/models/Commands/System/Audio.java index ebc3f78..68f35ad 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/Audio.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/Audio.java @@ -20,6 +20,11 @@ public class Audio extends Model { }; } + @Override + public String getModelName() { + return "音频播放"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/BtFlash.java b/src/main/java/com/yutou/qqbot/models/Commands/System/BtFlash.java index f360b7c..5ff8959 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/BtFlash.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/BtFlash.java @@ -18,6 +18,11 @@ public class BtFlash extends Model { }; } + @Override + public String getModelName() { + return "刷新bt"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/Cmd.java b/src/main/java/com/yutou/qqbot/models/Commands/System/Cmd.java index fe85859..e194433 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/Cmd.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/Cmd.java @@ -18,6 +18,11 @@ public class Cmd extends Model { }; } + @Override + public String getModelName() { + return "cmd指令"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/Help.java b/src/main/java/com/yutou/qqbot/models/Commands/System/Help.java index 01d3c9e..cb5a6fe 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/Help.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/Help.java @@ -16,6 +16,11 @@ public class Help extends Model { return new String[0]; } + @Override + public String getModelName() { + return "帮助"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/IP.java b/src/main/java/com/yutou/qqbot/models/Commands/System/IP.java index adc20e0..97f9928 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/IP.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/IP.java @@ -17,6 +17,11 @@ public class IP extends Model { }; } + @Override + public String getModelName() { + return "获取nas ip"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/OpenPC.java b/src/main/java/com/yutou/qqbot/models/Commands/System/OpenPC.java index 3f4c0ae..0198b89 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/OpenPC.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/OpenPC.java @@ -20,6 +20,11 @@ public class OpenPC extends Model { }; } + @Override + public String getModelName() { + return "远程开机"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/Restart.java b/src/main/java/com/yutou/qqbot/models/Commands/System/Restart.java index a8a82c6..982fe26 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/Restart.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/Restart.java @@ -18,6 +18,11 @@ public class Restart extends Model { }; } + @Override + public String getModelName() { + return "重启服务(NAS)"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/ToolsIdea.java b/src/main/java/com/yutou/qqbot/models/Commands/System/ToolsIdea.java index bab7514..bb29747 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/ToolsIdea.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/ToolsIdea.java @@ -22,6 +22,11 @@ public class ToolsIdea extends Model { }; } + @Override + public String getModelName() { + return "获取idea激活码"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/UpdateIP.java b/src/main/java/com/yutou/qqbot/models/Commands/System/UpdateIP.java index b396fc4..31af18f 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/UpdateIP.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/UpdateIP.java @@ -17,6 +17,11 @@ public class UpdateIP extends Model { }; } + @Override + public String getModelName() { + return "DDNS更新IP"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Commands/System/Version.java b/src/main/java/com/yutou/qqbot/models/Commands/System/Version.java index 1cffb7e..bcb395c 100644 --- a/src/main/java/com/yutou/qqbot/models/Commands/System/Version.java +++ b/src/main/java/com/yutou/qqbot/models/Commands/System/Version.java @@ -17,6 +17,11 @@ public class Version extends Model { }; } + @Override + public String getModelName() { + return "版本信息"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/Model.java b/src/main/java/com/yutou/qqbot/models/Model.java index 65c0fc4..41ca5d2 100644 --- a/src/main/java/com/yutou/qqbot/models/Model.java +++ b/src/main/java/com/yutou/qqbot/models/Model.java @@ -78,7 +78,7 @@ public abstract class Model implements ModelInterface { } } - public void onTime(String time) { + public void onTime(Long qq,String time) { } public static StringBuilder getCommands(Class commands) { diff --git a/src/main/java/com/yutou/qqbot/models/WebSign/BaiHeHui.java b/src/main/java/com/yutou/qqbot/models/WebSign/BaiHeHui.java index bd95d2b..2a8074e 100644 --- a/src/main/java/com/yutou/qqbot/models/WebSign/BaiHeHui.java +++ b/src/main/java/com/yutou/qqbot/models/WebSign/BaiHeHui.java @@ -24,8 +24,13 @@ public class BaiHeHui extends Model { } @Override - public void onTime(String time) { - super.onTime(time); + public String getModelName() { + return "百合会签到"; + } + + @Override + public void onTime(Long qq,String time) { + super.onTime(qq,time); if ("08:10:00".equals(time)) { Log.i("开始百合会签到"); try { diff --git a/src/main/java/com/yutou/qqbot/models/WebSign/BiliBiliMangeSign.java b/src/main/java/com/yutou/qqbot/models/WebSign/BiliBiliMangeSign.java index ef1be82..803d811 100644 --- a/src/main/java/com/yutou/qqbot/models/WebSign/BiliBiliMangeSign.java +++ b/src/main/java/com/yutou/qqbot/models/WebSign/BiliBiliMangeSign.java @@ -25,6 +25,11 @@ public class BiliBiliMangeSign extends Model { }; } + @Override + public String getModelName() { + return "B站漫画签到and商城兑换"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); @@ -109,8 +114,8 @@ public class BiliBiliMangeSign extends Model { } @Override - public void onTime(String time) { - super.onTime(time); + public void onTime(Long qq,String time) { + super.onTime(qq,time); if ("00:01:00".equals(time)) { if (new BiliLogin().testLogin()) { String msg; diff --git a/src/main/java/com/yutou/qqbot/models/WebSign/NicePT.java b/src/main/java/com/yutou/qqbot/models/WebSign/NicePT.java index d00c3b5..21b041a 100644 --- a/src/main/java/com/yutou/qqbot/models/WebSign/NicePT.java +++ b/src/main/java/com/yutou/qqbot/models/WebSign/NicePT.java @@ -22,8 +22,13 @@ public class NicePT extends Model { } @Override - public void onTime(String time) { - super.onTime(time); + public String getModelName() { + return "NicePT签到"; + } + + @Override + public void onTime(Long qq,String time) { + super.onTime(qq,time); if ("08:01:00".equals(time)) { Log.i("开始天使动漫签到"); try { diff --git a/src/main/java/com/yutou/qqbot/models/WebSign/Tsdm.java b/src/main/java/com/yutou/qqbot/models/WebSign/Tsdm.java index 0c4c93e..5d6f4b1 100644 --- a/src/main/java/com/yutou/qqbot/models/WebSign/Tsdm.java +++ b/src/main/java/com/yutou/qqbot/models/WebSign/Tsdm.java @@ -23,6 +23,11 @@ public class Tsdm extends Model { }; } + @Override + public String getModelName() { + return "天使动漫签到"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); @@ -38,8 +43,8 @@ public class Tsdm extends Model { } @Override - public void onTime(String time) { - super.onTime(time); + public void onTime(Long qq,String time) { + super.onTime(qq,time); if ("08:05:00".equals(time)) { Log.i("开始天使动漫签到"); try { diff --git a/src/main/java/com/yutou/qqbot/models/XiaoMi/MiRouter.java b/src/main/java/com/yutou/qqbot/models/XiaoMi/MiRouter.java index b6dd542..a23ec9b 100644 --- a/src/main/java/com/yutou/qqbot/models/XiaoMi/MiRouter.java +++ b/src/main/java/com/yutou/qqbot/models/XiaoMi/MiRouter.java @@ -28,6 +28,11 @@ public class MiRouter extends Model { }; } + @Override + public String getModelName() { + return "小米路由器"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); @@ -43,8 +48,8 @@ public class MiRouter extends Model { private static boolean isRunTime = false; @Override - public void onTime(String time) { - super.onTime(time); + public void onTime(Long qq,String time) { + super.onTime(qq,time); if (isRunTime) { return; } diff --git a/src/main/java/com/yutou/qqbot/models/setu/GetSeTu.java b/src/main/java/com/yutou/qqbot/models/setu/GetSeTu.java index f94a7bf..fc5a999 100644 --- a/src/main/java/com/yutou/qqbot/models/setu/GetSeTu.java +++ b/src/main/java/com/yutou/qqbot/models/setu/GetSeTu.java @@ -21,6 +21,11 @@ public class GetSeTu extends Model { return new String[0]; } + @Override + public String getModelName() { + return "随机二次元图"; + } + @Override public void onMessage(Long qq, MessageEvent event, boolean isGroup) { super.onMessage(qq, event, isGroup); diff --git a/src/main/java/com/yutou/qqbot/models/setu/QQSetu.java b/src/main/java/com/yutou/qqbot/models/setu/QQSetu.java index 7e6ecbf..4adc5a5 100644 --- a/src/main/java/com/yutou/qqbot/models/setu/QQSetu.java +++ b/src/main/java/com/yutou/qqbot/models/setu/QQSetu.java @@ -220,8 +220,8 @@ public class QQSetu extends Model { } @Override - public void onTime(String time) { - super.onTime(time); + public void onTime(Long qq,String time) { + super.onTime(qq,time); if("23:59:00".equals(time)){ printTodaySetu(); } @@ -236,4 +236,9 @@ public class QQSetu extends Model { public String[] getUsePowers() { return new String[0]; } + + @Override + public String getModelName() { + return "涩图评分"; + } } diff --git a/src/main/java/com/yutou/qqbot/utlis/ApplicationInit.java b/src/main/java/com/yutou/qqbot/utlis/ApplicationInit.java index 6da4736..84b80e8 100644 --- a/src/main/java/com/yutou/qqbot/utlis/ApplicationInit.java +++ b/src/main/java/com/yutou/qqbot/utlis/ApplicationInit.java @@ -1,6 +1,10 @@ package com.yutou.qqbot.utlis; +import com.yutou.qqbot.QQBotManager; +import com.yutou.qqbot.QQNumberManager; import com.yutou.qqbot.models.Model; +import net.mamoe.mirai.Bot; +import net.mamoe.mirai.contact.Group; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; @@ -27,8 +31,13 @@ public class ApplicationInit implements ApplicationRunner { for (Class model : Model.classList) { new Thread(() -> { try { + Bot bot = QQBotManager.getInstance().getBot(); Model useModel = (Model) model.getDeclaredConstructor().newInstance(); - useModel.onTime(time); + for (Group group : bot.getGroups()) { + if(QQNumberManager.getManager().isUseModel(group.getId(),model)){ + useModel.onTime(group.getId(),time); + } + } } catch (Exception e) { e.printStackTrace(); }