LamGC/ContentGrabbingJi
1
0
Fork 0
mirror of https://github.com/LamGC/ContentGrabbingJi.git synced 2025-04-30 06:37:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Change] 调整CGJ包结构, 将机器人平台相关类单独存放在framework包内;

Browse Source
This commit is contained in:
LamGC 2020-04-28 23:15:55 +08:00
parent 6824b12e8f
commit 22a113ef38
10 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/lamgc/cgj/Main.java
View File

@ -7,8 +7,8 @@ import com.google.gson.Gson;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.lamgc.cgj.bot.CQConfig; import net.lamgc.cgj.bot.framework.coolq.CQConfig;
import net.lamgc.cgj.bot.MiraiMain; import net.lamgc.cgj.bot.framework.mirai.MiraiMain;
import net.lamgc.cgj.pixiv.*; import net.lamgc.cgj.pixiv.*;
import net.lamgc.cgj.proxy.PixivAccessProxyServer; import net.lamgc.cgj.proxy.PixivAccessProxyServer;
import net.lamgc.plps.PixivLoginProxyServer; import net.lamgc.plps.PixivLoginProxyServer;

2
src/main/java/net/lamgc/cgj/bot/CQConfig.java → src/main/java/net/lamgc/cgj/bot/framework/coolq/CQConfig.java
View File

@ -1,4 +1,4 @@
package net.lamgc.cgj.bot; package net.lamgc.cgj.bot.framework.coolq;
import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.google.common.util.concurrent.ThreadFactoryBuilder;
import net.lz1998.cq.CQGlobal; import net.lz1998.cq.CQGlobal;

4
src/main/java/net/lamgc/cgj/bot/CQPluginMain.java → src/main/java/net/lamgc/cgj/bot/framework/coolq/CQPluginMain.java
View File

@ -1,7 +1,7 @@
package net.lamgc.cgj.bot; package net.lamgc.cgj.bot.framework.coolq;
import net.lamgc.cgj.bot.event.BotEventHandler; import net.lamgc.cgj.bot.event.BotEventHandler;
import net.lamgc.cgj.bot.event.SpringCQMessageEvent; import net.lamgc.cgj.bot.framework.coolq.message.SpringCQMessageEvent;
import net.lamgc.utils.event.EventHandler; import net.lamgc.utils.event.EventHandler;
import net.lz1998.cq.event.message.CQDiscussMessageEvent; import net.lz1998.cq.event.message.CQDiscussMessageEvent;
import net.lz1998.cq.event.message.CQGroupMessageEvent; import net.lz1998.cq.event.message.CQGroupMessageEvent;

4
src/main/java/net/lamgc/cgj/bot/event/SpringCQMessageEvent.java → src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageEvent.java
View File

@ -1,9 +1,9 @@
package net.lamgc.cgj.bot.event; package net.lamgc.cgj.bot.framework.coolq.message;
import net.lamgc.cgj.bot.BotCode; import net.lamgc.cgj.bot.BotCode;
import net.lamgc.cgj.bot.event.MessageEvent;
import net.lamgc.cgj.bot.message.MessageSender; import net.lamgc.cgj.bot.message.MessageSender;
import net.lamgc.cgj.bot.message.MessageSource; import net.lamgc.cgj.bot.message.MessageSource;
import net.lamgc.cgj.bot.message.SpringCQMessageSender;
import net.lz1998.cq.event.message.CQDiscussMessageEvent; import net.lz1998.cq.event.message.CQDiscussMessageEvent;
import net.lz1998.cq.event.message.CQGroupMessageEvent; import net.lz1998.cq.event.message.CQGroupMessageEvent;
import net.lz1998.cq.event.message.CQMessageEvent; import net.lz1998.cq.event.message.CQMessageEvent;

4
src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSender.java → src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSender.java
View File

