diff --git a/README.md b/README.md index 30dc4f3..811c407 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,10 @@ -![Dinger](https://gitee.com/jaemon/docs/raw/master/dinger.png) ![GitHub license](https://img.shields.io/github/license/AnswerAIL/dingtalk-spring-boot-starter) - - - +# Dinger(叮鸽) ![GitHub license](https://img.shields.io/github/license/AnswerAIL/dingtalk-spring-boot-starter) [![Maven Central](https://img.shields.io/maven-central/v/com.github.answerail/dingtalk-spring-boot-starter)](https://mvnrepository.com/artifact/com.github.answerail/dingtalk-spring-boot-starter) -[![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/AnswerAIL/dingtalk-spring-boot-starter)](https://github.com/AnswerAIL/dingtalk-spring-boot-starter/releases) -[![GitHub tag (latest SemVer)](https://img.shields.io/github/v/tag/AnswerAIL/dingtalk-spring-boot-starter)](https://github.com/AnswerAIL/dingtalk-spring-boot-starter/tags) - - [![GitHub stars](https://img.shields.io/github/stars/AnswerAIL/dingtalk-spring-boot-starter.svg?style=social)](https://github.com/AnswerAIL/dingtalk-spring-boot-starter) -![GitHub all releases](https://img.shields.io/github/downloads/AnswerAIL/dingtalk-spring-boot-starter/total?style=social) [![Gitee stars](https://gitee.com/jaemon/dingtalk-spring-boot-starter/badge/star.svg?theme=dark)](https://gitee.com/jaemon/dingtalk-spring-boot-starter) - - [![GitHub issues](https://img.shields.io/github/issues/AnswerAIL/dingtalk-spring-boot-starter)](https://github.com/AnswerAIL/dingtalk-spring-boot-starter/issues?q=is%3Aopen+is%3Aissue) [![GitHub closed issues](https://img.shields.io/github/issues-closed/AnswerAIL/dingtalk-spring-boot-starter)](https://github.com/AnswerAIL/dingtalk-spring-boot-starter/issues?q=is%3Aissue+is%3Aclosed) - - -[![Read the Docs](https://img.shields.io/readthedocs/pip)](https://github.com/AnswerAIL/dingtalk-spring-boot-starter/wiki) - +![JDK](https://img.shields.io/badge/JDK-%3E=1.8-green?logo=appveyor)   diff --git a/img/dinger.png b/img/dinger.png deleted file mode 100644 index 57654b1..0000000 Binary files a/img/dinger.png and /dev/null differ diff --git a/pom.xml b/pom.xml index e3769a9..0f0e9ea 100644 --- a/pom.xml +++ b/pom.xml @@ -170,7 +170,7 @@ false - com.dingerframework.utils.ConfigTools + com.github.jaemon.dinger.utils.ConfigTools diff --git a/src/main/java/com/dingerframework/AbstractDingerSender.java b/src/main/java/com/github/jaemon/dinger/AbstractDingerSender.java similarity index 84% rename from src/main/java/com/dingerframework/AbstractDingerSender.java rename to src/main/java/com/github/jaemon/dinger/AbstractDingerSender.java index 3b0a7eb..b424eda 100644 --- a/src/main/java/com/dingerframework/AbstractDingerSender.java +++ b/src/main/java/com/github/jaemon/dinger/AbstractDingerSender.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework; +package com.github.jaemon.dinger; -import com.dingerframework.core.DingerHelper; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.core.entity.enums.MessageSubType; -import com.dingerframework.exception.DingerException; +import com.github.jaemon.dinger.core.DingerHelper; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.exception.DingerException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.dingerframework.entity.DingerCallback; -import com.dingerframework.support.CustomMessage; +import com.github.jaemon.dinger.entity.DingerCallback; +import com.github.jaemon.dinger.support.CustomMessage; /** * AbstractDingTalkSender diff --git a/src/main/java/com/dingerframework/DingerManagerBuilder.java b/src/main/java/com/github/jaemon/dinger/DingerManagerBuilder.java similarity index 89% rename from src/main/java/com/dingerframework/DingerManagerBuilder.java rename to src/main/java/com/github/jaemon/dinger/DingerManagerBuilder.java index 0216953..531a017 100644 --- a/src/main/java/com/dingerframework/DingerManagerBuilder.java +++ b/src/main/java/com/github/jaemon/dinger/DingerManagerBuilder.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework; +package com.github.jaemon.dinger; -import com.dingerframework.core.entity.enums.MessageSubType; -import com.dingerframework.sign.DingerSignAlgorithm; -import com.dingerframework.support.DingerExceptionCallback; -import com.dingerframework.support.CustomMessage; -import com.dingerframework.support.DingerAsyncCallback; -import com.dingerframework.support.DingerIdGenerator; -import com.dingerframework.support.client.DingerHttpClient; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.sign.DingerSignAlgorithm; +import com.github.jaemon.dinger.support.DingerExceptionCallback; +import com.github.jaemon.dinger.support.CustomMessage; +import com.github.jaemon.dinger.support.DingerAsyncCallback; +import com.github.jaemon.dinger.support.DingerIdGenerator; +import com.github.jaemon.dinger.support.client.DingerHttpClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import java.util.concurrent.Executor; -import static com.dingerframework.constant.DingerConstant.*; +import static com.github.jaemon.dinger.constant.DingerConstant.*; /** * DingTalk Manager Builder diff --git a/src/main/java/com/dingerframework/DingerRobot.java b/src/main/java/com/github/jaemon/dinger/DingerRobot.java similarity index 90% rename from src/main/java/com/dingerframework/DingerRobot.java rename to src/main/java/com/github/jaemon/dinger/DingerRobot.java index 72f6f26..80757f5 100644 --- a/src/main/java/com/dingerframework/DingerRobot.java +++ b/src/main/java/com/github/jaemon/dinger/DingerRobot.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework; +package com.github.jaemon.dinger; -import com.dingerframework.entity.DingerResult; -import com.dingerframework.entity.SignBase; -import com.dingerframework.support.client.MediaTypeEnum; +import com.github.jaemon.dinger.entity.DingerResult; +import com.github.jaemon.dinger.entity.SignBase; +import com.github.jaemon.dinger.support.client.MediaTypeEnum; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.dingerframework.core.DingerConfig; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.core.entity.enums.MessageSubType; -import com.dingerframework.entity.enums.ResultCode; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.exception.AsyncCallException; -import com.dingerframework.exception.SendMsgException; -import com.dingerframework.support.CustomMessage; -import com.dingerframework.utils.DingerUtils; +import com.github.jaemon.dinger.core.DingerConfig; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.entity.enums.ResultCode; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.exception.AsyncCallException; +import com.github.jaemon.dinger.exception.SendMsgException; +import com.github.jaemon.dinger.support.CustomMessage; +import com.github.jaemon.dinger.utils.DingerUtils; import org.springframework.beans.BeanUtils; import java.util.HashMap; diff --git a/src/main/java/com/dingerframework/DingerSender.java b/src/main/java/com/github/jaemon/dinger/DingerSender.java similarity index 95% rename from src/main/java/com/dingerframework/DingerSender.java rename to src/main/java/com/github/jaemon/dinger/DingerSender.java index b24db7f..5e9328f 100644 --- a/src/main/java/com/dingerframework/DingerSender.java +++ b/src/main/java/com/github/jaemon/dinger/DingerSender.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework; +package com.github.jaemon.dinger; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.core.entity.enums.MessageSubType; -import com.dingerframework.entity.DingerResult; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.entity.DingerResult; import java.util.List; diff --git a/src/main/java/com/dingerframework/config/BeanConfiguration.java b/src/main/java/com/github/jaemon/dinger/config/BeanConfiguration.java similarity index 84% rename from src/main/java/com/dingerframework/config/BeanConfiguration.java rename to src/main/java/com/github/jaemon/dinger/config/BeanConfiguration.java index 3e470d8..e1694e9 100644 --- a/src/main/java/com/dingerframework/config/BeanConfiguration.java +++ b/src/main/java/com/github/jaemon/dinger/config/BeanConfiguration.java @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.config; +package com.github.jaemon.dinger.config; -import com.dingerframework.sign.DingTalkSignAlgorithm; -import com.dingerframework.sign.DingerSignAlgorithm; +import com.github.jaemon.dinger.sign.DingTalkSignAlgorithm; +import com.github.jaemon.dinger.sign.DingerSignAlgorithm; import com.dingerframework.support.*; -import com.dingerframework.multi.MultiDingerAlgorithmInjectRegister; -import com.dingerframework.support.client.DingerHttpClient; -import com.dingerframework.support.client.DingerHttpTemplate; +import com.github.jaemon.dinger.multi.MultiDingerAlgorithmInjectRegister; +import com.github.jaemon.dinger.support.*; +import com.github.jaemon.dinger.support.client.DingerHttpClient; +import com.github.jaemon.dinger.support.client.DingerHttpTemplate; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import static com.dingerframework.constant.DingerConstant.MARKDOWN_MESSAGE; -import static com.dingerframework.constant.DingerConstant.TEXT_MESSAGE; +import static com.github.jaemon.dinger.constant.DingerConstant.MARKDOWN_MESSAGE; +import static com.github.jaemon.dinger.constant.DingerConstant.TEXT_MESSAGE; /** * 实例化bean配置 diff --git a/src/main/java/com/dingerframework/config/DingerConfiguration.java b/src/main/java/com/github/jaemon/dinger/config/DingerConfiguration.java similarity index 86% rename from src/main/java/com/dingerframework/config/DingerConfiguration.java rename to src/main/java/com/github/jaemon/dinger/config/DingerConfiguration.java index 6694b21..d0aac00 100644 --- a/src/main/java/com/dingerframework/config/DingerConfiguration.java +++ b/src/main/java/com/github/jaemon/dinger/config/DingerConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.config; +package com.github.jaemon.dinger.config; -import com.dingerframework.DingerManagerBuilder; -import com.dingerframework.DingerRobot; -import com.dingerframework.core.DingerConfigurerAdapter; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.exception.ConfigurationException; +import com.github.jaemon.dinger.DingerManagerBuilder; +import com.github.jaemon.dinger.DingerRobot; +import com.github.jaemon.dinger.core.DingerConfigurerAdapter; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.exception.ConfigurationException; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/src/main/java/com/dingerframework/config/DingerHttpClientConfig.java b/src/main/java/com/github/jaemon/dinger/config/DingerHttpClientConfig.java similarity index 93% rename from src/main/java/com/dingerframework/config/DingerHttpClientConfig.java rename to src/main/java/com/github/jaemon/dinger/config/DingerHttpClientConfig.java index d1abc27..e05eb15 100644 --- a/src/main/java/com/dingerframework/config/DingerHttpClientConfig.java +++ b/src/main/java/com/github/jaemon/dinger/config/DingerHttpClientConfig.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.config; +package com.github.jaemon.dinger.config; -import com.dingerframework.constant.DingerConstant; +import com.github.jaemon.dinger.constant.DingerConstant; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -29,7 +29,7 @@ import java.time.Duration; import java.time.temporal.ChronoUnit; -import static com.dingerframework.constant.DingerConstant.DINGER_PROPERTIES_PREFIX; +import static com.github.jaemon.dinger.constant.DingerConstant.DINGER_PROPERTIES_PREFIX; /** * Dinger默认Http客户端配置 diff --git a/src/main/java/com/dingerframework/config/DingerThreadPoolConfig.java b/src/main/java/com/github/jaemon/dinger/config/DingerThreadPoolConfig.java similarity index 93% rename from src/main/java/com/dingerframework/config/DingerThreadPoolConfig.java rename to src/main/java/com/github/jaemon/dinger/config/DingerThreadPoolConfig.java index 52c83a1..1101a55 100644 --- a/src/main/java/com/dingerframework/config/DingerThreadPoolConfig.java +++ b/src/main/java/com/github/jaemon/dinger/config/DingerThreadPoolConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.config; +package com.github.jaemon.dinger.config; -import com.dingerframework.DingerRobot; -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.entity.DkThreadPoolProperties; +import com.github.jaemon.dinger.DingerRobot; +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.entity.DkThreadPoolProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/com/dingerframework/constant/DingerConstant.java b/src/main/java/com/github/jaemon/dinger/constant/DingerConstant.java similarity index 97% rename from src/main/java/com/dingerframework/constant/DingerConstant.java rename to src/main/java/com/github/jaemon/dinger/constant/DingerConstant.java index 0f968c6..80f1878 100644 --- a/src/main/java/com/dingerframework/constant/DingerConstant.java +++ b/src/main/java/com/github/jaemon/dinger/constant/DingerConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.constant; +package com.github.jaemon.dinger.constant; /** * 常量类 diff --git a/src/main/java/com/dingerframework/core/AbstractDingerDefinitionResolver.java b/src/main/java/com/github/jaemon/dinger/core/AbstractDingerDefinitionResolver.java similarity index 91% rename from src/main/java/com/dingerframework/core/AbstractDingerDefinitionResolver.java rename to src/main/java/com/github/jaemon/dinger/core/AbstractDingerDefinitionResolver.java index 722f9aa..ccd0523 100644 --- a/src/main/java/com/dingerframework/core/AbstractDingerDefinitionResolver.java +++ b/src/main/java/com/github/jaemon/dinger/core/AbstractDingerDefinitionResolver.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.core.annatations.DingerScan; -import com.dingerframework.core.entity.enums.DingerDefinitionType; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.entity.enums.ExceptionEnum; -import com.dingerframework.exception.DingerException; -import com.dingerframework.listeners.ApplicationEventTimeTable; -import com.dingerframework.listeners.DingerListenersProperty; -import com.dingerframework.utils.PackageUtils; -import com.dingerframework.exception.DingerConfigRepeatedException; -import com.dingerframework.exception.DingerScanRepeatedException; +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.core.annatations.DingerScan; +import com.github.jaemon.dinger.core.entity.enums.DingerDefinitionType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.exception.DingerException; +import com.github.jaemon.dinger.listeners.ApplicationEventTimeTable; +import com.github.jaemon.dinger.listeners.DingerListenersProperty; +import com.github.jaemon.dinger.utils.PackageUtils; +import com.github.jaemon.dinger.exception.DingerConfigRepeatedException; +import com.github.jaemon.dinger.exception.DingerScanRepeatedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.io.Resource; @@ -35,7 +35,7 @@ import java.util.*; import java.util.List; -import static com.dingerframework.core.AbstractDingerDefinitionResolver.Container.INSTANCE; +import static com.github.jaemon.dinger.core.AbstractDingerDefinitionResolver.Container.INSTANCE; /** * AbstractDingerDefinitionResolver diff --git a/src/main/java/com/dingerframework/core/DefaultDingerDefinition.java b/src/main/java/com/github/jaemon/dinger/core/DefaultDingerDefinition.java similarity index 90% rename from src/main/java/com/dingerframework/core/DefaultDingerDefinition.java rename to src/main/java/com/github/jaemon/dinger/core/DefaultDingerDefinition.java index 3853416..f81d8ba 100644 --- a/src/main/java/com/dingerframework/core/DefaultDingerDefinition.java +++ b/src/main/java/com/github/jaemon/dinger/core/DefaultDingerDefinition.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.core.entity.enums.MessageSubType; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.core.entity.enums.MessageMainType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.enums.MessageMainType; /** diff --git a/src/main/java/com/dingerframework/core/DingerConfig.java b/src/main/java/com/github/jaemon/dinger/core/DingerConfig.java similarity index 95% rename from src/main/java/com/dingerframework/core/DingerConfig.java rename to src/main/java/com/github/jaemon/dinger/core/DingerConfig.java index 9adcfce..d97ce55 100644 --- a/src/main/java/com/dingerframework/core/DingerConfig.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.utils.ConfigTools; -import com.dingerframework.utils.DingerUtils; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.utils.ConfigTools; +import com.github.jaemon.dinger.utils.DingerUtils; /** * DingerConfig diff --git a/src/main/java/com/dingerframework/core/DingerConfigurerAdapter.java b/src/main/java/com/github/jaemon/dinger/core/DingerConfigurerAdapter.java similarity index 91% rename from src/main/java/com/dingerframework/core/DingerConfigurerAdapter.java rename to src/main/java/com/github/jaemon/dinger/core/DingerConfigurerAdapter.java index 32817a3..ba4b3b8 100644 --- a/src/main/java/com/dingerframework/core/DingerConfigurerAdapter.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerConfigurerAdapter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.DingerManagerBuilder; +import com.github.jaemon.dinger.DingerManagerBuilder; /** * DingTalk Configurer Adapter diff --git a/src/main/java/com/dingerframework/core/DingerDefinition.java b/src/main/java/com/github/jaemon/dinger/core/DingerDefinition.java similarity index 90% rename from src/main/java/com/dingerframework/core/DingerDefinition.java rename to src/main/java/com/github/jaemon/dinger/core/DingerDefinition.java index 6c0e2dc..77ca374 100644 --- a/src/main/java/com/dingerframework/core/DingerDefinition.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerDefinition.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.core.entity.enums.MessageMainType; -import com.dingerframework.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.MessageMainType; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; /** diff --git a/src/main/java/com/dingerframework/core/DingerDefinitionGenerator.java b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGenerator.java similarity index 97% rename from src/main/java/com/dingerframework/core/DingerDefinitionGenerator.java rename to src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGenerator.java index bf2ac6f..a2e3f26 100644 --- a/src/main/java/com/dingerframework/core/DingerDefinitionGenerator.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; /** diff --git a/src/main/java/com/dingerframework/core/DingerDefinitionGeneratorContext.java b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGeneratorContext.java similarity index 96% rename from src/main/java/com/dingerframework/core/DingerDefinitionGeneratorContext.java rename to src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGeneratorContext.java index 64d99fa..68ab499 100644 --- a/src/main/java/com/dingerframework/core/DingerDefinitionGeneratorContext.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGeneratorContext.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; /** * DingerDefinitionGeneratorContext diff --git a/src/main/java/com/dingerframework/core/DingerDefinitionGeneratorFactory.java b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGeneratorFactory.java similarity index 89% rename from src/main/java/com/dingerframework/core/DingerDefinitionGeneratorFactory.java rename to src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGeneratorFactory.java index 080a819..18245ed 100644 --- a/src/main/java/com/dingerframework/core/DingerDefinitionGeneratorFactory.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionGeneratorFactory.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.exception.DingerException; +import com.github.jaemon.dinger.exception.DingerException; import java.util.HashMap; import java.util.Map; -import static com.dingerframework.entity.enums.ExceptionEnum.DINGERDEFINITION_ERROR; +import static com.github.jaemon.dinger.entity.enums.ExceptionEnum.DINGERDEFINITION_ERROR; /** * Dinger Definition工厂类 diff --git a/src/main/java/com/dingerframework/core/DingerDefinitionHandler.java b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionHandler.java similarity index 94% rename from src/main/java/com/dingerframework/core/DingerDefinitionHandler.java rename to src/main/java/com/github/jaemon/dinger/core/DingerDefinitionHandler.java index 619b0d5..186dcb6 100644 --- a/src/main/java/com/dingerframework/core/DingerDefinitionHandler.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionHandler.java @@ -13,15 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.core.annatations.DingerTokenId; +import com.github.jaemon.dinger.core.annatations.DingerTokenId; import com.dingerframework.core.entity.enums.*; -import com.dingerframework.core.annatations.DingerMarkdown; -import com.dingerframework.core.annatations.DingerText; -import com.dingerframework.core.entity.MsgType; +import com.github.jaemon.dinger.core.annatations.DingerMarkdown; +import com.github.jaemon.dinger.core.annatations.DingerText; +import com.github.jaemon.dinger.core.entity.MsgType; import com.dingerframework.core.entity.xml.*; -import com.dingerframework.exception.DingerException; +import com.github.jaemon.dinger.core.entity.enums.*; +import com.github.jaemon.dinger.core.entity.xml.*; +import com.github.jaemon.dinger.exception.DingerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +33,7 @@ import java.util.Optional; import java.util.stream.Collectors; -import static com.dingerframework.entity.enums.ExceptionEnum.DINGERDEFINITIONTYPE_ERROR; +import static com.github.jaemon.dinger.entity.enums.ExceptionEnum.DINGERDEFINITIONTYPE_ERROR; /** * DefinitionGenerator diff --git a/src/main/java/com/dingerframework/core/DingerDefinitionResolver.java b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionResolver.java similarity index 87% rename from src/main/java/com/dingerframework/core/DingerDefinitionResolver.java rename to src/main/java/com/github/jaemon/dinger/core/DingerDefinitionResolver.java index 9359c91..6bb1249 100644 --- a/src/main/java/com/dingerframework/core/DingerDefinitionResolver.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerDefinitionResolver.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; - -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.core.annatations.AsyncExecute; -import com.dingerframework.core.annatations.DingerConfiguration; -import com.dingerframework.core.annatations.DingerMarkdown; -import com.dingerframework.core.annatations.DingerText; -import com.dingerframework.core.entity.enums.MessageMainType; -import com.dingerframework.core.entity.enums.MessageSubType; -import com.dingerframework.core.entity.xml.BeanTag; -import com.dingerframework.core.entity.xml.MessageTag; -import com.dingerframework.exception.DingerException; -import com.dingerframework.utils.DingerUtils; -import com.dingerframework.utils.XmlUtils; +package com.github.jaemon.dinger.core; + +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.core.annatations.AsyncExecute; +import com.github.jaemon.dinger.core.annatations.DingerConfiguration; +import com.github.jaemon.dinger.core.annatations.DingerMarkdown; +import com.github.jaemon.dinger.core.annatations.DingerText; +import com.github.jaemon.dinger.core.entity.enums.MessageMainType; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.core.entity.xml.BeanTag; +import com.github.jaemon.dinger.core.entity.xml.MessageTag; +import com.github.jaemon.dinger.exception.DingerException; +import com.github.jaemon.dinger.utils.DingerUtils; +import com.github.jaemon.dinger.utils.XmlUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; @@ -39,8 +39,8 @@ import java.lang.reflect.Method; import java.util.*; -import static com.dingerframework.constant.DingerConstant.SPOT_SEPERATOR; -import static com.dingerframework.entity.enums.ExceptionEnum.DINER_XML_ANALYSIS_EXCEPTION; +import static com.github.jaemon.dinger.constant.DingerConstant.SPOT_SEPERATOR; +import static com.github.jaemon.dinger.entity.enums.ExceptionEnum.DINER_XML_ANALYSIS_EXCEPTION; /** * DingerDefinitionResolver diff --git a/src/main/java/com/dingerframework/core/DingerHandleProxy.java b/src/main/java/com/github/jaemon/dinger/core/DingerHandleProxy.java similarity index 86% rename from src/main/java/com/dingerframework/core/DingerHandleProxy.java rename to src/main/java/com/github/jaemon/dinger/core/DingerHandleProxy.java index 2491de7..3470def 100644 --- a/src/main/java/com/dingerframework/core/DingerHandleProxy.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerHandleProxy.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; - -import com.dingerframework.DingerSender; -import com.dingerframework.core.annatations.DingerClose; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.entity.DingerResult; +package com.github.jaemon.dinger.core; + +import com.github.jaemon.dinger.DingerSender; +import com.github.jaemon.dinger.core.annatations.DingerClose; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.entity.DingerResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -28,7 +28,7 @@ import java.lang.reflect.Method; import java.util.*; -import static com.dingerframework.constant.DingerConstant.SPOT_SEPERATOR; +import static com.github.jaemon.dinger.constant.DingerConstant.SPOT_SEPERATOR; /** * Dinger Handle Proxy diff --git a/src/main/java/com/dingerframework/core/DingerHelper.java b/src/main/java/com/github/jaemon/dinger/core/DingerHelper.java similarity index 98% rename from src/main/java/com/dingerframework/core/DingerHelper.java rename to src/main/java/com/github/jaemon/dinger/core/DingerHelper.java index 83dc276..e87c70d 100644 --- a/src/main/java/com/dingerframework/core/DingerHelper.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerHelper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; /** * DingerHelper diff --git a/src/main/java/com/dingerframework/core/DingerMessageHandler.java b/src/main/java/com/github/jaemon/dinger/core/DingerMessageHandler.java similarity index 87% rename from src/main/java/com/dingerframework/core/DingerMessageHandler.java rename to src/main/java/com/github/jaemon/dinger/core/DingerMessageHandler.java index f1e1194..3f33aa9 100644 --- a/src/main/java/com/dingerframework/core/DingerMessageHandler.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerMessageHandler.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; - -import com.dingerframework.DingerSender; -import com.dingerframework.core.annatations.Dinger; -import com.dingerframework.core.annatations.Keyword; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.entity.DingerResult; -import com.dingerframework.listeners.DingerXmlPreparedEvent; -import com.dingerframework.multi.MultiDingerConfigContainer; -import com.dingerframework.multi.MultiDingerProperty; -import com.dingerframework.multi.entity.MultiDingerConfig; +package com.github.jaemon.dinger.core; + +import com.github.jaemon.dinger.DingerSender; +import com.github.jaemon.dinger.core.annatations.Dinger; +import com.github.jaemon.dinger.core.annatations.Keyword; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.entity.DingerResult; +import com.github.jaemon.dinger.listeners.DingerXmlPreparedEvent; +import com.github.jaemon.dinger.multi.MultiDingerConfigContainer; +import com.github.jaemon.dinger.multi.MultiDingerProperty; +import com.github.jaemon.dinger.multi.entity.MultiDingerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +39,7 @@ import java.util.Map; import java.util.Optional; -import static com.dingerframework.constant.DingerConstant.SPOT_SEPERATOR; +import static com.github.jaemon.dinger.constant.DingerConstant.SPOT_SEPERATOR; /** * DingerMessageHandler @@ -69,8 +69,8 @@ public Map paramsHandle(Parameter[] parameters, Object[] values) for (int i = 0; i < parameters.length; i++) { Parameter parameter = parameters[i]; String paramName = parameter.getName(); - com.dingerframework.core.annatations.Parameter[] panno = - parameter.getDeclaredAnnotationsByType(com.dingerframework.core.annatations.Parameter.class); + com.github.jaemon.dinger.core.annatations.Parameter[] panno = + parameter.getDeclaredAnnotationsByType(com.github.jaemon.dinger.core.annatations.Parameter.class); Keyword[] kanno = parameter.getDeclaredAnnotationsByType(Keyword.class); if (panno != null && panno.length > 0) { paramName = panno[0].value(); diff --git a/src/main/java/com/dingerframework/core/DingerRefresh.java b/src/main/java/com/github/jaemon/dinger/core/DingerRefresh.java similarity index 95% rename from src/main/java/com/dingerframework/core/DingerRefresh.java rename to src/main/java/com/github/jaemon/dinger/core/DingerRefresh.java index 5a81ed0..618ed7b 100644 --- a/src/main/java/com/dingerframework/core/DingerRefresh.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerRefresh.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; /** * DingerRefresh diff --git a/src/main/java/com/dingerframework/core/DingerSession.java b/src/main/java/com/github/jaemon/dinger/core/DingerSession.java similarity index 90% rename from src/main/java/com/dingerframework/core/DingerSession.java rename to src/main/java/com/github/jaemon/dinger/core/DingerSession.java index b98d743..400bb82 100644 --- a/src/main/java/com/dingerframework/core/DingerSession.java +++ b/src/main/java/com/github/jaemon/dinger/core/DingerSession.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.DingerSender; -import com.dingerframework.core.entity.DingerProperties; +import com.github.jaemon.dinger.DingerSender; +import com.github.jaemon.dinger.core.entity.DingerProperties; import java.lang.reflect.Proxy; diff --git a/src/main/java/com/dingerframework/core/MessageTransfer.java b/src/main/java/com/github/jaemon/dinger/core/MessageTransfer.java similarity index 92% rename from src/main/java/com/dingerframework/core/MessageTransfer.java rename to src/main/java/com/github/jaemon/dinger/core/MessageTransfer.java index 10e06e9..966a594 100644 --- a/src/main/java/com/dingerframework/core/MessageTransfer.java +++ b/src/main/java/com/github/jaemon/dinger/core/MessageTransfer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.MsgType; import java.util.Map; diff --git a/src/main/java/com/dingerframework/core/ParamHandle.java b/src/main/java/com/github/jaemon/dinger/core/ParamHandle.java similarity index 96% rename from src/main/java/com/dingerframework/core/ParamHandle.java rename to src/main/java/com/github/jaemon/dinger/core/ParamHandle.java index a4a8b39..6c7aade 100644 --- a/src/main/java/com/dingerframework/core/ParamHandle.java +++ b/src/main/java/com/github/jaemon/dinger/core/ParamHandle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; import java.lang.reflect.Parameter; import java.util.Map; diff --git a/src/main/java/com/dingerframework/core/ResultHandle.java b/src/main/java/com/github/jaemon/dinger/core/ResultHandle.java similarity index 95% rename from src/main/java/com/dingerframework/core/ResultHandle.java rename to src/main/java/com/github/jaemon/dinger/core/ResultHandle.java index b883f20..eeeb25a 100644 --- a/src/main/java/com/dingerframework/core/ResultHandle.java +++ b/src/main/java/com/github/jaemon/dinger/core/ResultHandle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; /** * ResultHandle diff --git a/src/main/java/com/dingerframework/core/annatations/AsyncExecute.java b/src/main/java/com/github/jaemon/dinger/core/annatations/AsyncExecute.java similarity index 94% rename from src/main/java/com/dingerframework/core/annatations/AsyncExecute.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/AsyncExecute.java index 9f0b693..bcdf392 100644 --- a/src/main/java/com/dingerframework/core/annatations/AsyncExecute.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/AsyncExecute.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/Dinger.java b/src/main/java/com/github/jaemon/dinger/core/annatations/Dinger.java similarity index 89% rename from src/main/java/com/dingerframework/core/annatations/Dinger.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/Dinger.java index 416e6b8..43cd86c 100644 --- a/src/main/java/com/dingerframework/core/annatations/Dinger.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/Dinger.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; -import com.dingerframework.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/DingerClose.java b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerClose.java similarity index 94% rename from src/main/java/com/dingerframework/core/annatations/DingerClose.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/DingerClose.java index 50f3c98..6381995 100644 --- a/src/main/java/com/dingerframework/core/annatations/DingerClose.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerClose.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/DingerConfiguration.java b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerConfiguration.java similarity index 95% rename from src/main/java/com/dingerframework/core/annatations/DingerConfiguration.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/DingerConfiguration.java index f1a9375..73d7ee7 100644 --- a/src/main/java/com/dingerframework/core/annatations/DingerConfiguration.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/DingerMarkdown.java b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerMarkdown.java similarity index 94% rename from src/main/java/com/dingerframework/core/annatations/DingerMarkdown.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/DingerMarkdown.java index a5cf0fe..9323d73 100644 --- a/src/main/java/com/dingerframework/core/annatations/DingerMarkdown.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerMarkdown.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; -import com.dingerframework.core.entity.enums.AsyncExecuteType; +import com.github.jaemon.dinger.core.entity.enums.AsyncExecuteType; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/DingerScan.java b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerScan.java similarity index 88% rename from src/main/java/com/dingerframework/core/annatations/DingerScan.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/DingerScan.java index b88811e..153721c 100644 --- a/src/main/java/com/dingerframework/core/annatations/DingerScan.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerScan.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; -import com.dingerframework.core.spring.DingerScannerRegistrar; +import com.github.jaemon.dinger.core.spring.DingerScannerRegistrar; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/DingerText.java b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerText.java similarity index 93% rename from src/main/java/com/dingerframework/core/annatations/DingerText.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/DingerText.java index df73992..a7dbce2 100644 --- a/src/main/java/com/dingerframework/core/annatations/DingerText.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerText.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; -import com.dingerframework.core.entity.enums.AsyncExecuteType; +import com.github.jaemon.dinger.core.entity.enums.AsyncExecuteType; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/DingerTokenId.java b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerTokenId.java similarity index 95% rename from src/main/java/com/dingerframework/core/annatations/DingerTokenId.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/DingerTokenId.java index dcd0a5a..fcbb6f2 100644 --- a/src/main/java/com/dingerframework/core/annatations/DingerTokenId.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/DingerTokenId.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/Keyword.java b/src/main/java/com/github/jaemon/dinger/core/annatations/Keyword.java similarity index 94% rename from src/main/java/com/dingerframework/core/annatations/Keyword.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/Keyword.java index c03044e..c83a9b1 100644 --- a/src/main/java/com/dingerframework/core/annatations/Keyword.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/Keyword.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/Parameter.java b/src/main/java/com/github/jaemon/dinger/core/annatations/Parameter.java similarity index 94% rename from src/main/java/com/dingerframework/core/annatations/Parameter.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/Parameter.java index 2cc0dfd..d88b799 100644 --- a/src/main/java/com/dingerframework/core/annatations/Parameter.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/Parameter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/annatations/PriorityColumn.java b/src/main/java/com/github/jaemon/dinger/core/annatations/PriorityColumn.java similarity index 94% rename from src/main/java/com/dingerframework/core/annatations/PriorityColumn.java rename to src/main/java/com/github/jaemon/dinger/core/annatations/PriorityColumn.java index ffad603..5b29a36 100644 --- a/src/main/java/com/dingerframework/core/annatations/PriorityColumn.java +++ b/src/main/java/com/github/jaemon/dinger/core/annatations/PriorityColumn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.annatations; +package com.github.jaemon.dinger.core.annatations; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/core/entity/DingerProperties.java b/src/main/java/com/github/jaemon/dinger/core/entity/DingerProperties.java similarity index 95% rename from src/main/java/com/dingerframework/core/entity/DingerProperties.java rename to src/main/java/com/github/jaemon/dinger/core/entity/DingerProperties.java index 3593b86..94f3700 100644 --- a/src/main/java/com/dingerframework/core/entity/DingerProperties.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/DingerProperties.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity; +package com.github.jaemon.dinger.core.entity; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.exception.InvalidPropertiesFormatException; -import com.dingerframework.utils.ConfigTools; -import com.dingerframework.utils.DingerUtils; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.exception.InvalidPropertiesFormatException; +import com.github.jaemon.dinger.utils.ConfigTools; +import com.github.jaemon.dinger.utils.DingerUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Map; -import static com.dingerframework.constant.DingerConstant.DINGER_PROP_PREFIX; +import static com.github.jaemon.dinger.constant.DingerConstant.DINGER_PROP_PREFIX; /** diff --git a/src/main/java/com/dingerframework/core/entity/MsgType.java b/src/main/java/com/github/jaemon/dinger/core/entity/MsgType.java similarity index 95% rename from src/main/java/com/dingerframework/core/entity/MsgType.java rename to src/main/java/com/github/jaemon/dinger/core/entity/MsgType.java index 2071981..49c7021 100644 --- a/src/main/java/com/dingerframework/core/entity/MsgType.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/MsgType.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity; +package com.github.jaemon.dinger.core.entity; -import com.dingerframework.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/dingerframework/core/entity/enums/AsyncExecuteType.java b/src/main/java/com/github/jaemon/dinger/core/entity/enums/AsyncExecuteType.java similarity index 94% rename from src/main/java/com/dingerframework/core/entity/enums/AsyncExecuteType.java rename to src/main/java/com/github/jaemon/dinger/core/entity/enums/AsyncExecuteType.java index b269ebd..90f04fd 100644 --- a/src/main/java/com/dingerframework/core/entity/enums/AsyncExecuteType.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/enums/AsyncExecuteType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.enums; +package com.github.jaemon.dinger.core.entity.enums; /** * AsyncExecuteType diff --git a/src/main/java/com/dingerframework/core/entity/enums/DingerDefinitionType.java b/src/main/java/com/github/jaemon/dinger/core/entity/enums/DingerDefinitionType.java similarity index 93% rename from src/main/java/com/dingerframework/core/entity/enums/DingerDefinitionType.java rename to src/main/java/com/github/jaemon/dinger/core/entity/enums/DingerDefinitionType.java index 37a63cf..9e28683 100644 --- a/src/main/java/com/dingerframework/core/entity/enums/DingerDefinitionType.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/enums/DingerDefinitionType.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.enums; +package com.github.jaemon.dinger.core.entity.enums; -import com.dingerframework.core.DingerDefinitionGenerator; -import com.dingerframework.dingtalk.DingTalkDefinitionGenerator; -import com.dingerframework.wetalk.WeTalkDefinitionGenerator; +import com.github.jaemon.dinger.core.DingerDefinitionGenerator; +import com.github.jaemon.dinger.dingtalk.DingTalkDefinitionGenerator; +import com.github.jaemon.dinger.wetalk.WeTalkDefinitionGenerator; /** diff --git a/src/main/java/com/dingerframework/core/entity/enums/DingerType.java b/src/main/java/com/github/jaemon/dinger/core/entity/enums/DingerType.java similarity index 96% rename from src/main/java/com/dingerframework/core/entity/enums/DingerType.java rename to src/main/java/com/github/jaemon/dinger/core/entity/enums/DingerType.java index 99c9ac5..7168fe7 100644 --- a/src/main/java/com/dingerframework/core/entity/enums/DingerType.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/enums/DingerType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.enums; +package com.github.jaemon.dinger.core.entity.enums; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/dingerframework/core/entity/enums/MessageMainType.java b/src/main/java/com/github/jaemon/dinger/core/entity/enums/MessageMainType.java similarity index 94% rename from src/main/java/com/dingerframework/core/entity/enums/MessageMainType.java rename to src/main/java/com/github/jaemon/dinger/core/entity/enums/MessageMainType.java index 119d602..b853458 100644 --- a/src/main/java/com/dingerframework/core/entity/enums/MessageMainType.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/enums/MessageMainType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.enums; +package com.github.jaemon.dinger.core.entity.enums; /** * 消息体定义主类型(消息体xml定义和注解定义) diff --git a/src/main/java/com/dingerframework/core/entity/enums/MessageSubType.java b/src/main/java/com/github/jaemon/dinger/core/entity/enums/MessageSubType.java similarity index 86% rename from src/main/java/com/dingerframework/core/entity/enums/MessageSubType.java rename to src/main/java/com/github/jaemon/dinger/core/entity/enums/MessageSubType.java index c76f7ae..efc7259 100644 --- a/src/main/java/com/dingerframework/core/entity/enums/MessageSubType.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/enums/MessageSubType.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.enums; +package com.github.jaemon.dinger.core.entity.enums; -import com.dingerframework.dingtalk.entity.DingMarkDown; -import com.dingerframework.dingtalk.entity.DingText; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.dingtalk.entity.Message; -import com.dingerframework.wetalk.entity.WeMarkdown; -import com.dingerframework.wetalk.entity.WeText; +import com.github.jaemon.dinger.dingtalk.entity.DingMarkDown; +import com.github.jaemon.dinger.dingtalk.entity.DingText; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.dingtalk.entity.Message; +import com.github.jaemon.dinger.wetalk.entity.WeMarkdown; +import com.github.jaemon.dinger.wetalk.entity.WeText; import java.util.Arrays; import java.util.List; import java.util.Objects; -import static com.dingerframework.core.DingerDefinitionHandler.WETALK_AT_ALL; +import static com.github.jaemon.dinger.core.DingerDefinitionHandler.WETALK_AT_ALL; /** * 消息体定义子类型 diff --git a/src/main/java/com/dingerframework/core/entity/xml/BeanTag.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/BeanTag.java similarity index 96% rename from src/main/java/com/dingerframework/core/entity/xml/BeanTag.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/BeanTag.java index a33276b..fc6738e 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/BeanTag.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/BeanTag.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/src/main/java/com/dingerframework/core/entity/xml/BodyTag.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/BodyTag.java similarity index 88% rename from src/main/java/com/dingerframework/core/entity/xml/BodyTag.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/BodyTag.java index 0676f7a..dd0ccdb 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/BodyTag.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/BodyTag.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; -import com.dingerframework.core.annatations.PriorityColumn; -import com.dingerframework.core.entity.enums.MessageSubType; +import com.github.jaemon.dinger.core.annatations.PriorityColumn; +import com.github.jaemon.dinger.core.entity.enums.MessageSubType; import javax.xml.bind.annotation.XmlRootElement; diff --git a/src/main/java/com/dingerframework/core/entity/xml/ConfigurationTag.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/ConfigurationTag.java similarity index 93% rename from src/main/java/com/dingerframework/core/entity/xml/ConfigurationTag.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/ConfigurationTag.java index 26b3549..ef0c101 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/ConfigurationTag.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/ConfigurationTag.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; -import com.dingerframework.core.annatations.PriorityColumn; +import com.github.jaemon.dinger.core.annatations.PriorityColumn; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/src/main/java/com/dingerframework/core/entity/xml/ContentTag.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/ContentTag.java similarity index 90% rename from src/main/java/com/dingerframework/core/entity/xml/ContentTag.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/ContentTag.java index c8b6dd0..24af057 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/ContentTag.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/ContentTag.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; -import static com.dingerframework.utils.DingerUtils.replaceHeadTailLineBreak; +import static com.github.jaemon.dinger.utils.DingerUtils.replaceHeadTailLineBreak; /** * ContentTag diff --git a/src/main/java/com/dingerframework/core/entity/xml/MessageTag.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/MessageTag.java similarity index 94% rename from src/main/java/com/dingerframework/core/entity/xml/MessageTag.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/MessageTag.java index ee029af..6232960 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/MessageTag.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/MessageTag.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; -import com.dingerframework.core.annatations.PriorityColumn; +import com.github.jaemon.dinger.core.annatations.PriorityColumn; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/src/main/java/com/dingerframework/core/entity/xml/PhoneTag.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/PhoneTag.java similarity index 95% rename from src/main/java/com/dingerframework/core/entity/xml/PhoneTag.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/PhoneTag.java index c34a12c..08bed92 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/PhoneTag.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/PhoneTag.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; diff --git a/src/main/java/com/dingerframework/core/entity/xml/PhonesTag.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/PhonesTag.java similarity index 96% rename from src/main/java/com/dingerframework/core/entity/xml/PhonesTag.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/PhonesTag.java index 82b01e5..dc0d1f9 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/PhonesTag.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/PhonesTag.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; diff --git a/src/main/java/com/dingerframework/core/entity/xml/TokenId.java b/src/main/java/com/github/jaemon/dinger/core/entity/xml/TokenId.java similarity index 92% rename from src/main/java/com/dingerframework/core/entity/xml/TokenId.java rename to src/main/java/com/github/jaemon/dinger/core/entity/xml/TokenId.java index abd62b4..3aaf248 100644 --- a/src/main/java/com/dingerframework/core/entity/xml/TokenId.java +++ b/src/main/java/com/github/jaemon/dinger/core/entity/xml/TokenId.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.entity.xml; +package com.github.jaemon.dinger.core.entity.xml; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlValue; -import static com.dingerframework.utils.DingerUtils.replaceHeadTailLineBreak; +import static com.github.jaemon.dinger.utils.DingerUtils.replaceHeadTailLineBreak; /** * TokenId diff --git a/src/main/java/com/dingerframework/core/package-info.java b/src/main/java/com/github/jaemon/dinger/core/package-info.java similarity index 94% rename from src/main/java/com/dingerframework/core/package-info.java rename to src/main/java/com/github/jaemon/dinger/core/package-info.java index ddf7736..d6db2c6 100644 --- a/src/main/java/com/dingerframework/core/package-info.java +++ b/src/main/java/com/github/jaemon/dinger/core/package-info.java @@ -20,4 +20,4 @@ * @author Jaemon * @since 4.0 */ -package com.dingerframework.core; \ No newline at end of file +package com.github.jaemon.dinger.core; \ No newline at end of file diff --git a/src/main/java/com/dingerframework/core/spring/DingerFactoryBean.java b/src/main/java/com/github/jaemon/dinger/core/spring/DingerFactoryBean.java similarity index 87% rename from src/main/java/com/dingerframework/core/spring/DingerFactoryBean.java rename to src/main/java/com/github/jaemon/dinger/core/spring/DingerFactoryBean.java index 6d727f4..ccb7754 100644 --- a/src/main/java/com/dingerframework/core/spring/DingerFactoryBean.java +++ b/src/main/java/com/github/jaemon/dinger/core/spring/DingerFactoryBean.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.spring; +package com.github.jaemon.dinger.core.spring; -import com.dingerframework.DingerSender; -import com.dingerframework.core.DingerSession; -import com.dingerframework.core.entity.DingerProperties; +import com.github.jaemon.dinger.DingerSender; +import com.github.jaemon.dinger.core.DingerSession; +import com.github.jaemon.dinger.core.entity.DingerProperties; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/dingerframework/core/spring/DingerScannerRegistrar.java b/src/main/java/com/github/jaemon/dinger/core/spring/DingerScannerRegistrar.java similarity index 91% rename from src/main/java/com/dingerframework/core/spring/DingerScannerRegistrar.java rename to src/main/java/com/github/jaemon/dinger/core/spring/DingerScannerRegistrar.java index 6b26495..f1c4e07 100644 --- a/src/main/java/com/dingerframework/core/spring/DingerScannerRegistrar.java +++ b/src/main/java/com/github/jaemon/dinger/core/spring/DingerScannerRegistrar.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core.spring; +package com.github.jaemon.dinger.core.spring; -import com.dingerframework.core.annatations.DingerScan; -import com.dingerframework.entity.enums.ExceptionEnum; -import com.dingerframework.exception.DingerException; -import com.dingerframework.listeners.ApplicationEventTimeTable; -import com.dingerframework.listeners.DingerListenersProperty; +import com.github.jaemon.dinger.core.annatations.DingerScan; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.exception.DingerException; +import com.github.jaemon.dinger.listeners.ApplicationEventTimeTable; +import com.github.jaemon.dinger.listeners.DingerListenersProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -33,7 +33,7 @@ import java.util.List; -import static com.dingerframework.utils.PackageUtils.classNames; +import static com.github.jaemon.dinger.utils.PackageUtils.classNames; /** * DingerScannerRegistrar diff --git a/src/main/java/com/dingerframework/dingtalk/DingTalkDefinitionGenerator.java b/src/main/java/com/github/jaemon/dinger/dingtalk/DingTalkDefinitionGenerator.java similarity index 80% rename from src/main/java/com/dingerframework/dingtalk/DingTalkDefinitionGenerator.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/DingTalkDefinitionGenerator.java index a9eb4f6..cca3c55 100644 --- a/src/main/java/com/dingerframework/dingtalk/DingTalkDefinitionGenerator.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/DingTalkDefinitionGenerator.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk; - -import com.dingerframework.core.DingerDefinition; -import com.dingerframework.core.DingerDefinitionGenerator; -import com.dingerframework.core.DingerDefinitionGeneratorContext; -import com.dingerframework.core.DingerDefinitionHandler; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.core.entity.xml.MessageTag; -import com.dingerframework.core.annatations.DingerMarkdown; -import com.dingerframework.core.annatations.DingerText; -import com.dingerframework.core.entity.enums.DingerDefinitionType; +package com.github.jaemon.dinger.dingtalk; + +import com.github.jaemon.dinger.core.DingerDefinition; +import com.github.jaemon.dinger.core.DingerDefinitionGenerator; +import com.github.jaemon.dinger.core.DingerDefinitionGeneratorContext; +import com.github.jaemon.dinger.core.DingerDefinitionHandler; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.xml.MessageTag; +import com.github.jaemon.dinger.core.annatations.DingerMarkdown; +import com.github.jaemon.dinger.core.annatations.DingerText; +import com.github.jaemon.dinger.core.entity.enums.DingerDefinitionType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/dingerframework/dingtalk/entity/DingActionCard.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingActionCard.java similarity index 96% rename from src/main/java/com/dingerframework/dingtalk/entity/DingActionCard.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingActionCard.java index 21995be..c040afd 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/DingActionCard.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingActionCard.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity; +package com.github.jaemon.dinger.dingtalk.entity; -import com.dingerframework.dingtalk.entity.enums.DingTalkMsgType; +import com.github.jaemon.dinger.dingtalk.entity.enums.DingTalkMsgType; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/dingerframework/dingtalk/entity/DingFeedCard.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingFeedCard.java similarity index 95% rename from src/main/java/com/dingerframework/dingtalk/entity/DingFeedCard.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingFeedCard.java index b28c52e..4e98ba8 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/DingFeedCard.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingFeedCard.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity; +package com.github.jaemon.dinger.dingtalk.entity; -import com.dingerframework.dingtalk.entity.enums.DingTalkMsgType; +import com.github.jaemon.dinger.dingtalk.entity.enums.DingTalkMsgType; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/dingerframework/dingtalk/entity/DingMarkDown.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingMarkDown.java similarity index 94% rename from src/main/java/com/dingerframework/dingtalk/entity/DingMarkDown.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingMarkDown.java index 4975726..16b4cbc 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/DingMarkDown.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingMarkDown.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity; +package com.github.jaemon.dinger.dingtalk.entity; -import com.dingerframework.dingtalk.entity.enums.DingTalkMsgType; +import com.github.jaemon.dinger.dingtalk.entity.enums.DingTalkMsgType; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/dingerframework/dingtalk/entity/DingSingleActionCard.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingSingleActionCard.java similarity index 95% rename from src/main/java/com/dingerframework/dingtalk/entity/DingSingleActionCard.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingSingleActionCard.java index 5a0f497..c031955 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/DingSingleActionCard.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingSingleActionCard.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity; +package com.github.jaemon.dinger.dingtalk.entity; -import com.dingerframework.dingtalk.entity.enums.DingTalkMsgType; +import com.github.jaemon.dinger.dingtalk.entity.enums.DingTalkMsgType; import java.io.Serializable; diff --git a/src/main/java/com/dingerframework/dingtalk/entity/DingTalkMessage.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingTalkMessage.java similarity index 83% rename from src/main/java/com/dingerframework/dingtalk/entity/DingTalkMessage.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingTalkMessage.java index 2bcdef5..457d9e4 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/DingTalkMessage.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingTalkMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity; +package com.github.jaemon.dinger.dingtalk.entity; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; /** * DingTalk请求体 diff --git a/src/main/java/com/dingerframework/dingtalk/entity/DingText.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingText.java similarity index 93% rename from src/main/java/com/dingerframework/dingtalk/entity/DingText.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingText.java index a621a02..bb2e567 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/DingText.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/DingText.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity; +package com.github.jaemon.dinger.dingtalk.entity; -import com.dingerframework.dingtalk.entity.enums.DingTalkMsgType; +import com.github.jaemon.dinger.dingtalk.entity.enums.DingTalkMsgType; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/dingerframework/dingtalk/entity/Message.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/Message.java similarity index 97% rename from src/main/java/com/dingerframework/dingtalk/entity/Message.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/Message.java index 7e49745..6c72b8d 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/Message.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/Message.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity; +package com.github.jaemon.dinger.dingtalk.entity; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/dingerframework/dingtalk/entity/enums/DingTalkMsgType.java b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/enums/DingTalkMsgType.java similarity index 95% rename from src/main/java/com/dingerframework/dingtalk/entity/enums/DingTalkMsgType.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/entity/enums/DingTalkMsgType.java index 6698c94..aa69606 100644 --- a/src/main/java/com/dingerframework/dingtalk/entity/enums/DingTalkMsgType.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/entity/enums/DingTalkMsgType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.dingtalk.entity.enums; +package com.github.jaemon.dinger.dingtalk.entity.enums; /** * DingTalk支持的消息类型 diff --git a/src/main/java/com/dingerframework/dingtalk/package-info.java b/src/main/java/com/github/jaemon/dinger/dingtalk/package-info.java similarity index 94% rename from src/main/java/com/dingerframework/dingtalk/package-info.java rename to src/main/java/com/github/jaemon/dinger/dingtalk/package-info.java index 13a1190..53f13bd 100644 --- a/src/main/java/com/dingerframework/dingtalk/package-info.java +++ b/src/main/java/com/github/jaemon/dinger/dingtalk/package-info.java @@ -20,4 +20,4 @@ * @author Jaemon * @since 4.0 */ -package com.dingerframework.dingtalk; \ No newline at end of file +package com.github.jaemon.dinger.dingtalk; \ No newline at end of file diff --git a/src/main/java/com/dingerframework/entity/DingerCallback.java b/src/main/java/com/github/jaemon/dinger/entity/DingerCallback.java similarity index 94% rename from src/main/java/com/dingerframework/entity/DingerCallback.java rename to src/main/java/com/github/jaemon/dinger/entity/DingerCallback.java index da730dc..8f70ac3 100644 --- a/src/main/java/com/dingerframework/entity/DingerCallback.java +++ b/src/main/java/com/github/jaemon/dinger/entity/DingerCallback.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity; +package com.github.jaemon.dinger.entity; -import com.dingerframework.exception.DingerException; +import com.github.jaemon.dinger.exception.DingerException; /** * 异常回调信息实体 diff --git a/src/main/java/com/dingerframework/entity/DingerResult.java b/src/main/java/com/github/jaemon/dinger/entity/DingerResult.java similarity index 96% rename from src/main/java/com/dingerframework/entity/DingerResult.java rename to src/main/java/com/github/jaemon/dinger/entity/DingerResult.java index 960c30d..176edb8 100644 --- a/src/main/java/com/dingerframework/entity/DingerResult.java +++ b/src/main/java/com/github/jaemon/dinger/entity/DingerResult.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity; +package com.github.jaemon.dinger.entity; -import com.dingerframework.entity.enums.ResultCode; +import com.github.jaemon.dinger.entity.enums.ResultCode; /** * DingTalk Result diff --git a/src/main/java/com/dingerframework/entity/DkThreadPoolProperties.java b/src/main/java/com/github/jaemon/dinger/entity/DkThreadPoolProperties.java similarity index 96% rename from src/main/java/com/dingerframework/entity/DkThreadPoolProperties.java rename to src/main/java/com/github/jaemon/dinger/entity/DkThreadPoolProperties.java index e9dd50d..bc02a3f 100644 --- a/src/main/java/com/dingerframework/entity/DkThreadPoolProperties.java +++ b/src/main/java/com/github/jaemon/dinger/entity/DkThreadPoolProperties.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity; +package com.github.jaemon.dinger.entity; -import com.dingerframework.constant.DingerConstant; +import com.github.jaemon.dinger.constant.DingerConstant; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/src/main/java/com/dingerframework/entity/SignBase.java b/src/main/java/com/github/jaemon/dinger/entity/SignBase.java similarity index 95% rename from src/main/java/com/dingerframework/entity/SignBase.java rename to src/main/java/com/github/jaemon/dinger/entity/SignBase.java index 4bcead1..c5c77c8 100644 --- a/src/main/java/com/dingerframework/entity/SignBase.java +++ b/src/main/java/com/github/jaemon/dinger/entity/SignBase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity; +package com.github.jaemon.dinger.entity; /** * 签名返回体基础类 diff --git a/src/main/java/com/dingerframework/entity/SignResult.java b/src/main/java/com/github/jaemon/dinger/entity/SignResult.java similarity index 97% rename from src/main/java/com/dingerframework/entity/SignResult.java rename to src/main/java/com/github/jaemon/dinger/entity/SignResult.java index b96cbd0..c00989b 100644 --- a/src/main/java/com/dingerframework/entity/SignResult.java +++ b/src/main/java/com/github/jaemon/dinger/entity/SignResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity; +package com.github.jaemon.dinger.entity; /** diff --git a/src/main/java/com/dingerframework/entity/enums/ExceptionEnum.java b/src/main/java/com/github/jaemon/dinger/entity/enums/ExceptionEnum.java similarity index 97% rename from src/main/java/com/dingerframework/entity/enums/ExceptionEnum.java rename to src/main/java/com/github/jaemon/dinger/entity/enums/ExceptionEnum.java index 4bda8d6..d2ce35c 100644 --- a/src/main/java/com/dingerframework/entity/enums/ExceptionEnum.java +++ b/src/main/java/com/github/jaemon/dinger/entity/enums/ExceptionEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity.enums; +package com.github.jaemon.dinger.entity.enums; /** * 异常枚举 diff --git a/src/main/java/com/dingerframework/entity/enums/Pairs.java b/src/main/java/com/github/jaemon/dinger/entity/enums/Pairs.java similarity index 94% rename from src/main/java/com/dingerframework/entity/enums/Pairs.java rename to src/main/java/com/github/jaemon/dinger/entity/enums/Pairs.java index bb50499..441f1ee 100644 --- a/src/main/java/com/dingerframework/entity/enums/Pairs.java +++ b/src/main/java/com/github/jaemon/dinger/entity/enums/Pairs.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity.enums; +package com.github.jaemon.dinger.entity.enums; /** * K-V对 diff --git a/src/main/java/com/dingerframework/entity/enums/ResultCode.java b/src/main/java/com/github/jaemon/dinger/entity/enums/ResultCode.java similarity index 96% rename from src/main/java/com/dingerframework/entity/enums/ResultCode.java rename to src/main/java/com/github/jaemon/dinger/entity/enums/ResultCode.java index 5bcebaf..954a28b 100644 --- a/src/main/java/com/dingerframework/entity/enums/ResultCode.java +++ b/src/main/java/com/github/jaemon/dinger/entity/enums/ResultCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.entity.enums; +package com.github.jaemon.dinger.entity.enums; /** * Result Code diff --git a/src/main/java/com/dingerframework/exception/AsyncCallException.java b/src/main/java/com/github/jaemon/dinger/exception/AsyncCallException.java similarity index 90% rename from src/main/java/com/dingerframework/exception/AsyncCallException.java rename to src/main/java/com/github/jaemon/dinger/exception/AsyncCallException.java index 58d8b12..b5b2876 100644 --- a/src/main/java/com/dingerframework/exception/AsyncCallException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/AsyncCallException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * 异步调用异常 diff --git a/src/main/java/com/dingerframework/exception/ConfigurationException.java b/src/main/java/com/github/jaemon/dinger/exception/ConfigurationException.java similarity index 90% rename from src/main/java/com/dingerframework/exception/ConfigurationException.java rename to src/main/java/com/github/jaemon/dinger/exception/ConfigurationException.java index f87a98b..74d0a39 100644 --- a/src/main/java/com/dingerframework/exception/ConfigurationException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/ConfigurationException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * 配置异常 diff --git a/src/main/java/com/dingerframework/exception/DingerConfigRepeatedException.java b/src/main/java/com/github/jaemon/dinger/exception/DingerConfigRepeatedException.java similarity index 91% rename from src/main/java/com/dingerframework/exception/DingerConfigRepeatedException.java rename to src/main/java/com/github/jaemon/dinger/exception/DingerConfigRepeatedException.java index 3ec4a39..8aad881 100644 --- a/src/main/java/com/dingerframework/exception/DingerConfigRepeatedException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/DingerConfigRepeatedException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * DingerConfigRepeatedException diff --git a/src/main/java/com/dingerframework/exception/DingerException.java b/src/main/java/com/github/jaemon/dinger/exception/DingerException.java similarity index 92% rename from src/main/java/com/dingerframework/exception/DingerException.java rename to src/main/java/com/github/jaemon/dinger/exception/DingerException.java index 18eb64c..61eb180 100644 --- a/src/main/java/com/dingerframework/exception/DingerException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/DingerException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.Pairs; +import com.github.jaemon.dinger.entity.enums.Pairs; /** * 异常类 diff --git a/src/main/java/com/dingerframework/exception/DingerScanRepeatedException.java b/src/main/java/com/github/jaemon/dinger/exception/DingerScanRepeatedException.java similarity index 91% rename from src/main/java/com/dingerframework/exception/DingerScanRepeatedException.java rename to src/main/java/com/github/jaemon/dinger/exception/DingerScanRepeatedException.java index 57580c5..7a79ad2 100644 --- a/src/main/java/com/dingerframework/exception/DingerScanRepeatedException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/DingerScanRepeatedException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * DingerScanRepeatedException diff --git a/src/main/java/com/dingerframework/exception/DingerXmlAnalysisException.java b/src/main/java/com/github/jaemon/dinger/exception/DingerXmlAnalysisException.java similarity index 90% rename from src/main/java/com/dingerframework/exception/DingerXmlAnalysisException.java rename to src/main/java/com/github/jaemon/dinger/exception/DingerXmlAnalysisException.java index 7f01300..48b3fa1 100644 --- a/src/main/java/com/dingerframework/exception/DingerXmlAnalysisException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/DingerXmlAnalysisException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * DingerXmlAnalysisException diff --git a/src/main/java/com/dingerframework/exception/InvalidPropertiesFormatException.java b/src/main/java/com/github/jaemon/dinger/exception/InvalidPropertiesFormatException.java similarity index 90% rename from src/main/java/com/dingerframework/exception/InvalidPropertiesFormatException.java rename to src/main/java/com/github/jaemon/dinger/exception/InvalidPropertiesFormatException.java index bd9f922..1da4681 100644 --- a/src/main/java/com/dingerframework/exception/InvalidPropertiesFormatException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/InvalidPropertiesFormatException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * Invalid Properties Format Exception diff --git a/src/main/java/com/dingerframework/exception/MsgTypeException.java b/src/main/java/com/github/jaemon/dinger/exception/MsgTypeException.java similarity index 90% rename from src/main/java/com/dingerframework/exception/MsgTypeException.java rename to src/main/java/com/github/jaemon/dinger/exception/MsgTypeException.java index a3e8741..f75021c 100644 --- a/src/main/java/com/dingerframework/exception/MsgTypeException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/MsgTypeException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * 类型异常 diff --git a/src/main/java/com/dingerframework/exception/SendMsgException.java b/src/main/java/com/github/jaemon/dinger/exception/SendMsgException.java similarity index 89% rename from src/main/java/com/dingerframework/exception/SendMsgException.java rename to src/main/java/com/github/jaemon/dinger/exception/SendMsgException.java index 2a29b4f..afe1eeb 100644 --- a/src/main/java/com/dingerframework/exception/SendMsgException.java +++ b/src/main/java/com/github/jaemon/dinger/exception/SendMsgException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.exception; +package com.github.jaemon.dinger.exception; -import com.dingerframework.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; /** * 发送消息异常 diff --git a/src/main/java/com/dingerframework/listeners/ApplicationEventTimeTable.java b/src/main/java/com/github/jaemon/dinger/listeners/ApplicationEventTimeTable.java similarity index 91% rename from src/main/java/com/dingerframework/listeners/ApplicationEventTimeTable.java rename to src/main/java/com/github/jaemon/dinger/listeners/ApplicationEventTimeTable.java index 254769b..96b6716 100644 --- a/src/main/java/com/dingerframework/listeners/ApplicationEventTimeTable.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/ApplicationEventTimeTable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.listeners; +package com.github.jaemon.dinger.listeners; import java.util.ArrayList; @@ -74,8 +74,8 @@ protected static void clear() { ApplicationEventTimeTable.successTime = 0; ApplicationEventTimeTable.failedTime = 0; ApplicationEventTimeTable.exitTime = 0; - DingerListenersProperty.primarySources = new HashSet<>(); - DingerListenersProperty.dingerClasses = new ArrayList<>(); + primarySources = new HashSet<>(); + dingerClasses = new ArrayList<>(); } } \ No newline at end of file diff --git a/src/main/java/com/dingerframework/listeners/DingerListenersProperty.java b/src/main/java/com/github/jaemon/dinger/listeners/DingerListenersProperty.java similarity index 93% rename from src/main/java/com/dingerframework/listeners/DingerListenersProperty.java rename to src/main/java/com/github/jaemon/dinger/listeners/DingerListenersProperty.java index cabe389..5a92ef3 100644 --- a/src/main/java/com/dingerframework/listeners/DingerListenersProperty.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/DingerListenersProperty.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.listeners; +package com.github.jaemon.dinger.listeners; -import com.dingerframework.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/dingerframework/listeners/DingerXmlPreparedEvent.java b/src/main/java/com/github/jaemon/dinger/listeners/DingerXmlPreparedEvent.java similarity index 88% rename from src/main/java/com/dingerframework/listeners/DingerXmlPreparedEvent.java rename to src/main/java/com/github/jaemon/dinger/listeners/DingerXmlPreparedEvent.java index cead6aa..b0ef336 100644 --- a/src/main/java/com/dingerframework/listeners/DingerXmlPreparedEvent.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/DingerXmlPreparedEvent.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.listeners; +package com.github.jaemon.dinger.listeners; -import com.dingerframework.core.DingerDefinitionResolver; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.entity.enums.ExceptionEnum; -import com.dingerframework.exception.DingerException; -import com.dingerframework.utils.DingerUtils; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.core.DingerDefinitionResolver; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.exception.DingerException; +import com.github.jaemon.dinger.utils.DingerUtils; +import com.github.jaemon.dinger.core.DingerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.context.ApplicationListener; import org.springframework.core.env.Environment; -import static com.dingerframework.constant.DingerConstant.SPOT_SEPERATOR; +import static com.github.jaemon.dinger.constant.DingerConstant.SPOT_SEPERATOR; /** * DingerXmlPreparedEvent diff --git a/src/main/java/com/dingerframework/listeners/ExitEventListener.java b/src/main/java/com/github/jaemon/dinger/listeners/ExitEventListener.java similarity index 83% rename from src/main/java/com/dingerframework/listeners/ExitEventListener.java rename to src/main/java/com/github/jaemon/dinger/listeners/ExitEventListener.java index e0e1196..bac34e2 100644 --- a/src/main/java/com/dingerframework/listeners/ExitEventListener.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/ExitEventListener.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.listeners; +package com.github.jaemon.dinger.listeners; -import com.dingerframework.multi.MultiDingerRefresh; -import com.dingerframework.DingerSender; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.entity.DingerResult; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.support.MonitorEventNotification; +import com.github.jaemon.dinger.multi.MultiDingerRefresh; +import com.github.jaemon.dinger.DingerSender; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.entity.DingerResult; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.support.MonitorEventNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; @@ -28,9 +28,9 @@ import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextClosedEvent; -import static com.dingerframework.constant.DingerConstant.DINGER_PREFIX; -import static com.dingerframework.constant.DingerConstant.EXIT_KEYWORD; -import static com.dingerframework.listeners.ApplicationEventTimeTable.DISABLED_DINTALK_MONITOR; +import static com.github.jaemon.dinger.constant.DingerConstant.DINGER_PREFIX; +import static com.github.jaemon.dinger.constant.DingerConstant.EXIT_KEYWORD; +import static com.github.jaemon.dinger.listeners.ApplicationEventTimeTable.DISABLED_DINTALK_MONITOR; /** * Exit Listener diff --git a/src/main/java/com/dingerframework/listeners/FailedEventListener.java b/src/main/java/com/github/jaemon/dinger/listeners/FailedEventListener.java similarity index 88% rename from src/main/java/com/dingerframework/listeners/FailedEventListener.java rename to src/main/java/com/github/jaemon/dinger/listeners/FailedEventListener.java index 4c81d38..a8c8fd3 100644 --- a/src/main/java/com/dingerframework/listeners/FailedEventListener.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/FailedEventListener.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.listeners; +package com.github.jaemon.dinger.listeners; -import com.dingerframework.DingerSender; -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.entity.DingerResult; -import com.dingerframework.support.MonitorEventNotification; +import com.github.jaemon.dinger.DingerSender; +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.entity.DingerResult; +import com.github.jaemon.dinger.support.MonitorEventNotification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationFailedEvent; diff --git a/src/main/java/com/dingerframework/listeners/StartEventListener.java b/src/main/java/com/github/jaemon/dinger/listeners/StartEventListener.java similarity index 95% rename from src/main/java/com/dingerframework/listeners/StartEventListener.java rename to src/main/java/com/github/jaemon/dinger/listeners/StartEventListener.java index fd17717..6a04795 100644 --- a/src/main/java/com/dingerframework/listeners/StartEventListener.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/StartEventListener.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.listeners; +package com.github.jaemon.dinger.listeners; -import com.dingerframework.core.annatations.DingerScan; +import com.github.jaemon.dinger.core.annatations.DingerScan; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationStartingEvent; diff --git a/src/main/java/com/dingerframework/listeners/SuccessEventListener.java b/src/main/java/com/github/jaemon/dinger/listeners/SuccessEventListener.java similarity index 89% rename from src/main/java/com/dingerframework/listeners/SuccessEventListener.java rename to src/main/java/com/github/jaemon/dinger/listeners/SuccessEventListener.java index 0d0ce9b..60ca244 100644 --- a/src/main/java/com/dingerframework/listeners/SuccessEventListener.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/SuccessEventListener.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.listeners; +package com.github.jaemon.dinger.listeners; -import com.dingerframework.DingerSender; -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.core.entity.DingerProperties; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.support.MonitorEventNotification; -import com.dingerframework.entity.DingerResult; +import com.github.jaemon.dinger.DingerSender; +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.core.entity.DingerProperties; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.support.MonitorEventNotification; +import com.github.jaemon.dinger.entity.DingerResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/src/main/java/com/dingerframework/listeners/package-info.java b/src/main/java/com/github/jaemon/dinger/listeners/package-info.java similarity index 94% rename from src/main/java/com/dingerframework/listeners/package-info.java rename to src/main/java/com/github/jaemon/dinger/listeners/package-info.java index c26e695..0f6a7b3 100644 --- a/src/main/java/com/dingerframework/listeners/package-info.java +++ b/src/main/java/com/github/jaemon/dinger/listeners/package-info.java @@ -20,4 +20,4 @@ * @author Jaemon * @since 4.0 */ -package com.dingerframework.listeners; \ No newline at end of file +package com.github.jaemon.dinger.listeners; \ No newline at end of file diff --git a/src/main/java/com/dingerframework/multi/DingerConfigHandler.java b/src/main/java/com/github/jaemon/dinger/multi/DingerConfigHandler.java similarity index 79% rename from src/main/java/com/dingerframework/multi/DingerConfigHandler.java rename to src/main/java/com/github/jaemon/dinger/multi/DingerConfigHandler.java index 424e611..e2fb40a 100644 --- a/src/main/java/com/dingerframework/multi/DingerConfigHandler.java +++ b/src/main/java/com/github/jaemon/dinger/multi/DingerConfigHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; +package com.github.jaemon.dinger.multi; -import com.dingerframework.core.DingerConfig; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.multi.algorithm.AlgorithmHandler; -import com.dingerframework.multi.algorithm.DefaultHandler; -import com.dingerframework.multi.algorithm.DingerHandler; +import com.github.jaemon.dinger.core.DingerConfig; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.multi.algorithm.DefaultHandler; +import com.github.jaemon.dinger.multi.algorithm.DingerHandler; import java.util.List; diff --git a/src/main/java/com/dingerframework/multi/MultiDingerAlgorithmInjectRegister.java b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerAlgorithmInjectRegister.java similarity index 94% rename from src/main/java/com/dingerframework/multi/MultiDingerAlgorithmInjectRegister.java rename to src/main/java/com/github/jaemon/dinger/multi/MultiDingerAlgorithmInjectRegister.java index 6da7b78..1d79cb7 100644 --- a/src/main/java/com/dingerframework/multi/MultiDingerAlgorithmInjectRegister.java +++ b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerAlgorithmInjectRegister.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; - -import com.dingerframework.core.DingerConfig; -import com.dingerframework.entity.enums.ExceptionEnum; -import com.dingerframework.exception.DingerException; -import com.dingerframework.multi.algorithm.AlgorithmHandler; -import com.dingerframework.multi.entity.MultiDingerAlgorithmDefinition; -import com.dingerframework.multi.entity.MultiDingerConfig; -import com.dingerframework.utils.DingerUtils; +package com.github.jaemon.dinger.multi; + +import com.github.jaemon.dinger.core.DingerConfig; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.exception.DingerException; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.multi.entity.MultiDingerAlgorithmDefinition; +import com.github.jaemon.dinger.multi.entity.MultiDingerConfig; +import com.github.jaemon.dinger.utils.DingerUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/src/main/java/com/dingerframework/multi/MultiDingerConfigContainer.java b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerConfigContainer.java similarity index 95% rename from src/main/java/com/dingerframework/multi/MultiDingerConfigContainer.java rename to src/main/java/com/github/jaemon/dinger/multi/MultiDingerConfigContainer.java index f7ba867..6834392 100644 --- a/src/main/java/com/dingerframework/multi/MultiDingerConfigContainer.java +++ b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerConfigContainer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; +package com.github.jaemon.dinger.multi; -import com.dingerframework.multi.entity.MultiDingerConfig; +import com.github.jaemon.dinger.multi.entity.MultiDingerConfig; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/dingerframework/multi/MultiDingerProperty.java b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerProperty.java similarity index 95% rename from src/main/java/com/dingerframework/multi/MultiDingerProperty.java rename to src/main/java/com/github/jaemon/dinger/multi/MultiDingerProperty.java index df2485a..ae99a99 100644 --- a/src/main/java/com/dingerframework/multi/MultiDingerProperty.java +++ b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerProperty.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; +package com.github.jaemon.dinger.multi; /** * MultiDingerProperty diff --git a/src/main/java/com/dingerframework/multi/MultiDingerRefresh.java b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerRefresh.java similarity index 90% rename from src/main/java/com/dingerframework/multi/MultiDingerRefresh.java rename to src/main/java/com/github/jaemon/dinger/multi/MultiDingerRefresh.java index fdae411..6d11dcd 100644 --- a/src/main/java/com/dingerframework/multi/MultiDingerRefresh.java +++ b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerRefresh.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; +package com.github.jaemon.dinger.multi; -import com.dingerframework.core.DingerRefresh; +import com.github.jaemon.dinger.core.DingerRefresh; /** * MultiDingerRefresh diff --git a/src/main/java/com/dingerframework/multi/MultiDingerScannerRegistrar.java b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerScannerRegistrar.java similarity index 89% rename from src/main/java/com/dingerframework/multi/MultiDingerScannerRegistrar.java rename to src/main/java/com/github/jaemon/dinger/multi/MultiDingerScannerRegistrar.java index 6695b00..d440b79 100644 --- a/src/main/java/com/dingerframework/multi/MultiDingerScannerRegistrar.java +++ b/src/main/java/com/github/jaemon/dinger/multi/MultiDingerScannerRegistrar.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; - -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.entity.enums.ExceptionEnum; -import com.dingerframework.listeners.DingerListenersProperty; -import com.dingerframework.multi.entity.MultiDingerAlgorithmDefinition; -import com.dingerframework.core.DingerConfig; -import com.dingerframework.exception.DingerException; -import com.dingerframework.multi.algorithm.AlgorithmHandler; -import com.dingerframework.multi.annotations.EnableMultiDinger; -import com.dingerframework.multi.annotations.MultiHandler; -import com.dingerframework.multi.entity.MultiDingerConfig; -import com.dingerframework.utils.DingerUtils; +package com.github.jaemon.dinger.multi; + +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.entity.enums.ExceptionEnum; +import com.github.jaemon.dinger.listeners.DingerListenersProperty; +import com.github.jaemon.dinger.multi.entity.MultiDingerAlgorithmDefinition; +import com.github.jaemon.dinger.core.DingerConfig; +import com.github.jaemon.dinger.exception.DingerException; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.multi.annotations.EnableMultiDinger; +import com.github.jaemon.dinger.multi.annotations.MultiHandler; +import com.github.jaemon.dinger.multi.entity.MultiDingerConfig; +import com.github.jaemon.dinger.utils.DingerUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; @@ -46,10 +46,10 @@ import java.util.List; import java.util.Map; -import static com.dingerframework.constant.DingerConstant.SPOT_SEPERATOR; -import static com.dingerframework.entity.enums.ExceptionEnum.GLOBAL_MULTIDINGER_CONFIG_EXCEPTION; -import static com.dingerframework.entity.enums.ExceptionEnum.MULTIDINGER_ALGORITHM_EXCEPTION; -import static com.dingerframework.multi.MultiDingerConfigContainer.GLOABL_KEY; +import static com.github.jaemon.dinger.constant.DingerConstant.SPOT_SEPERATOR; +import static com.github.jaemon.dinger.entity.enums.ExceptionEnum.GLOBAL_MULTIDINGER_CONFIG_EXCEPTION; +import static com.github.jaemon.dinger.entity.enums.ExceptionEnum.MULTIDINGER_ALGORITHM_EXCEPTION; +import static com.github.jaemon.dinger.multi.MultiDingerConfigContainer.GLOABL_KEY; /** * MultiDingerScannerRegistrar diff --git a/src/main/java/com/dingerframework/multi/algorithm/AlgorithmHandler.java b/src/main/java/com/github/jaemon/dinger/multi/algorithm/AlgorithmHandler.java similarity index 93% rename from src/main/java/com/dingerframework/multi/algorithm/AlgorithmHandler.java rename to src/main/java/com/github/jaemon/dinger/multi/algorithm/AlgorithmHandler.java index e9627f2..c12a031 100644 --- a/src/main/java/com/dingerframework/multi/algorithm/AlgorithmHandler.java +++ b/src/main/java/com/github/jaemon/dinger/multi/algorithm/AlgorithmHandler.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.algorithm; +package com.github.jaemon.dinger.multi.algorithm; -import com.dingerframework.multi.MultiDingerAlgorithmInjectRegister; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.multi.MultiDingerAlgorithmInjectRegister; +import com.github.jaemon.dinger.core.DingerConfig; import java.util.List; diff --git a/src/main/java/com/dingerframework/multi/algorithm/DefaultHandler.java b/src/main/java/com/github/jaemon/dinger/multi/algorithm/DefaultHandler.java similarity index 86% rename from src/main/java/com/dingerframework/multi/algorithm/DefaultHandler.java rename to src/main/java/com/github/jaemon/dinger/multi/algorithm/DefaultHandler.java index 0686ced..6817c5e 100644 --- a/src/main/java/com/dingerframework/multi/algorithm/DefaultHandler.java +++ b/src/main/java/com/github/jaemon/dinger/multi/algorithm/DefaultHandler.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.algorithm; +package com.github.jaemon.dinger.multi.algorithm; -import com.dingerframework.multi.DingerConfigHandler; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.multi.DingerConfigHandler; +import com.github.jaemon.dinger.core.DingerConfig; import java.util.List; diff --git a/src/main/java/com/dingerframework/multi/algorithm/DingerHandler.java b/src/main/java/com/github/jaemon/dinger/multi/algorithm/DingerHandler.java similarity index 97% rename from src/main/java/com/dingerframework/multi/algorithm/DingerHandler.java rename to src/main/java/com/github/jaemon/dinger/multi/algorithm/DingerHandler.java index dbcdcdf..f723554 100644 --- a/src/main/java/com/dingerframework/multi/algorithm/DingerHandler.java +++ b/src/main/java/com/github/jaemon/dinger/multi/algorithm/DingerHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.algorithm; +package com.github.jaemon.dinger.multi.algorithm; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.core.DingerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/dingerframework/multi/algorithm/RandomHandler.java b/src/main/java/com/github/jaemon/dinger/multi/algorithm/RandomHandler.java similarity index 86% rename from src/main/java/com/dingerframework/multi/algorithm/RandomHandler.java rename to src/main/java/com/github/jaemon/dinger/multi/algorithm/RandomHandler.java index e2de721..5618a18 100644 --- a/src/main/java/com/dingerframework/multi/algorithm/RandomHandler.java +++ b/src/main/java/com/github/jaemon/dinger/multi/algorithm/RandomHandler.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.algorithm; +package com.github.jaemon.dinger.multi.algorithm; -import com.dingerframework.core.DingerConfig; -import com.dingerframework.utils.RandomUtils; +import com.github.jaemon.dinger.core.DingerConfig; +import com.github.jaemon.dinger.utils.RandomUtils; import java.util.List; diff --git a/src/main/java/com/dingerframework/multi/algorithm/RoundRobinHandler.java b/src/main/java/com/github/jaemon/dinger/multi/algorithm/RoundRobinHandler.java similarity index 93% rename from src/main/java/com/dingerframework/multi/algorithm/RoundRobinHandler.java rename to src/main/java/com/github/jaemon/dinger/multi/algorithm/RoundRobinHandler.java index 11a0fa7..9553472 100644 --- a/src/main/java/com/dingerframework/multi/algorithm/RoundRobinHandler.java +++ b/src/main/java/com/github/jaemon/dinger/multi/algorithm/RoundRobinHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.algorithm; +package com.github.jaemon.dinger.multi.algorithm; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.core.DingerConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/dingerframework/multi/annotations/EnableMultiDinger.java b/src/main/java/com/github/jaemon/dinger/multi/annotations/EnableMultiDinger.java similarity index 86% rename from src/main/java/com/dingerframework/multi/annotations/EnableMultiDinger.java rename to src/main/java/com/github/jaemon/dinger/multi/annotations/EnableMultiDinger.java index bf7a16a..cf9b376 100644 --- a/src/main/java/com/dingerframework/multi/annotations/EnableMultiDinger.java +++ b/src/main/java/com/github/jaemon/dinger/multi/annotations/EnableMultiDinger.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.annotations; +package com.github.jaemon.dinger.multi.annotations; -import com.dingerframework.multi.DingerConfigHandler; -import com.dingerframework.multi.MultiDingerScannerRegistrar; +import com.github.jaemon.dinger.multi.DingerConfigHandler; +import com.github.jaemon.dinger.multi.MultiDingerScannerRegistrar; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/multi/annotations/MultiHandler.java b/src/main/java/com/github/jaemon/dinger/multi/annotations/MultiHandler.java similarity index 89% rename from src/main/java/com/dingerframework/multi/annotations/MultiHandler.java rename to src/main/java/com/github/jaemon/dinger/multi/annotations/MultiHandler.java index b17c673..2ed47a3 100644 --- a/src/main/java/com/dingerframework/multi/annotations/MultiHandler.java +++ b/src/main/java/com/github/jaemon/dinger/multi/annotations/MultiHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.annotations; +package com.github.jaemon.dinger.multi.annotations; -import com.dingerframework.multi.DingerConfigHandler; +import com.github.jaemon.dinger.multi.DingerConfigHandler; import java.lang.annotation.*; diff --git a/src/main/java/com/dingerframework/multi/entity/MultiDinger.java b/src/main/java/com/github/jaemon/dinger/multi/entity/MultiDinger.java similarity index 92% rename from src/main/java/com/dingerframework/multi/entity/MultiDinger.java rename to src/main/java/com/github/jaemon/dinger/multi/entity/MultiDinger.java index 68e42ad..b3453d1 100644 --- a/src/main/java/com/dingerframework/multi/entity/MultiDinger.java +++ b/src/main/java/com/github/jaemon/dinger/multi/entity/MultiDinger.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.entity; +package com.github.jaemon.dinger.multi.entity; -import com.dingerframework.multi.DingerConfigHandler; +import com.github.jaemon.dinger.multi.DingerConfigHandler; /** * MultiDinger diff --git a/src/main/java/com/dingerframework/multi/entity/MultiDingerAlgorithmDefinition.java b/src/main/java/com/github/jaemon/dinger/multi/entity/MultiDingerAlgorithmDefinition.java similarity index 90% rename from src/main/java/com/dingerframework/multi/entity/MultiDingerAlgorithmDefinition.java rename to src/main/java/com/github/jaemon/dinger/multi/entity/MultiDingerAlgorithmDefinition.java index 091b8b5..efd02ae 100644 --- a/src/main/java/com/dingerframework/multi/entity/MultiDingerAlgorithmDefinition.java +++ b/src/main/java/com/github/jaemon/dinger/multi/entity/MultiDingerAlgorithmDefinition.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.entity; +package com.github.jaemon.dinger.multi.entity; -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.core.DingerConfig; -import com.dingerframework.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.core.DingerConfig; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; import java.util.List; diff --git a/src/main/java/com/dingerframework/multi/entity/MultiDingerConfig.java b/src/main/java/com/github/jaemon/dinger/multi/entity/MultiDingerConfig.java similarity index 89% rename from src/main/java/com/dingerframework/multi/entity/MultiDingerConfig.java rename to src/main/java/com/github/jaemon/dinger/multi/entity/MultiDingerConfig.java index 833d82c..db0bf1b 100644 --- a/src/main/java/com/dingerframework/multi/entity/MultiDingerConfig.java +++ b/src/main/java/com/github/jaemon/dinger/multi/entity/MultiDingerConfig.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.entity; +package com.github.jaemon.dinger.multi.entity; -import com.dingerframework.multi.algorithm.AlgorithmHandler; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.core.DingerConfig; import java.util.List; diff --git a/src/main/java/com/dingerframework/multi/package-info.java b/src/main/java/com/github/jaemon/dinger/multi/package-info.java similarity index 94% rename from src/main/java/com/dingerframework/multi/package-info.java rename to src/main/java/com/github/jaemon/dinger/multi/package-info.java index b48545c..ce9893b 100644 --- a/src/main/java/com/dingerframework/multi/package-info.java +++ b/src/main/java/com/github/jaemon/dinger/multi/package-info.java @@ -20,4 +20,4 @@ * @author Jaemon * @since 4.0 */ -package com.dingerframework.multi; \ No newline at end of file +package com.github.jaemon.dinger.multi; \ No newline at end of file diff --git a/src/main/java/com/dingerframework/sign/DingTalkSignAlgorithm.java b/src/main/java/com/github/jaemon/dinger/sign/DingTalkSignAlgorithm.java similarity index 87% rename from src/main/java/com/dingerframework/sign/DingTalkSignAlgorithm.java rename to src/main/java/com/github/jaemon/dinger/sign/DingTalkSignAlgorithm.java index c02e488..cea80f6 100644 --- a/src/main/java/com/dingerframework/sign/DingTalkSignAlgorithm.java +++ b/src/main/java/com/github/jaemon/dinger/sign/DingTalkSignAlgorithm.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.sign; +package com.github.jaemon.dinger.sign; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.entity.SignResult; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.entity.SignResult; /** * 默认签名算法 {@link DingerType#DINGTALK} diff --git a/src/main/java/com/dingerframework/sign/DingerSignAlgorithm.java b/src/main/java/com/github/jaemon/dinger/sign/DingerSignAlgorithm.java similarity index 95% rename from src/main/java/com/dingerframework/sign/DingerSignAlgorithm.java rename to src/main/java/com/github/jaemon/dinger/sign/DingerSignAlgorithm.java index cecfbe3..5117b0c 100644 --- a/src/main/java/com/dingerframework/sign/DingerSignAlgorithm.java +++ b/src/main/java/com/github/jaemon/dinger/sign/DingerSignAlgorithm.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.sign; +package com.github.jaemon.dinger.sign; -import com.dingerframework.entity.SignBase; +import com.github.jaemon.dinger.entity.SignBase; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; diff --git a/src/main/java/com/dingerframework/support/CustomMessage.java b/src/main/java/com/github/jaemon/dinger/support/CustomMessage.java similarity index 92% rename from src/main/java/com/dingerframework/support/CustomMessage.java rename to src/main/java/com/github/jaemon/dinger/support/CustomMessage.java index 02f7569..e7972d0 100644 --- a/src/main/java/com/dingerframework/support/CustomMessage.java +++ b/src/main/java/com/github/jaemon/dinger/support/CustomMessage.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; -import com.dingerframework.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; import java.util.List; diff --git a/src/main/java/com/dingerframework/support/DefaultApplicationEventNotification.java b/src/main/java/com/github/jaemon/dinger/support/DefaultApplicationEventNotification.java similarity index 95% rename from src/main/java/com/dingerframework/support/DefaultApplicationEventNotification.java rename to src/main/java/com/github/jaemon/dinger/support/DefaultApplicationEventNotification.java index f5b6111..39317d1 100644 --- a/src/main/java/com/dingerframework/support/DefaultApplicationEventNotification.java +++ b/src/main/java/com/github/jaemon/dinger/support/DefaultApplicationEventNotification.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; -import com.dingerframework.listeners.ApplicationEventTimeTable; +import com.github.jaemon.dinger.listeners.ApplicationEventTimeTable; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.ContextClosedEvent; diff --git a/src/main/java/com/dingerframework/support/DefaultDingerExceptionCallback.java b/src/main/java/com/github/jaemon/dinger/support/DefaultDingerExceptionCallback.java similarity index 88% rename from src/main/java/com/dingerframework/support/DefaultDingerExceptionCallback.java rename to src/main/java/com/github/jaemon/dinger/support/DefaultDingerExceptionCallback.java index 70d2988..48594f3 100644 --- a/src/main/java/com/dingerframework/support/DefaultDingerExceptionCallback.java +++ b/src/main/java/com/github/jaemon/dinger/support/DefaultDingerExceptionCallback.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; -import com.dingerframework.entity.DingerCallback; -import com.dingerframework.exception.DingerException; +import com.github.jaemon.dinger.entity.DingerCallback; +import com.github.jaemon.dinger.exception.DingerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/dingerframework/support/DefaultDingerIdGenerator.java b/src/main/java/com/github/jaemon/dinger/support/DefaultDingerIdGenerator.java similarity index 91% rename from src/main/java/com/dingerframework/support/DefaultDingerIdGenerator.java rename to src/main/java/com/github/jaemon/dinger/support/DefaultDingerIdGenerator.java index a1ee226..3ed64d6 100644 --- a/src/main/java/com/dingerframework/support/DefaultDingerIdGenerator.java +++ b/src/main/java/com/github/jaemon/dinger/support/DefaultDingerIdGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; -import com.dingerframework.constant.DingerConstant; +import com.github.jaemon.dinger.constant.DingerConstant; import java.util.UUID; diff --git a/src/main/java/com/dingerframework/support/DefaultDkCallable.java b/src/main/java/com/github/jaemon/dinger/support/DefaultDkCallable.java similarity index 96% rename from src/main/java/com/dingerframework/support/DefaultDkCallable.java rename to src/main/java/com/github/jaemon/dinger/support/DefaultDkCallable.java index a0c8e4f..12eb8a2 100644 --- a/src/main/java/com/dingerframework/support/DefaultDkCallable.java +++ b/src/main/java/com/github/jaemon/dinger/support/DefaultDkCallable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; import org.slf4j.Logger; diff --git a/src/main/java/com/dingerframework/support/DingerAsyncCallback.java b/src/main/java/com/github/jaemon/dinger/support/DingerAsyncCallback.java similarity index 95% rename from src/main/java/com/dingerframework/support/DingerAsyncCallback.java rename to src/main/java/com/github/jaemon/dinger/support/DingerAsyncCallback.java index 6bc5b22..73c5bd2 100644 --- a/src/main/java/com/dingerframework/support/DingerAsyncCallback.java +++ b/src/main/java/com/github/jaemon/dinger/support/DingerAsyncCallback.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; /** * 异步执行回调接口 diff --git a/src/main/java/com/dingerframework/support/DingerExceptionCallback.java b/src/main/java/com/github/jaemon/dinger/support/DingerExceptionCallback.java similarity index 90% rename from src/main/java/com/dingerframework/support/DingerExceptionCallback.java rename to src/main/java/com/github/jaemon/dinger/support/DingerExceptionCallback.java index deb2b1e..606af90 100644 --- a/src/main/java/com/dingerframework/support/DingerExceptionCallback.java +++ b/src/main/java/com/github/jaemon/dinger/support/DingerExceptionCallback.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; -import com.dingerframework.entity.DingerCallback; +import com.github.jaemon.dinger.entity.DingerCallback; /** * 发送异常回调接口 diff --git a/src/main/java/com/dingerframework/support/DingerIdGenerator.java b/src/main/java/com/github/jaemon/dinger/support/DingerIdGenerator.java similarity index 95% rename from src/main/java/com/dingerframework/support/DingerIdGenerator.java rename to src/main/java/com/github/jaemon/dinger/support/DingerIdGenerator.java index 386d04e..b7ab728 100644 --- a/src/main/java/com/dingerframework/support/DingerIdGenerator.java +++ b/src/main/java/com/github/jaemon/dinger/support/DingerIdGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; /** * dkid 生成接口 diff --git a/src/main/java/com/dingerframework/support/MarkDownMessage.java b/src/main/java/com/github/jaemon/dinger/support/MarkDownMessage.java similarity index 97% rename from src/main/java/com/dingerframework/support/MarkDownMessage.java rename to src/main/java/com/github/jaemon/dinger/support/MarkDownMessage.java index 016296b..76d3815 100644 --- a/src/main/java/com/dingerframework/support/MarkDownMessage.java +++ b/src/main/java/com/github/jaemon/dinger/support/MarkDownMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; import java.text.MessageFormat; import java.util.List; diff --git a/src/main/java/com/dingerframework/support/MonitorEventNotification.java b/src/main/java/com/github/jaemon/dinger/support/MonitorEventNotification.java similarity index 95% rename from src/main/java/com/dingerframework/support/MonitorEventNotification.java rename to src/main/java/com/github/jaemon/dinger/support/MonitorEventNotification.java index 5932096..e1db62b 100644 --- a/src/main/java/com/dingerframework/support/MonitorEventNotification.java +++ b/src/main/java/com/github/jaemon/dinger/support/MonitorEventNotification.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.dingtalk.entity.DingText; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.dingtalk.entity.DingText; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.event.ContextClosedEvent; diff --git a/src/main/java/com/dingerframework/support/TextMessage.java b/src/main/java/com/github/jaemon/dinger/support/TextMessage.java similarity index 96% rename from src/main/java/com/dingerframework/support/TextMessage.java rename to src/main/java/com/github/jaemon/dinger/support/TextMessage.java index 32cc332..8fe6c31 100644 --- a/src/main/java/com/dingerframework/support/TextMessage.java +++ b/src/main/java/com/github/jaemon/dinger/support/TextMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support; +package com.github.jaemon.dinger.support; import java.text.MessageFormat; import java.util.List; diff --git a/src/main/java/com/dingerframework/support/client/AbstractDingerHttpClient.java b/src/main/java/com/github/jaemon/dinger/support/client/AbstractDingerHttpClient.java similarity index 94% rename from src/main/java/com/dingerframework/support/client/AbstractDingerHttpClient.java rename to src/main/java/com/github/jaemon/dinger/support/client/AbstractDingerHttpClient.java index 81ec1cb..51404f8 100644 --- a/src/main/java/com/dingerframework/support/client/AbstractDingerHttpClient.java +++ b/src/main/java/com/github/jaemon/dinger/support/client/AbstractDingerHttpClient.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support.client; +package com.github.jaemon.dinger.support.client; -import com.dingerframework.exception.SendMsgException; +import com.github.jaemon.dinger.exception.SendMsgException; import java.util.Map; diff --git a/src/main/java/com/dingerframework/support/client/DingerHttpClient.java b/src/main/java/com/github/jaemon/dinger/support/client/DingerHttpClient.java similarity index 97% rename from src/main/java/com/dingerframework/support/client/DingerHttpClient.java rename to src/main/java/com/github/jaemon/dinger/support/client/DingerHttpClient.java index a71ec91..e53d4d0 100644 --- a/src/main/java/com/dingerframework/support/client/DingerHttpClient.java +++ b/src/main/java/com/github/jaemon/dinger/support/client/DingerHttpClient.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support.client; +package com.github.jaemon.dinger.support.client; -import com.dingerframework.exception.SendMsgException; +import com.github.jaemon.dinger.exception.SendMsgException; import java.util.Map; diff --git a/src/main/java/com/dingerframework/support/client/DingerHttpTemplate.java b/src/main/java/com/github/jaemon/dinger/support/client/DingerHttpTemplate.java similarity index 90% rename from src/main/java/com/dingerframework/support/client/DingerHttpTemplate.java rename to src/main/java/com/github/jaemon/dinger/support/client/DingerHttpTemplate.java index 37b331e..df1047f 100644 --- a/src/main/java/com/dingerframework/support/client/DingerHttpTemplate.java +++ b/src/main/java/com/github/jaemon/dinger/support/client/DingerHttpTemplate.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support.client; +package com.github.jaemon.dinger.support.client; -import com.dingerframework.constant.DingerConstant; -import com.dingerframework.exception.SendMsgException; +import com.github.jaemon.dinger.constant.DingerConstant; +import com.github.jaemon.dinger.exception.SendMsgException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/dingerframework/support/client/MediaTypeEnum.java b/src/main/java/com/github/jaemon/dinger/support/client/MediaTypeEnum.java similarity index 97% rename from src/main/java/com/dingerframework/support/client/MediaTypeEnum.java rename to src/main/java/com/github/jaemon/dinger/support/client/MediaTypeEnum.java index e6ef3e9..911a24f 100644 --- a/src/main/java/com/dingerframework/support/client/MediaTypeEnum.java +++ b/src/main/java/com/github/jaemon/dinger/support/client/MediaTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.support.client; +package com.github.jaemon.dinger.support.client; /** * 内容类型枚举 diff --git a/src/main/java/com/dingerframework/utils/ConfigTools.java b/src/main/java/com/github/jaemon/dinger/utils/ConfigTools.java similarity index 97% rename from src/main/java/com/dingerframework/utils/ConfigTools.java rename to src/main/java/com/github/jaemon/dinger/utils/ConfigTools.java index ab7cf36..c93a3b2 100644 --- a/src/main/java/com/dingerframework/utils/ConfigTools.java +++ b/src/main/java/com/github/jaemon/dinger/utils/ConfigTools.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.utils; +package com.github.jaemon.dinger.utils; import javax.crypto.Cipher; import java.security.*; @@ -24,8 +24,8 @@ import java.security.spec.RSAPublicKeySpec; import java.security.spec.X509EncodedKeySpec; -import static com.dingerframework.utils.DingerUtils.base64ToByteArray; -import static com.dingerframework.utils.DingerUtils.byteArrayToBase64; +import static com.github.jaemon.dinger.utils.DingerUtils.base64ToByteArray; +import static com.github.jaemon.dinger.utils.DingerUtils.byteArrayToBase64; /** diff --git a/src/main/java/com/dingerframework/utils/DingerUtils.java b/src/main/java/com/github/jaemon/dinger/utils/DingerUtils.java similarity index 98% rename from src/main/java/com/dingerframework/utils/DingerUtils.java rename to src/main/java/com/github/jaemon/dinger/utils/DingerUtils.java index 2d2a766..e225cba 100644 --- a/src/main/java/com/dingerframework/utils/DingerUtils.java +++ b/src/main/java/com/github/jaemon/dinger/utils/DingerUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.utils; +package com.github.jaemon.dinger.utils; import java.io.Closeable; import java.util.Base64; diff --git a/src/main/java/com/dingerframework/utils/JVMRandom.java b/src/main/java/com/github/jaemon/dinger/utils/JVMRandom.java similarity index 99% rename from src/main/java/com/dingerframework/utils/JVMRandom.java rename to src/main/java/com/github/jaemon/dinger/utils/JVMRandom.java index cef6a7f..c6abdbc 100644 --- a/src/main/java/com/dingerframework/utils/JVMRandom.java +++ b/src/main/java/com/github/jaemon/dinger/utils/JVMRandom.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.utils; +package com.github.jaemon.dinger.utils; import java.util.Random; diff --git a/src/main/java/com/dingerframework/utils/PackageUtils.java b/src/main/java/com/github/jaemon/dinger/utils/PackageUtils.java similarity index 99% rename from src/main/java/com/dingerframework/utils/PackageUtils.java rename to src/main/java/com/github/jaemon/dinger/utils/PackageUtils.java index 7c97ee8..763e82f 100644 --- a/src/main/java/com/dingerframework/utils/PackageUtils.java +++ b/src/main/java/com/github/jaemon/dinger/utils/PackageUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.utils; +package com.github.jaemon.dinger.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/dingerframework/utils/RandomUtils.java b/src/main/java/com/github/jaemon/dinger/utils/RandomUtils.java similarity index 99% rename from src/main/java/com/dingerframework/utils/RandomUtils.java rename to src/main/java/com/github/jaemon/dinger/utils/RandomUtils.java index 750f8c6..627e96d 100644 --- a/src/main/java/com/dingerframework/utils/RandomUtils.java +++ b/src/main/java/com/github/jaemon/dinger/utils/RandomUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.utils; +package com.github.jaemon.dinger.utils; import java.util.Random; diff --git a/src/main/java/com/dingerframework/utils/XmlUtils.java b/src/main/java/com/github/jaemon/dinger/utils/XmlUtils.java similarity index 94% rename from src/main/java/com/dingerframework/utils/XmlUtils.java rename to src/main/java/com/github/jaemon/dinger/utils/XmlUtils.java index df5136e..1c9f8d0 100644 --- a/src/main/java/com/dingerframework/utils/XmlUtils.java +++ b/src/main/java/com/github/jaemon/dinger/utils/XmlUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.utils; +package com.github.jaemon.dinger.utils; import javax.xml.bind.JAXB; import java.io.StringReader; @@ -21,7 +21,7 @@ import java.io.Writer; import java.util.List; -import static com.dingerframework.constant.DingerConstant.NEW_LINE; +import static com.github.jaemon.dinger.constant.DingerConstant.NEW_LINE; /** * XML字符串JavaBean对象互转工具类 diff --git a/src/main/java/com/dingerframework/wetalk/WeTalkDefinitionGenerator.java b/src/main/java/com/github/jaemon/dinger/wetalk/WeTalkDefinitionGenerator.java similarity index 80% rename from src/main/java/com/dingerframework/wetalk/WeTalkDefinitionGenerator.java rename to src/main/java/com/github/jaemon/dinger/wetalk/WeTalkDefinitionGenerator.java index bcea712..f4622c8 100644 --- a/src/main/java/com/dingerframework/wetalk/WeTalkDefinitionGenerator.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/WeTalkDefinitionGenerator.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.wetalk; +package com.github.jaemon.dinger.wetalk; -import com.dingerframework.core.DingerDefinition; -import com.dingerframework.core.DingerDefinitionGenerator; -import com.dingerframework.core.DingerDefinitionGeneratorContext; -import com.dingerframework.core.DingerDefinitionHandler; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.core.annatations.DingerMarkdown; -import com.dingerframework.core.annatations.DingerText; -import com.dingerframework.core.entity.enums.DingerDefinitionType; -import com.dingerframework.core.entity.xml.MessageTag; +import com.github.jaemon.dinger.core.DingerDefinition; +import com.github.jaemon.dinger.core.DingerDefinitionGenerator; +import com.github.jaemon.dinger.core.DingerDefinitionGeneratorContext; +import com.github.jaemon.dinger.core.DingerDefinitionHandler; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.annatations.DingerMarkdown; +import com.github.jaemon.dinger.core.annatations.DingerText; +import com.github.jaemon.dinger.core.entity.enums.DingerDefinitionType; +import com.github.jaemon.dinger.core.entity.xml.MessageTag; /** * 企业微信消息体定义生成类 diff --git a/src/main/java/com/dingerframework/wetalk/entity/WeImage.java b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeImage.java similarity index 93% rename from src/main/java/com/dingerframework/wetalk/entity/WeImage.java rename to src/main/java/com/github/jaemon/dinger/wetalk/entity/WeImage.java index 36bfa2f..cde45a5 100644 --- a/src/main/java/com/dingerframework/wetalk/entity/WeImage.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeImage.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.wetalk.entity; +package com.github.jaemon.dinger.wetalk.entity; -import com.dingerframework.wetalk.entity.enums.WeTalkMsgType; +import com.github.jaemon.dinger.wetalk.entity.enums.WeTalkMsgType; import java.io.Serializable; diff --git a/src/main/java/com/dingerframework/wetalk/entity/WeMarkdown.java b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeMarkdown.java similarity index 93% rename from src/main/java/com/dingerframework/wetalk/entity/WeMarkdown.java rename to src/main/java/com/github/jaemon/dinger/wetalk/entity/WeMarkdown.java index 91036c5..1a973e8 100644 --- a/src/main/java/com/dingerframework/wetalk/entity/WeMarkdown.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeMarkdown.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.wetalk.entity; +package com.github.jaemon.dinger.wetalk.entity; -import com.dingerframework.wetalk.entity.enums.WeTalkMsgType; +import com.github.jaemon.dinger.wetalk.entity.enums.WeTalkMsgType; import java.io.Serializable; import java.util.Map; diff --git a/src/main/java/com/dingerframework/wetalk/entity/WeNews.java b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeNews.java similarity index 95% rename from src/main/java/com/dingerframework/wetalk/entity/WeNews.java rename to src/main/java/com/github/jaemon/dinger/wetalk/entity/WeNews.java index d8996a9..5eeda6e 100644 --- a/src/main/java/com/dingerframework/wetalk/entity/WeNews.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeNews.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.wetalk.entity; +package com.github.jaemon.dinger.wetalk.entity; -import com.dingerframework.wetalk.entity.enums.WeTalkMsgType; +import com.github.jaemon.dinger.wetalk.entity.enums.WeTalkMsgType; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/dingerframework/wetalk/entity/WeTalkMessage.java b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeTalkMessage.java similarity index 83% rename from src/main/java/com/dingerframework/wetalk/entity/WeTalkMessage.java rename to src/main/java/com/github/jaemon/dinger/wetalk/entity/WeTalkMessage.java index 5017c19..af3dfee 100644 --- a/src/main/java/com/dingerframework/wetalk/entity/WeTalkMessage.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeTalkMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.wetalk.entity; +package com.github.jaemon.dinger.wetalk.entity; -import com.dingerframework.core.entity.MsgType; -import com.dingerframework.core.entity.enums.DingerType; +import com.github.jaemon.dinger.core.entity.MsgType; +import com.github.jaemon.dinger.core.entity.enums.DingerType; /** * WeTalk请求体 diff --git a/src/main/java/com/dingerframework/wetalk/entity/WeText.java b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeText.java similarity index 96% rename from src/main/java/com/dingerframework/wetalk/entity/WeText.java rename to src/main/java/com/github/jaemon/dinger/wetalk/entity/WeText.java index 0ccb734..612adad 100644 --- a/src/main/java/com/dingerframework/wetalk/entity/WeText.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/entity/WeText.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.wetalk.entity; +package com.github.jaemon.dinger.wetalk.entity; -import com.dingerframework.wetalk.entity.enums.WeTalkMsgType; +import com.github.jaemon.dinger.wetalk.entity.enums.WeTalkMsgType; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/dingerframework/wetalk/entity/enums/WeTalkMsgType.java b/src/main/java/com/github/jaemon/dinger/wetalk/entity/enums/WeTalkMsgType.java similarity index 95% rename from src/main/java/com/dingerframework/wetalk/entity/enums/WeTalkMsgType.java rename to src/main/java/com/github/jaemon/dinger/wetalk/entity/enums/WeTalkMsgType.java index 87c777e..a0cce50 100644 --- a/src/main/java/com/dingerframework/wetalk/entity/enums/WeTalkMsgType.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/entity/enums/WeTalkMsgType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.wetalk.entity.enums; +package com.github.jaemon.dinger.wetalk.entity.enums; /** * WeTalk支持的消息类型 diff --git a/src/main/java/com/dingerframework/wetalk/package-info.java b/src/main/java/com/github/jaemon/dinger/wetalk/package-info.java similarity index 94% rename from src/main/java/com/dingerframework/wetalk/package-info.java rename to src/main/java/com/github/jaemon/dinger/wetalk/package-info.java index 90f3a5e..214e7fd 100644 --- a/src/main/java/com/dingerframework/wetalk/package-info.java +++ b/src/main/java/com/github/jaemon/dinger/wetalk/package-info.java @@ -20,4 +20,4 @@ * @author Jaemon * @since 4.0 */ -package com.dingerframework.wetalk; \ No newline at end of file +package com.github.jaemon.dinger.wetalk; \ No newline at end of file diff --git a/src/main/resources/META-INF/spring.factories b/src/main/resources/META-INF/spring.factories index 51c7dfb..6cc3128 100644 --- a/src/main/resources/META-INF/spring.factories +++ b/src/main/resources/META-INF/spring.factories @@ -1,14 +1,14 @@ # Auto Configuration org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.dingerframework.config.BeanConfiguration,\ -com.dingerframework.config.DingerConfiguration,\ -com.dingerframework.config.DingerHttpClientConfig,\ -com.dingerframework.config.DingerThreadPoolConfig +com.github.jaemon.dinger.config.BeanConfiguration,\ +com.github.jaemon.dinger.config.DingerConfiguration,\ +com.github.jaemon.dinger.config.DingerHttpClientConfig,\ +com.github.jaemon.dinger.config.DingerThreadPoolConfig # Application Listeners org.springframework.context.ApplicationListener=\ -com.dingerframework.listeners.StartEventListener,\ -com.dingerframework.listeners.SuccessEventListener,\ -com.dingerframework.listeners.FailedEventListener,\ -com.dingerframework.listeners.ExitEventListener,\ -com.dingerframework.listeners.DingerXmlPreparedEvent \ No newline at end of file +com.github.jaemon.dinger.listeners.StartEventListener,\ +com.github.jaemon.dinger.listeners.SuccessEventListener,\ +com.github.jaemon.dinger.listeners.FailedEventListener,\ +com.github.jaemon.dinger.listeners.ExitEventListener,\ +com.github.jaemon.dinger.listeners.DingerXmlPreparedEvent \ No newline at end of file diff --git a/src/test/java/com/dingerframework/core/OrderDinger.java b/src/test/java/com/github/jaemon/dinger/core/OrderDinger.java similarity index 92% rename from src/test/java/com/dingerframework/core/OrderDinger.java rename to src/test/java/com/github/jaemon/dinger/core/OrderDinger.java index a4f7257..e5f673d 100644 --- a/src/test/java/com/dingerframework/core/OrderDinger.java +++ b/src/test/java/com/github/jaemon/dinger/core/OrderDinger.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; import com.dingerframework.core.annatations.*; -import com.dingerframework.entity.DingerResult; +import com.github.jaemon.dinger.core.annatations.*; +import com.github.jaemon.dinger.entity.DingerResult; import java.math.BigDecimal; diff --git a/src/test/java/com/dingerframework/core/UserDinger.java b/src/test/java/com/github/jaemon/dinger/core/UserDinger.java similarity index 78% rename from src/test/java/com/dingerframework/core/UserDinger.java rename to src/test/java/com/github/jaemon/dinger/core/UserDinger.java index 1baf6db..56197ab 100644 --- a/src/test/java/com/dingerframework/core/UserDinger.java +++ b/src/test/java/com/github/jaemon/dinger/core/UserDinger.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.core; +package com.github.jaemon.dinger.core; -import com.dingerframework.core.annatations.Parameter; -import com.dingerframework.multi.annotations.MultiHandler; -import com.dingerframework.core.annatations.DingerMarkdown; -import com.dingerframework.core.annatations.DingerText; -import com.dingerframework.entity.DingerResult; -import com.dingerframework.multi.handler.UserDingerConfigHandler; +import com.github.jaemon.dinger.core.annatations.Parameter; +import com.github.jaemon.dinger.multi.annotations.MultiHandler; +import com.github.jaemon.dinger.core.annatations.DingerMarkdown; +import com.github.jaemon.dinger.core.annatations.DingerText; +import com.github.jaemon.dinger.entity.DingerResult; +import com.github.jaemon.dinger.multi.handler.UserDingerConfigHandler; /** * UserDinger diff --git a/src/test/java/com/dingerframework/httpclient/HttpClientTemplate.java b/src/test/java/com/github/jaemon/dinger/httpclient/HttpClientTemplate.java similarity index 94% rename from src/test/java/com/dingerframework/httpclient/HttpClientTemplate.java rename to src/test/java/com/github/jaemon/dinger/httpclient/HttpClientTemplate.java index f3a75ec..81e8f45 100644 --- a/src/test/java/com/dingerframework/httpclient/HttpClientTemplate.java +++ b/src/test/java/com/github/jaemon/dinger/httpclient/HttpClientTemplate.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.httpclient; +package com.github.jaemon.dinger.httpclient; -import com.dingerframework.wetalk.entity.WeText; +import com.github.jaemon.dinger.wetalk.entity.WeText; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; diff --git a/src/test/java/com/dingerframework/multi/DingerHandlerTest.java b/src/test/java/com/github/jaemon/dinger/multi/DingerHandlerTest.java similarity index 88% rename from src/test/java/com/dingerframework/multi/DingerHandlerTest.java rename to src/test/java/com/github/jaemon/dinger/multi/DingerHandlerTest.java index 6e01f52..788c364 100644 --- a/src/test/java/com/dingerframework/multi/DingerHandlerTest.java +++ b/src/test/java/com/github/jaemon/dinger/multi/DingerHandlerTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; +package com.github.jaemon.dinger.multi; -import com.dingerframework.multi.algorithm.AlgorithmHandler; -import com.dingerframework.multi.algorithm.DingerHandler; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.multi.algorithm.DingerHandler; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.core.DingerConfig; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ import java.util.concurrent.*; import java.util.stream.Collectors; -import static com.dingerframework.utils.DingerUtils.uuid; +import static com.github.jaemon.dinger.utils.DingerUtils.uuid; /** * Dinger钉钉机器人算法-测试用例 {@link DingerHandler} diff --git a/src/test/java/com/dingerframework/multi/RoundRobinHandlerTest.java b/src/test/java/com/github/jaemon/dinger/multi/RoundRobinHandlerTest.java similarity index 89% rename from src/test/java/com/dingerframework/multi/RoundRobinHandlerTest.java rename to src/test/java/com/github/jaemon/dinger/multi/RoundRobinHandlerTest.java index dcb58d5..d30311e 100644 --- a/src/test/java/com/dingerframework/multi/RoundRobinHandlerTest.java +++ b/src/test/java/com/github/jaemon/dinger/multi/RoundRobinHandlerTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi; +package com.github.jaemon.dinger.multi; -import com.dingerframework.multi.algorithm.AlgorithmHandler; -import com.dingerframework.multi.algorithm.RoundRobinHandler; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.multi.algorithm.RoundRobinHandler; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.core.DingerConfig; import java.util.ArrayList; import java.util.List; @@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.dingerframework.utils.DingerUtils.uuid; +import static com.github.jaemon.dinger.utils.DingerUtils.uuid; /** * 轮询算法-测试用例 {@link RoundRobinHandler} diff --git a/src/test/java/com/dingerframework/multi/handler/UserDingerConfigHandler.java b/src/test/java/com/github/jaemon/dinger/multi/handler/UserDingerConfigHandler.java similarity index 80% rename from src/test/java/com/dingerframework/multi/handler/UserDingerConfigHandler.java rename to src/test/java/com/github/jaemon/dinger/multi/handler/UserDingerConfigHandler.java index cbf11b9..93ed6e7 100644 --- a/src/test/java/com/dingerframework/multi/handler/UserDingerConfigHandler.java +++ b/src/test/java/com/github/jaemon/dinger/multi/handler/UserDingerConfigHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.dingerframework.multi.handler; +package com.github.jaemon.dinger.multi.handler; -import com.dingerframework.core.entity.enums.DingerType; -import com.dingerframework.multi.DingerConfigHandler; -import com.dingerframework.multi.algorithm.AlgorithmHandler; -import com.dingerframework.multi.algorithm.DingerHandler; -import com.dingerframework.core.DingerConfig; +import com.github.jaemon.dinger.core.entity.enums.DingerType; +import com.github.jaemon.dinger.multi.DingerConfigHandler; +import com.github.jaemon.dinger.multi.algorithm.AlgorithmHandler; +import com.github.jaemon.dinger.multi.algorithm.DingerHandler; +import com.github.jaemon.dinger.core.DingerConfig; import java.util.ArrayList; import java.util.List; diff --git a/src/test/resources/OrderDinger.xml b/src/test/resources/OrderDinger.xml index 1de8297..28f9dc6 100644 --- a/src/test/resources/OrderDinger.xml +++ b/src/test/resources/OrderDinger.xml @@ -6,7 +6,7 @@ spring.dinger.dinger-locations: classpath*:dinger/*.xml --> - +