From 711c80175ee0e0f50627c10bee341491ca9db462 Mon Sep 17 00:00:00 2001 From: LamGC Date: Sat, 13 Feb 2021 13:09:16 +0800 Subject: [PATCH] =?UTF-8?q?[Move]=20Core,=20Event-API(Event),=20Framework-?= =?UTF-8?q?API,=20Template-API(Template)=20=E6=9B=B4=E6=94=B9=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=90=8D=E4=BB=A5=E8=A7=84=E8=8C=83=E5=91=BD=E5=90=8D?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [Move] :Event-API 更改模块名(原 'Event'); [Move] :Template-API 更改模块名(原 'Template'); [Change] Project/pom.xml 适配更改; [Change] :Core, :Framework-API 适配更改; --- .../Readme.md | 0 .../pom.xml | 2 +- .../net/lamgc/cgj/bot/event/AbstractEventObject.java | 0 .../main/java/net/lamgc/cgj/bot/event/Cancelable.java | 0 .../java/net/lamgc/cgj/bot/event/EventExecutor.java | 0 .../java/net/lamgc/cgj/bot/event/EventHandler.java | 0 .../java/net/lamgc/cgj/bot/event/EventObject.java | 0 .../main/java/net/lamgc/cgj/bot/event/EventUtils.java | 0 .../java/net/lamgc/cgj/bot/event/HandlerRegistry.java | 0 .../java/net/lamgc/cgj/bot/event/SupportedCancel.java | 0 .../java/net/lamgc/cgj/bot/event/EventUtilsTest.java | 0 .../lamgc/cgj/bot/event/handler/IllegalHandler.java | 0 .../lamgc/cgj/bot/event/handler/StandardHandler.java | 0 .../net/lamgc/cgj/bot/event/object/TestEvent.java | 0 .../pom.xml | 2 +- ContentGrabbingJi-core/pom.xml | 2 +- ContentGrabbingJi-framework-api/pom.xml | 2 +- .../bot/framework/message/AbstractMessageEvent.java | 11 ++++++----- pom.xml | 4 ++-- 19 files changed, 12 insertions(+), 11 deletions(-) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/Readme.md (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/pom.xml (95%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/AbstractEventObject.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/Cancelable.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/EventExecutor.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/EventHandler.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/EventObject.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/EventUtils.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/main/java/net/lamgc/cgj/bot/event/SupportedCancel.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/test/java/net/lamgc/cgj/bot/event/EventUtilsTest.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/test/java/net/lamgc/cgj/bot/event/handler/IllegalHandler.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/test/java/net/lamgc/cgj/bot/event/handler/StandardHandler.java (100%) rename {ContentGrabbingJi-Event => ContentGrabbingJi-Event-api}/src/test/java/net/lamgc/cgj/bot/event/object/TestEvent.java (100%) rename {ContentGrabbingJi-Template => ContentGrabbingJi-Template-api}/pom.xml (96%) diff --git a/ContentGrabbingJi-Event/Readme.md b/ContentGrabbingJi-Event-api/Readme.md similarity index 100% rename from ContentGrabbingJi-Event/Readme.md rename to ContentGrabbingJi-Event-api/Readme.md diff --git a/ContentGrabbingJi-Event/pom.xml b/ContentGrabbingJi-Event-api/pom.xml similarity index 95% rename from ContentGrabbingJi-Event/pom.xml rename to ContentGrabbingJi-Event-api/pom.xml index 0b32d9e..e286e9d 100644 --- a/ContentGrabbingJi-Event/pom.xml +++ b/ContentGrabbingJi-Event-api/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - ContentGrabbingJi-Event + ContentGrabbingJi-Event-api \ No newline at end of file diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/AbstractEventObject.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/AbstractEventObject.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/AbstractEventObject.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/AbstractEventObject.java diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/Cancelable.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/Cancelable.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/Cancelable.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/Cancelable.java diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventExecutor.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventExecutor.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventExecutor.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventExecutor.java diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventHandler.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventHandler.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventHandler.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventHandler.java diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventObject.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventObject.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventObject.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventObject.java diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventUtils.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventUtils.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/EventUtils.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/EventUtils.java diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/HandlerRegistry.java diff --git a/ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/SupportedCancel.java b/ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/SupportedCancel.java similarity index 100% rename from ContentGrabbingJi-Event/src/main/java/net/lamgc/cgj/bot/event/SupportedCancel.java rename to ContentGrabbingJi-Event-api/src/main/java/net/lamgc/cgj/bot/event/SupportedCancel.java diff --git a/ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/EventUtilsTest.java b/ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/EventUtilsTest.java similarity index 100% rename from ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/EventUtilsTest.java rename to ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/EventUtilsTest.java diff --git a/ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/handler/IllegalHandler.java b/ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/handler/IllegalHandler.java similarity index 100% rename from ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/handler/IllegalHandler.java rename to ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/handler/IllegalHandler.java diff --git a/ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/handler/StandardHandler.java b/ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/handler/StandardHandler.java similarity index 100% rename from ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/handler/StandardHandler.java rename to ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/handler/StandardHandler.java diff --git a/ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/object/TestEvent.java b/ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/object/TestEvent.java similarity index 100% rename from ContentGrabbingJi-Event/src/test/java/net/lamgc/cgj/bot/event/object/TestEvent.java rename to ContentGrabbingJi-Event-api/src/test/java/net/lamgc/cgj/bot/event/object/TestEvent.java diff --git a/ContentGrabbingJi-Template/pom.xml b/ContentGrabbingJi-Template-api/pom.xml similarity index 96% rename from ContentGrabbingJi-Template/pom.xml rename to ContentGrabbingJi-Template-api/pom.xml index 0cad613..0aae054 100644 --- a/ContentGrabbingJi-Template/pom.xml +++ b/ContentGrabbingJi-Template-api/pom.xml @@ -26,7 +26,7 @@ 4.0.0 - ContentGrabbingJi-Template + ContentGrabbingJi-Template-api 8 diff --git a/ContentGrabbingJi-core/pom.xml b/ContentGrabbingJi-core/pom.xml index 8965959..2450a42 100644 --- a/ContentGrabbingJi-core/pom.xml +++ b/ContentGrabbingJi-core/pom.xml @@ -46,7 +46,7 @@ net.lamgc - ContentGrabbingJi-Event + ContentGrabbingJi-Event-api 3.0.0-alpha-SNAPSHOT diff --git a/ContentGrabbingJi-framework-api/pom.xml b/ContentGrabbingJi-framework-api/pom.xml index 87fea0d..921f547 100644 --- a/ContentGrabbingJi-framework-api/pom.xml +++ b/ContentGrabbingJi-framework-api/pom.xml @@ -42,7 +42,7 @@ net.lamgc - ContentGrabbingJi-Event + ContentGrabbingJi-Event-api 3.0.0-alpha-SNAPSHOT diff --git a/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractMessageEvent.java b/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractMessageEvent.java index 2d51a18..3b04a84 100644 --- a/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractMessageEvent.java +++ b/ContentGrabbingJi-framework-api/src/main/java/net/lamgc/cgj/bot/framework/message/AbstractMessageEvent.java @@ -20,6 +20,7 @@ package net.lamgc.cgj.bot.framework.message; import net.lamgc.cgj.bot.event.AbstractEventObject; import net.lamgc.cgj.bot.framework.Platform; +import java.util.Locale; import java.util.Objects; import java.util.ResourceBundle; @@ -50,7 +51,7 @@ public abstract class AbstractMessageEvent extends AbstractEventObject { *

如果激活 i18n 的话就会使用到该属性, Bot 将使用对应的消息模板构建回复消息内容. *

当 Framework 不提供时将使用内置默认语言包. */ - private ResourceBundle resourceBundle = null; + private Locale locale = null; protected AbstractMessageEvent( Platform fromPlatform, @@ -87,12 +88,12 @@ public abstract class AbstractMessageEvent extends AbstractEventObject { return content; } - public ResourceBundle getResourceBundle() { - return resourceBundle; + public Locale getLocale() { + return locale; } - public void setResourceBundle(ResourceBundle resourceBundle) { - this.resourceBundle = resourceBundle; + public void setLocale(Locale locale) { + this.locale = locale; } public MessageSender getSender() { diff --git a/pom.xml b/pom.xml index d919cbf..7c4a9bb 100644 --- a/pom.xml +++ b/pom.xml @@ -35,11 +35,11 @@ ContentGrabbingJi-CacheStore-redis ContentGrabbingJi-CacheStore-local ContentGrabbingJi-common - ContentGrabbingJi-Event + ContentGrabbingJi-Event-api ContentGrabbingJi-Command-api ContentGrabbingJi-Command-pixiv ContentGrabbingJi-framework-telegrambots - ContentGrabbingJi-Template + ContentGrabbingJi-Template-api ContentGrabbingJi-framework-OneBot