@ -1,5 +1,7 @@
package net.lamgc.cgj.bot.message; package net.lamgc.cgj.bot.framework.coolq.message;
import net.lamgc.cgj.bot.message.MessageSender;
import net.lamgc.cgj.bot.message.MessageSource;
import net.lz1998.cq.robot.CoolQ; import net.lz1998.cq.robot.CoolQ;
public class SpringCQMessageSender implements MessageSender { public class SpringCQMessageSender implements MessageSender {

5
src/main/java/net/lamgc/cgj/bot/message/SpringCQMessageSenderFactory.java → src/main/java/net/lamgc/cgj/bot/framework/coolq/message/SpringCQMessageSenderFactory.java
View File

@ -1,5 +1,8 @@
package net.lamgc.cgj.bot.message; package net.lamgc.cgj.bot.framework.coolq.message;
import net.lamgc.cgj.bot.message.MessageSender;
import net.lamgc.cgj.bot.message.MessageSenderFactory;
import net.lamgc.cgj.bot.message.MessageSource;
import net.lz1998.cq.robot.CoolQ; import net.lz1998.cq.robot.CoolQ;
public class SpringCQMessageSenderFactory implements MessageSenderFactory { public class SpringCQMessageSenderFactory implements MessageSenderFactory {

6
src/main/java/net/lamgc/cgj/bot/MiraiMain.java → src/main/java/net/lamgc/cgj/bot/framework/mirai/MiraiMain.java
View File

@ -1,9 +1,9 @@
package net.lamgc.cgj.bot; package net.lamgc.cgj.bot.framework.mirai;
import net.lamgc.cgj.bot.event.BotEventHandler; import net.lamgc.cgj.bot.event.BotEventHandler;
import net.lamgc.cgj.bot.event.MiraiMessageEvent; import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageEvent;
import net.lamgc.cgj.bot.message.MessageSenderBuilder; import net.lamgc.cgj.bot.message.MessageSenderBuilder;
import net.lamgc.cgj.bot.message.MiraiMessageSenderFactory; import net.lamgc.cgj.bot.framework.mirai.message.MiraiMessageSenderFactory;
import net.mamoe.mirai.Bot; import net.mamoe.mirai.Bot;
import net.mamoe.mirai.BotFactoryJvm; import net.mamoe.mirai.BotFactoryJvm;
import net.mamoe.mirai.japt.Events; import net.mamoe.mirai.japt.Events;

4
src/main/java/net/lamgc/cgj/bot/event/MiraiMessageEvent.java → src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageEvent.java
View File

@ -1,8 +1,8 @@
package net.lamgc.cgj.bot.event; package net.lamgc.cgj.bot.framework.mirai.message;
import net.lamgc.cgj.bot.event.MessageEvent;
import net.lamgc.cgj.bot.message.MessageSender; import net.lamgc.cgj.bot.message.MessageSender;
import net.lamgc.cgj.bot.message.MessageSource; import net.lamgc.cgj.bot.message.MessageSource;
import net.lamgc.cgj.bot.message.MiraiMessageSender;
import net.mamoe.mirai.message.ContactMessage; import net.mamoe.mirai.message.ContactMessage;
import net.mamoe.mirai.message.GroupMessage; import net.mamoe.mirai.message.GroupMessage;
import net.mamoe.mirai.message.data.MessageUtils; import net.mamoe.mirai.message.data.MessageUtils;

4
src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSender.java → src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSender.java
View File

@ -1,4 +1,4 @@
package net.lamgc.cgj.bot.message; package net.lamgc.cgj.bot.framework.mirai.message;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import net.lamgc.cgj.bot.BotCode; import net.lamgc.cgj.bot.BotCode;
@ -7,6 +7,8 @@ import net.lamgc.cgj.bot.cache.HotDataCacheStore;
import net.lamgc.cgj.bot.cache.LocalHashCacheStore; import net.lamgc.cgj.bot.cache.LocalHashCacheStore;
import net.lamgc.cgj.bot.cache.StringRedisCacheStore; import net.lamgc.cgj.bot.cache.StringRedisCacheStore;
import net.lamgc.cgj.bot.event.BotEventHandler; import net.lamgc.cgj.bot.event.BotEventHandler;
import net.lamgc.cgj.bot.message.MessageSender;
import net.lamgc.cgj.bot.message.MessageSource;
import net.mamoe.mirai.Bot; import net.mamoe.mirai.Bot;
import net.mamoe.mirai.contact.Contact; import net.mamoe.mirai.contact.Contact;
import net.mamoe.mirai.message.data.Image; import net.mamoe.mirai.message.data.Image;

5
src/main/java/net/lamgc/cgj/bot/message/MiraiMessageSenderFactory.java → src/main/java/net/lamgc/cgj/bot/framework/mirai/message/MiraiMessageSenderFactory.java
View File

@ -1,5 +1,8 @@
package net.lamgc.cgj.bot.message; package net.lamgc.cgj.bot.framework.mirai.message;
import net.lamgc.cgj.bot.message.MessageSender;
import net.lamgc.cgj.bot.message.MessageSenderFactory;
import net.lamgc.cgj.bot.message.MessageSource;
import net.mamoe.mirai.Bot; import net.mamoe.mirai.Bot;
public class MiraiMessageSenderFactory implements MessageSenderFactory { public class MiraiMessageSenderFactory implements MessageSenderFactory {