diff --git a/README.md b/README.md index 58a7be57..4ae00597 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# bubble fireworks 🎉🎉🎉 +# bubble 🎉🎉🎉 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/63f51f8ee55f42bd8284c1c04e2b6f7d)](https://app.codacy.com/manual/fxbin/bubble-fireworks?utm_source=github.com&utm_medium=referral&utm_content=fxbin/bubble-fireworks&utm_campaign=Badge_Grade_Settings) [![Spring Boot](https://img.shields.io/badge/SpringBoot-2.7.14-brightgreen.svg)](https://github.com/spring-projects/spring-boot) @@ -11,7 +11,7 @@ ## 项目简介 -`bubble-fireworks` 旨在为项目快速开发提供一系列的基础能力，方便使用者根据项目需求快速进行功能拓展。已将所有 JAR 包都推送至中央仓库，也会为每个版本的升级改动列出详细的更新日志 +`bubble` 旨在为项目快速开发提供一系列的基础能力，方便使用者根据项目需求快速进行功能拓展。已将所有 JAR 包都推送至中央仓库，也会为每个版本的升级改动列出详细的更新日志 ## 更新记录详见 [项目更新记录](CHANGELOG.md) diff --git a/bubble-fireworks-project/bubble-fireworks-core/pom.xml b/bubble-core/pom.xml similarity index 85% rename from bubble-fireworks-project/bubble-fireworks-core/pom.xml rename to bubble-core/pom.xml index a4689dcf..e302412f 100644 --- a/bubble-fireworks-project/bubble-fireworks-core/pom.xml +++ b/bubble-core/pom.xml @@ -3,14 +3,14 @@ 4.0.0 cn.fxbin.bubble - bubble-fireworks-parent - 2022.0.2.BUILD-SNAPSHOT - ../bubble-fireworks-parent/pom.xml + bubble-parent + 2.0.0.BUILD-SNAPSHOT + ../bubble-parent/pom.xml - bubble-fireworks-core - Bubble Fireworks Core - Bubble Fireworks Core: core util + bubble-core + Bubble Core + Bubble Core: core util diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/CharPool.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/CharPool.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/CharPool.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/CharPool.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/NumPool.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/NumPool.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/NumPool.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/NumPool.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/StringPool.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/StringPool.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/StringPool.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/StringPool.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/YesOrNo.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/YesOrNo.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/YesOrNo.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/YesOrNo.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/package-info.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/package-info.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/package-info.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/constant/package-info.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnum.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnum.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnum.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnum.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnumHelper.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnumHelper.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnumHelper.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/enumeration/IEnumHelper.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/InvalidEnumValueException.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/InvalidEnumValueException.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/InvalidEnumValueException.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/InvalidEnumValueException.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/ServiceException.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/ServiceException.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/ServiceException.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/ServiceException.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/UtilException.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/UtilException.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/UtilException.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/exception/UtilException.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/LoggerMessageFormat.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/LoggerMessageFormat.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/LoggerMessageFormat.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/LoggerMessageFormat.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/package-info.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/package-info.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/package-info.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/logging/package-info.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageRequest.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageRequest.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageRequest.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageRequest.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageResult.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageResult.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageResult.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/PageResult.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/Result.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/Result.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/Result.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/Result.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/ResultCode.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/ResultCode.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/ResultCode.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/model/ResultCode.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JacksonHolder.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JacksonHolder.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JacksonHolder.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JacksonHolder.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JavaTimeModule.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JavaTimeModule.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JavaTimeModule.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/module/JavaTimeModule.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/AnnotationUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/AnnotationUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/AnnotationUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/AnnotationUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ArrayUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ArrayUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ArrayUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ArrayUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/BeanUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/BeanUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/BeanUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/BeanUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharsetUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharsetUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharsetUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CharsetUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ClassUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ClassUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ClassUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ClassUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CollectionUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CollectionUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CollectionUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/CollectionUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ExceptionUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ExceptionUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ExceptionUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ExceptionUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/FileUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/FileUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/FileUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/FileUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/IoUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/IoUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/IoUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/IoUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/JsonUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/JsonUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/JsonUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/JsonUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/KeyUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/KeyUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/KeyUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/KeyUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/LambdaUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/LambdaUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/LambdaUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/LambdaUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MapUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MapUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MapUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MapUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MathUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MathUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MathUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MathUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MimeTypeUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MimeTypeUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MimeTypeUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/MimeTypeUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NetUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NetUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NetUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NetUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NumberUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NumberUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NumberUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/NumberUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ObjectUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ObjectUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ObjectUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ObjectUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ResourceUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ResourceUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ResourceUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ResourceUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RsaUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RsaUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RsaUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RsaUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RunTimeUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RunTimeUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RunTimeUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/RunTimeUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/SpringContextProvider.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/SpringContextProvider.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/SpringContextProvider.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/SpringContextProvider.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/StringUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/StringUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/StringUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/StringUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadLocalUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadLocalUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadLocalUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadLocalUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ThreadUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/UrlUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/UrlUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/UrlUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/UrlUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/WebUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/WebUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/WebUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/WebUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/package-info.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/package-info.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/package-info.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/package-info.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/AppUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/AppUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/AppUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/AppUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/SerialFunction.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/SerialFunction.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/SerialFunction.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/SerialFunction.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/Version.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/Version.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/Version.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/support/Version.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/DateUtils.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/DateUtils.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/DateUtils.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/DateUtils.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/TimePool.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/TimePool.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/TimePool.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/time/TimePool.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlMap.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlMap.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlMap.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlMap.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlObject.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlObject.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlObject.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlObject.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlThreadPoolTaskExecutor.java b/bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlThreadPoolTaskExecutor.java similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlThreadPoolTaskExecutor.java rename to bubble-core/src/main/java/cn/fxbin/bubble/fireworks/core/util/ttl/TtlThreadPoolTaskExecutor.java diff --git a/bubble-fireworks-project/bubble-fireworks-core/src/main/resources/META-INF/spring.factories b/bubble-core/src/main/resources/META-INF/spring.factories similarity index 100% rename from bubble-fireworks-project/bubble-fireworks-core/src/main/resources/META-INF/spring.factories rename to bubble-core/src/main/resources/META-INF/spring.factories diff --git a/bubble-fireworks-project/bubble-fireworks-dependencies/pom.xml b/bubble-dependencies/pom.xml similarity index 86% rename from bubble-fireworks-project/bubble-fireworks-dependencies/pom.xml rename to bubble-dependencies/pom.xml index d02d950e..7aa3eb9e 100644 --- a/bubble-fireworks-project/bubble-fireworks-dependencies/pom.xml +++ b/bubble-dependencies/pom.xml @@ -3,15 +3,15 @@ 4.0.0 cn.fxbin.bubble - bubble-fireworks-build - 2022.0.2.BUILD-SNAPSHOT - ../../pom.xml + bubble-build + 2.0.0.BUILD-SNAPSHOT + ../pom.xml - bubble-fireworks-dependencies + bubble-dependencies pom - Bubble Fireworks Dependencies - Bubble Fireworks Project Dependencies: manager jar version dependency, Use as a BOM + Bubble Dependencies + Bubble Project Dependencies: manager jar version dependency, Use as a BOM UTF-8 @@ -55,93 +55,93 @@ cn.fxbin.bubble - bubble-fireworks-core - 2022.0.2.BUILD-SNAPSHOT + bubble-core + 2.0.0.BUILD-SNAPSHOT - + cn.fxbin.bubble - bubble-fireworks-starter - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-web - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-web + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-test - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-test + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-logging - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-logging + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-openfeign - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-openfeign + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-data-redis - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-data-redis + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-data-mybatis-plus - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-data-mybatis-plus + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-data-elasticsearch - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-data-elasticsearch + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-plugin-lock - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-lock + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-plugin-excel - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-excel + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-plugin-token - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-token + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-plugin-xxl-job - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-xxl-job + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-plugin-dynamic-threadpool - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-dynamic-threadpool + 2.0.0.BUILD-SNAPSHOT cn.fxbin.bubble - bubble-fireworks-starter-i18n - 2022.0.2.BUILD-SNAPSHOT + bubble-spring-boot-starter-i18n + 2.0.0.BUILD-SNAPSHOT diff --git a/bubble-fireworks-project/bubble-fireworks-starters/pom.xml b/bubble-fireworks-project/bubble-fireworks-starters/pom.xml deleted file mode 100644 index 79b57d62..00000000 --- a/bubble-fireworks-project/bubble-fireworks-starters/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-parent - 2022.0.2.BUILD-SNAPSHOT - ../bubble-fireworks-parent/pom.xml - - - bubble-fireworks-starters - pom - Bubble Fireworks Starters - Bubble Fireworks Starters - - - bubble-fireworks-starter - - - bubble-fireworks-starter-web - bubble-fireworks-starter-test - - bubble-fireworks-starter-openfeign - - bubble-fireworks-starter-data-redis - bubble-fireworks-starter-data-mybatis-plus - bubble-fireworks-starter-data-elasticsearch - - bubble-fireworks-starter-plugin-lock - bubble-fireworks-starter-plugin-excel - bubble-fireworks-starter-plugin-token - bubble-fireworks-starter-logging - bubble-fireworks-starter-plugin-xxl-job - bubble-fireworks-starter-plugin-dynamic-threadpool - bubble-fireworks-starter-i18n - - - - \ No newline at end of file diff --git a/bubble-fireworks-project/pom.xml b/bubble-fireworks-project/pom.xml deleted file mode 100644 index 8b63331e..00000000 --- a/bubble-fireworks-project/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-build - 2022.0.2.BUILD-SNAPSHOT - - - bubble-fireworks-project - pom - Bubble Fireworks Project - Bubble Fireworks Project - - - ${basedir}/.. - - - - bubble-fireworks-dependencies - bubble-fireworks-parent - bubble-fireworks-core - bubble-fireworks-starters - - - \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/pom.xml b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/pom.xml deleted file mode 100644 index aee6e4c6..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-tests - 2022.0.2.BUILD-SNAPSHOT - - - bubble-fireworks-test-data-elasticsearch - Bubble Fireworks Data Elasticsearch Test - Bubble Fireworks Data Elasticsearch Test - - - - - cn.fxbin.bubble - bubble-fireworks-starter-web - - - - - cn.fxbin.bubble - bubble-fireworks-starter-data-elasticsearch - - - - - cn.fxbin.bubble - bubble-fireworks-starter-test - test - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - - - \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/SampleElasticsearchApplication.java b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/SampleElasticsearchApplication.java deleted file mode 100644 index ce2cc28c..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/SampleElasticsearchApplication.java +++ /dev/null @@ -1,55 +0,0 @@ -package test.data.elasticsearch; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import test.data.elasticsearch.constants.ElasticsearchConstant; -import test.data.elasticsearch.model.Person; -import test.data.elasticsearch.service.PersonService; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * test.data.elasticsearch.SampleElasticsearchApplication - * - * @author fxbin - * @version v1.0 - * @since 2020/5/6 11:07 - */ -@Slf4j -@SpringBootApplication -public class SampleElasticsearchApplication implements CommandLineRunner { - - public static void main(String[] args) { - SpringApplication.run(SampleElasticsearchApplication.class, "--debug").close(); - } - - - @Resource - private PersonService personService; - - @Override - public void run(String... args) throws Exception { - personService.deleteIndex(ElasticsearchConstant.INDEX_NAME); - personService.createIndex(ElasticsearchConstant.INDEX_NAME); - - List addList = new ArrayList<>(); - addList.add(Person.builder().age(11).birthday(new Date()).country("CN").id(1L).name("哈哈").remark("test1").build()); - addList.add(Person.builder().age(22).birthday(new Date()).country("US").id(2L).name("hiahia").remark("test2").build()); - addList.add(Person.builder().age(33).birthday(new Date()).country("ID").id(3L).name("呵呵").remark("test3").build()); - - personService.insert(ElasticsearchConstant.INDEX_NAME, addList); - - Person person = Person.builder().age(33).birthday(new Date()).country("ID_update").id(3L).name("呵呵update").remark("test3_update").build(); - List updateList = new ArrayList<>(); - updateList.add(person); - personService.update(ElasticsearchConstant.INDEX_NAME, updateList); - - List personList = personService.searchList(ElasticsearchConstant.INDEX_NAME); - log.info("person list data: {}", personList); - } -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/constants/ElasticsearchConstant.java b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/constants/ElasticsearchConstant.java deleted file mode 100644 index 93ee51af..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/constants/ElasticsearchConstant.java +++ /dev/null @@ -1,17 +0,0 @@ -package test.data.elasticsearch.constants; - -/** - * ElasticsearchContant - * - * @author fxbin - * @version v1.0 - * @since 2020/5/7 16:56 - */ -public interface ElasticsearchConstant { - - /** - * 索引名称 - */ - String INDEX_NAME = "person"; - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/model/Person.java b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/model/Person.java deleted file mode 100644 index 39e16ade..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/model/Person.java +++ /dev/null @@ -1,55 +0,0 @@ -package test.data.elasticsearch.model; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.io.Serializable; -import java.util.Date; - -/** - * Person - * - * @author fxbin - * @version v1.0 - * @since 2020/5/7 14:12 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class Person implements Serializable { - - private static final long serialVersionUID = -3029961872812120761L; - /** - * 主键 - */ - private Long id; - - /** - * 名字 - */ - private String name; - - /** - * 国家 - */ - private String country; - - /** - * 年龄 - */ - private Integer age; - - /** - * 生日 - */ - private Date birthday; - - /** - * 介绍 - */ - private String remark; - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/PersonService.java b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/PersonService.java deleted file mode 100644 index 998865c1..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/PersonService.java +++ /dev/null @@ -1,62 +0,0 @@ -package test.data.elasticsearch.service; - -import org.springframework.lang.Nullable; -import test.data.elasticsearch.model.Person; - -import java.util.List; - -/** - * PersonService - * - * @author fxbin - * @version v1.0 - * @since 2020/5/7 14:30 - */ -public interface PersonService { - - /** - * create Index - * - * @param index elasticsearch index name - */ - void createIndex(String index); - - /** - * delete Index - * - * @param index elasticsearch index name - */ - void deleteIndex(String index); - - /** - * insert document source - * - * @param index elasticsearch index name - * @param list data source - */ - void insert(String index, List list); - - /** - * update document source - * - * @param index elasticsearch index name - * @param list data source - */ - void update(String index, List list); - - /** - * delete document source - * - * @param person delete data source and allow null object - */ - void delete(String index, @Nullable Person person); - - /** - * search all doc records - * - * @param index elasticsearch index name - * @return person list - */ - List searchList(String index); - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/base/BaseElasticsearchService.java b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/base/BaseElasticsearchService.java deleted file mode 100644 index 2dc45c8b..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/base/BaseElasticsearchService.java +++ /dev/null @@ -1,165 +0,0 @@ -package test.data.elasticsearch.service.base; - -import cn.fxbin.bubble.fireworks.data.elasticsearch.autoconfigure.ElasticsearchProperties; -import cn.fxbin.bubble.fireworks.data.elasticsearch.exception.ElasticsearchException; -import cn.fxbin.bubble.fireworks.core.util.BeanUtils; -import lombok.extern.slf4j.Slf4j; -import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; -import org.elasticsearch.action.delete.DeleteRequest; -import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.action.search.SearchRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.client.HttpAsyncResponseConsumerFactory; -import org.elasticsearch.client.RequestOptions; -import org.elasticsearch.client.RestHighLevelClient; -import org.elasticsearch.client.indices.CreateIndexRequest; -import org.elasticsearch.client.indices.CreateIndexResponse; -import org.elasticsearch.common.settings.Settings; -import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.index.query.QueryBuilders; -import org.elasticsearch.search.builder.SearchSourceBuilder; - -import javax.annotation.Resource; -import java.io.IOException; - -/** - * BaseElasticsearchService - * - * @author fxbin - * @version v1.0 - * @since 2020/5/7 14:32 - */ -@Slf4j -public class BaseElasticsearchService { - - @Resource - protected RestHighLevelClient restHighLevelClient; - - @Resource - private ElasticsearchProperties elasticsearchProperties; - - protected static final RequestOptions COMMON_OPTIONS; - - static { - RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder(); - - // 默认缓冲限制为100MB，此处修改为30MB。 - builder.setHttpAsyncResponseConsumerFactory(new HttpAsyncResponseConsumerFactory.HeapBufferedResponseConsumerFactory(30 * 1024 * 1024)); - COMMON_OPTIONS = builder.build(); - } - - /** - * create elasticsearch index (asyc) - * - * @param index elasticsearch index - * @author fxbin - */ - protected void createIndexRequest(String index) { - try { - CreateIndexRequest request = new CreateIndexRequest(index); - // Settings for this index - request.settings(Settings.builder().put("index.number_of_shards", elasticsearchProperties.getIndex().getNumberOfShards()).put("index.number_of_replicas", elasticsearchProperties.getIndex().getNumberOfReplicas())); - - CreateIndexResponse createIndexResponse = restHighLevelClient.indices().create(request, COMMON_OPTIONS); - - log.info(" whether all of the nodes have acknowledged the request : {}", createIndexResponse.isAcknowledged()); - log.info(" Indicates whether the requisite number of shard copies were started for each shard in the index before timing out :{}", createIndexResponse.isShardsAcknowledged()); - } catch (IOException e) { - throw new ElasticsearchException("创建索引 {" + index + "} 失败"); - } - } - - /** - * delete elasticsearch index - * - * @param index elasticsearch index name - * @author fxbin - */ - protected void deleteIndexRequest(String index) { - DeleteIndexRequest deleteIndexRequest = buildDeleteIndexRequest(index); - try { - restHighLevelClient.indices().delete(deleteIndexRequest, COMMON_OPTIONS); - } catch (IOException e) { - throw new ElasticsearchException("删除索引 {" + index + "} 失败"); - } - } - - /** - * build DeleteIndexRequest - * - * @param index elasticsearch index name - * @author fxbin - */ - private static DeleteIndexRequest buildDeleteIndexRequest(String index) { - return new DeleteIndexRequest(index); - } - - /** - * build IndexRequest - * - * @param index elasticsearch index name - * @param id request object id - * @param object request object - * @return {@link org.elasticsearch.action.index.IndexRequest} - * @author fxbin - */ - protected static IndexRequest buildIndexRequest(String index, String id, Object object) { - return new IndexRequest(index).id(id).source(BeanUtils.object2Map(object), XContentType.JSON); - } - - /** - * exec updateRequest - * - * @param index elasticsearch index name - * @param id Document id - * @param object request object - * @author fxbin - */ - protected void updateRequest(String index, String id, Object object) { - try { - UpdateRequest updateRequest = new UpdateRequest(index, id).doc(BeanUtils.object2Map(object), XContentType.JSON); - restHighLevelClient.update(updateRequest, COMMON_OPTIONS); - } catch (IOException e) { - throw new ElasticsearchException("更新索引 {" + index + "} 数据 {" + object + "} 失败"); - } - } - - /** - * exec deleteRequest - * - * @param index elasticsearch index name - * @param id Document id - * @author fxbin - */ - protected void deleteRequest(String index, String id) { - try { - DeleteRequest deleteRequest = new DeleteRequest(index, id); - restHighLevelClient.delete(deleteRequest, COMMON_OPTIONS); - } catch (IOException e) { - throw new ElasticsearchException("删除索引 {" + index + "} 数据id {" + id + "} 失败"); - } - } - - /** - * search all - * - * @param index elasticsearch index name - * @return {@link SearchResponse} - * @author fxbin - */ - protected SearchResponse search(String index) { - SearchRequest searchRequest = new SearchRequest(index); - SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); - searchSourceBuilder.query(QueryBuilders.matchAllQuery()); - searchRequest.source(searchSourceBuilder); - SearchResponse searchResponse = null; - try { - searchResponse = restHighLevelClient.search(searchRequest, COMMON_OPTIONS); - } catch (IOException e) { - e.printStackTrace(); - } - return searchResponse; - } - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/impl/PersonServiceImpl.java b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/impl/PersonServiceImpl.java deleted file mode 100644 index 50bb9541..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/java/test/data/elasticsearch/service/impl/PersonServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package test.data.elasticsearch.service.impl; - -import cn.hutool.core.bean.BeanUtil; -import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.search.SearchHit; -import org.springframework.stereotype.Service; -import org.springframework.util.ObjectUtils; -import test.data.elasticsearch.model.Person; -import test.data.elasticsearch.service.PersonService; -import test.data.elasticsearch.service.base.BaseElasticsearchService; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * PersonServiceImpl - * - * @author fxbin - * @version v1.0 - * @since 2020/5/7 14:31 - */ -@Service -public class PersonServiceImpl extends BaseElasticsearchService implements PersonService { - @Override - public void createIndex(String index) { - createIndexRequest(index); - } - - @Override - public void deleteIndex(String index) { - deleteIndexRequest(index); - } - - @Override - public void insert(String index, List list) { - - try { - list.forEach(person -> { - IndexRequest request = buildIndexRequest(index, String.valueOf(person.getId()), person); - try { - restHighLevelClient.index(request, COMMON_OPTIONS); - } catch (IOException e) { - e.printStackTrace(); - } - }); - } finally { - try { - restHighLevelClient.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - - @Override - public void update(String index, List list) { - list.forEach(person -> { - updateRequest(index, String.valueOf(person.getId()), person); - }); - } - - @Override - public void delete(String index, Person person) { - if (ObjectUtils.isEmpty(person)) { - // 如果person 对象为空，则删除全量 - searchList(index).forEach(p -> { - deleteRequest(index, String.valueOf(p.getId())); - }); - } - deleteRequest(index, String.valueOf(person.getId())); - } - - @Override - public List searchList(String index) { - SearchResponse searchResponse = search(index); - SearchHit[] hits = searchResponse.getHits().getHits(); - List personList = new ArrayList<>(); - Arrays.stream(hits).forEach(hit -> { - Map sourceAsMap = hit.getSourceAsMap(); - Person person = BeanUtil.mapToBean(sourceAsMap, Person.class, true); - personList.add(person); - }); - return personList; - } -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/resources/application.yml b/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/resources/application.yml deleted file mode 100644 index ae742659..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-data-elasticsearch/src/main/resources/application.yml +++ /dev/null @@ -1,12 +0,0 @@ -server: - port: 8082 - -spring: - application: - name: elasticsearch-test -bubble: - fireworks: - elasticsearch: - cluster-nodes: 127.0.0.1:9200 - - diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/pom.xml b/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/pom.xml deleted file mode 100644 index 6fbcf5fa..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-tests - 2022.0.2.BUILD-SNAPSHOT - - - bubble-fireworks-test-plugin-dynamic-threadpool - Bubble Fireworks Test Plugin Dynamic ThreadPool - Bubble Fireworks Test Plugin Dynamic ThreadPool - - - - cn.fxbin.bubble - bubble-fireworks-starter-web - - - cn.fxbin.bubble - bubble-fireworks-starter-plugin-dynamic-threadpool - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - - - \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/src/main/java/test/plugin/threadpool/SampleThreadPoolApplication.java b/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/src/main/java/test/plugin/threadpool/SampleThreadPoolApplication.java deleted file mode 100644 index 871d67c4..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/src/main/java/test/plugin/threadpool/SampleThreadPoolApplication.java +++ /dev/null @@ -1,55 +0,0 @@ -package test.plugin.threadpool; - -import cn.fxbin.bubble.fireworks.plugin.dynamic.threadpool.support.ThreadPoolExecutorOperations; -import cn.hutool.core.thread.ThreadUtil; -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -import javax.annotation.Resource; -import java.util.Set; - -/** - * SampleThreadPoolApplication - * - * @author fxbin - * @version v1.0 - * @since 2020/7/10 11:45 - */ -@SpringBootApplication -public class SampleThreadPoolApplication implements CommandLineRunner { - - @Resource - private ThreadPoolExecutorOperations operations; - - public static void main(String[] args) { - SpringApplication.run(SampleThreadPoolApplication.class, args); - } - - @Override - public void run(String... args) throws Exception { - Set keys = operations.keys(); - System.out.println(keys); - - - for (int i = 0; i < 10000; i++) { - - int finalI = i; - operations.get("test").execute(() -> { - System.out.println(finalI); - ThreadUtil.sleep(100); - }); - } - - - for (int i = 0; i < 10000; i++) { - - int finalI = i; - operations.get("test2222").execute(() -> { - System.out.println(finalI); - ThreadUtil.sleep(100); - }); - } - - } -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/src/main/resources/application.yml b/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/src/main/resources/application.yml deleted file mode 100644 index 814c022a..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-dynamic-threadpool/src/main/resources/application.yml +++ /dev/null @@ -1,21 +0,0 @@ -server: - port: 8083 - -spring: - application: - name: test-thread-pool - -bubble: - fireworks: - dynamic: - thread: - pool[0]: - contact: fxbin - pool-name: test - rejected-policy: DiscardPolicy - pool[1]: - contact: fxbin - pool-name: test2222 - queue-type: ArrayBlockingQueue - rejected-policy: RetryAndLogPolicy - diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/pom.xml b/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/pom.xml deleted file mode 100644 index c6ee477f..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-tests - 2022.0.2.BUILD-SNAPSHOT - - - bubble-fireworks-test-plugin-lock - Bubble Fireworks Test Plugin Lock - Bubble Fireworks Test Plugin Lock - - - - cn.fxbin.bubble - bubble-fireworks-starter-web - - - cn.fxbin.bubble - bubble-fireworks-starter-plugin-lock - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - - - - \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/LockAnnotationService.java b/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/LockAnnotationService.java deleted file mode 100644 index 03aa3439..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/LockAnnotationService.java +++ /dev/null @@ -1,47 +0,0 @@ -package test.plugin.lock; - -import cn.fxbin.bubble.fireworks.core.util.ThreadUtils; -import cn.fxbin.bubble.fireworks.plugin.lock.annotation.LockAction; -import cn.fxbin.bubble.fireworks.plugin.lock.model.LockKeyGeneratorStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * LockAnnotationService - * - * @author fxbin - * @version v1.0 - * @since 2020/8/5 18:35 - */ -@Slf4j -@Service -public class LockAnnotationService { - - @LockAction(keys = {"aaa"}, waitTime = 1000) - public void aaa() { - System.out.println("dididi"); - ThreadUtils.sleep(3000); - } - - @LockAction(keys = "#user.test.number", keyGeneratorType = LockKeyGeneratorStrategy.Expression) - public void spel1(User user){ - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - log.error("exp", e); - } - } - - @LockAction(keyGeneratorType = LockKeyGeneratorStrategy.Expression) - public void spel2(User user){ - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - log.error("exp", e); - } - } - - - - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/SampleLockApplication.java b/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/SampleLockApplication.java deleted file mode 100644 index c5333fcf..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/SampleLockApplication.java +++ /dev/null @@ -1,57 +0,0 @@ -package test.plugin.lock; - -import org.springframework.boot.CommandLineRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.EnableAspectJAutoProxy; - -import javax.annotation.Resource; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - -/** - * SampleLockApplication - * - * @author fxbin - * @version v1.0 - * @since 2020/8/4 16:49 - */ -@EnableAspectJAutoProxy(proxyTargetClass = true) -@SpringBootApplication -public class SampleLockApplication implements CommandLineRunner { - - @Resource - private LockAnnotationService lockAnnotationService; - - public static void main(String[] args) { - SpringApplication.run(SampleLockApplication.class, args); - } - - - /** - * Callback used to run the bean. - * - * @param args incoming main method arguments - * @throws Exception on err or - */ - @Override - public void run(String... args) throws Exception { - ExecutorService executorService = Executors.newFixedThreadPool(2); - executorService.submit(() -> lockAnnotationService.aaa()); - - User user = new User(); - user.setId(999); - User.Test test = new User.Test(); - test.setNumber("123456789"); - user.setTest(test); - - // spring el 表达式测试 - lockAnnotationService.spel1(user); - - // key 生成策略降级测试 - lockAnnotationService.spel2(user); - } - -} - - diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/User.java b/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/User.java deleted file mode 100644 index 636d0731..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/java/test/plugin/lock/User.java +++ /dev/null @@ -1,24 +0,0 @@ -package test.plugin.lock; - -import lombok.Data; - -/** - * User - * - * @author fxbin - * @version v1.0 - * @since 2020/8/7 17:28 - */ -@Data -public class User { - - private Integer id; - - private Test test; - - @Data - public static class Test{ - private String number; - } - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/resources/application.yml b/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/resources/application.yml deleted file mode 100644 index 1deba732..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-lock/src/main/resources/application.yml +++ /dev/null @@ -1,7 +0,0 @@ -server: - port: 8085 - -spring: - redis: - host: 127.0.0.1 - password: bin diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/pom.xml b/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/pom.xml deleted file mode 100644 index 9afb7906..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-tests - 2022.0.2.BUILD-SNAPSHOT - - - bubble-fireworks-test-plugin-logging - Bubble Fireworks Test Plugin Logging - Bubble Fireworks Test Plugin Logging - - - - - cn.fxbin.bubble - bubble-fireworks-starter-web - - - - - cn.fxbin.bubble - bubble-fireworks-starter-logging - - - - cn.fxbin.bubble - bubble-fireworks-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - - - - \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/java/test/plugin/logging/SampleLoggingApplication.java b/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/java/test/plugin/logging/SampleLoggingApplication.java deleted file mode 100644 index a128b031..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/java/test/plugin/logging/SampleLoggingApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package test.plugin.logging; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * SampleLoggingApplication - * - * @author fxbin - * @version v1.0 - * @since 2020/5/8 17:23 - */ -@Slf4j -@SpringBootApplication(scanBasePackages = {"test", "cn.fxbin"}) -public class SampleLoggingApplication { - - public static void main(String[] args) { - SpringApplication.run(SampleLoggingApplication.class, args); - } - - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/java/test/plugin/logging/controller/TestController.java b/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/java/test/plugin/logging/controller/TestController.java deleted file mode 100644 index 122afe98..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/java/test/plugin/logging/controller/TestController.java +++ /dev/null @@ -1,40 +0,0 @@ -package test.plugin.logging.controller; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -/** - * TestController - * - * @author fxbin - * @version v1.0 - * @since 2020/5/8 18:22 - */ -@Slf4j -@RestController -public class TestController { - - - @GetMapping("/test/{name}") - public String test(@PathVariable("name") String name) { - - log.info("test:{} ", name); - - new Thread(() -> log.info("thread test:{}", name)).start(); - - return "test"; - } - - @PostMapping("/test") - public String test(@RequestBody Map map) { - - log.info("test:{} ", map); - - new Thread(() -> log.info("thread test:{}", map)).start(); - - return "test post"; - } - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/resources/application.yml b/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/resources/application.yml deleted file mode 100644 index 437b3d61..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-plugin-logging/src/main/resources/application.yml +++ /dev/null @@ -1,6 +0,0 @@ -server: - port: 8081 - -spring: - application: - name: logging-test \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/pom.xml b/bubble-fireworks-tests/bubble-fireworks-test-web/pom.xml deleted file mode 100644 index b857ae45..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-tests - 2022.0.2.BUILD-SNAPSHOT - - - bubble-fireworks-test-web - Bubble Fireworks Test Web - Bubble Fireworks Test Web - - - - cn.fxbin.bubble - bubble-fireworks-starter-web - - - cn.fxbin.bubble - bubble-fireworks-starter-plugin-token - - - cn.fxbin.bubble - bubble-fireworks-starter-test - test - - - - cn.fxbin.bubble - bubble-fireworks-starter-plugin-excel - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - - - \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/SimpleWebApplication.java b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/SimpleWebApplication.java deleted file mode 100644 index 35ef02be..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/SimpleWebApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package test.web; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * SimpleWebApplication - * - * @author fxbin - * @version v1.0 - * @since 2020/11/14 19:18 - */ -@SpringBootApplication -public class SimpleWebApplication { - - - public static void main(String[] args) { - SpringApplication.run(SimpleWebApplication.class, args); - } - - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/SerializerController.java b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/SerializerController.java deleted file mode 100644 index 08a266ee..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/SerializerController.java +++ /dev/null @@ -1,40 +0,0 @@ -package test.web.controller; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * SerializerController - * - * @author fxbin - * @version v1.0 - * @since 2020/11/16 2:23 - */ -@RestController -@RequestMapping("/serializer") -public class SerializerController { - - @GetMapping("/long") - public LongTest getLong() { - return new LongTest(Long.MAX_VALUE, "123456", Long.MIN_VALUE); - } - -} - -@Data -@AllArgsConstructor -@NoArgsConstructor -class LongTest { - private Long l; - - private String a; - - @JsonSerialize(using = ToStringSerializer.class) - private Long b; -} \ No newline at end of file diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/TokenController.java b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/TokenController.java deleted file mode 100644 index 436ae3ea..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/TokenController.java +++ /dev/null @@ -1,32 +0,0 @@ -package test.web.controller; - -import cn.fxbin.bubble.fireworks.core.model.Result; -import cn.fxbin.bubble.plugin.token.DoubleJwt; -import cn.fxbin.bubble.plugin.token.model.Tokens; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import javax.annotation.Resource; - -/** - * TokenController - * - * @author fxbin - * @version v1.0 - * @since 2020/11/14 19:20 - */ -@RestController -@RequestMapping("/token") -public class TokenController { - - - @Resource - private DoubleJwt doubleJwt; - - @GetMapping("/get") - public Result get() { - return Result.success(doubleJwt.generateTokens("1")); - } - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/ValidatorController.java b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/ValidatorController.java deleted file mode 100644 index 06bde3a3..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/controller/ValidatorController.java +++ /dev/null @@ -1,52 +0,0 @@ -package test.web.controller; - -import cn.fxbin.bubble.fireworks.core.model.Result; -import cn.fxbin.bubble.fireworks.web.validator.EqualField; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import test.web.dto.TestEqualDTO; -import test.web.dto.TestMessageDTO; - -import javax.validation.constraints.NotBlank; - -/** - * ValidatorController - * - * @author fxbin - * @version v1.0 - * @since 2020/11/16 0:55 - */ -@Validated -@RestController -@RequestMapping("/validator") -public class ValidatorController { - - @GetMapping("/equal") - public Result equal(@Validated TestEqualDTO testEqualDTO) { - return Result.success(testEqualDTO); - } - - /** - * un support this method - */ - @GetMapping("/equal_param") - public Result equal(@EqualField(source = "a", target = "b") String a, String b) { - return Result.success(a + ":" + b); - } - - @GetMapping("/test") - public Result testMessage(@NotBlank(message = "{test.aaa}") String test) { - return Result.success(test); - } - - @PostMapping("/testJsonMessage") - public Result testJsonMessage(@RequestBody @Validated TestMessageDTO test) { - return Result.success(test); - } - - @PostMapping("/testFormMessage") - public Result testFormMessage(@Validated TestMessageDTO test) { - return Result.success(test); - } - -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/dto/TestEqualDTO.java b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/dto/TestEqualDTO.java deleted file mode 100644 index f18c2014..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/dto/TestEqualDTO.java +++ /dev/null @@ -1,20 +0,0 @@ -package test.web.dto; - -import cn.fxbin.bubble.fireworks.web.validator.EqualField; -import lombok.Data; - -/** - * TestEqualDTO - * - * @author fxbin - * @version v1.0 - * @since 2020/11/16 1:09 - */ -@Data -@EqualField(source = "a", target = "b") -public class TestEqualDTO { - - private String a; - - private String b; -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/dto/TestMessageDTO.java b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/dto/TestMessageDTO.java deleted file mode 100644 index 02ced05a..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/java/test/web/dto/TestMessageDTO.java +++ /dev/null @@ -1,29 +0,0 @@ -package test.web.dto; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.validation.constraints.NotNull; -import java.io.Serializable; - -/** - * TestMessageDTO - * - * @author fxbin - * @version v1.0 - * @since 2020/11/16 23:52 - */ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class TestMessageDTO implements Serializable { - - private static final long serialVersionUID = 1874791859019775820L; - - - @NotNull(message = "{id.not.null}") - private Integer id; -} diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/resources/ValidationMessages.properties b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/resources/ValidationMessages.properties deleted file mode 100644 index f42e9d99..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/resources/ValidationMessages.properties +++ /dev/null @@ -1,2 +0,0 @@ -test.aaa = \u6D4B\u8BD5 -id.not.null = ID \u4E0D\u5141\u8BB8\u4E3Anull diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/resources/application.yml b/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/resources/application.yml deleted file mode 100644 index 2d853c5b..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/main/resources/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -server: - port: 8082 -spring: - application: - name: test-web - main: - allow-bean-definition-overriding: true -bubble: - fireworks: - token: - token-access-expire: 100 diff --git a/bubble-fireworks-tests/bubble-fireworks-test-web/src/test/java/test/web/SimpleWebApplicationTests.java b/bubble-fireworks-tests/bubble-fireworks-test-web/src/test/java/test/web/SimpleWebApplicationTests.java deleted file mode 100644 index 7af2a2c1..00000000 --- a/bubble-fireworks-tests/bubble-fireworks-test-web/src/test/java/test/web/SimpleWebApplicationTests.java +++ /dev/null @@ -1,42 +0,0 @@ -package test.web; - -import cn.fxbin.bubble.plugin.token.DoubleJwt; -import cn.fxbin.bubble.plugin.token.model.TokenPayload; -import cn.fxbin.bubble.plugin.token.model.Tokens; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -import javax.annotation.Resource; - -import static org.junit.jupiter.api.Assertions.*; - -/** - * SimpleWebApplicationTests - * - * @author fxbin - * @version v1.0 - * @since 2020/11/21 8:52 - */ -@Slf4j -@SpringBootTest -public class SimpleWebApplicationTests { - - @Resource - private DoubleJwt doubleJwt; - - @Test - public void context() { - Tokens tokens = doubleJwt.generateTokens(1); - log.info("tokens: {}", tokens); - assertNotNull(tokens); - } - - @Test - public void parseToken() { - TokenPayload payload = doubleJwt.parseToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJpZGVudGl0eSI6IjEiLCJzY29wZSI6ImJ1YmJsZS1maXJld29ya3MiLCJ0eXBlIjoiYWNjZXNzIiwiaWF0IjoxNjA1OTIxNDIyLCJleHAiOjE2MDU5MjE1MjJ9.C5IMP_knsMZA-ojufGvWDZxBOWzfPGILQiOPpVmObahRdvPdCLk2q8Q7W3wJPZFTK46sd9e9nFgTG2dwh3pumg"); - log.info("payload: {}", payload); - assertNotNull(payload); - } - -} diff --git a/bubble-fireworks-tests/pom.xml b/bubble-fireworks-tests/pom.xml deleted file mode 100644 index 1f3c4c94..00000000 --- a/bubble-fireworks-tests/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - 4.0.0 - - cn.fxbin.bubble - bubble-fireworks-parent - 2022.0.2.BUILD-SNAPSHOT - ../bubble-fireworks-project/bubble-fireworks-parent/pom.xml - - - bubble-fireworks-tests - pom - Bubble Fireworks Tests - Bubble Fireworks Tests - - - bubble-fireworks-test-data-elasticsearch - bubble-fireworks-test-plugin-logging - bubble-fireworks-test-plugin-dynamic-threadpool - bubble-fireworks-test-plugin-lock - bubble-fireworks-test-web - - - - ${basedir}/.. - true - - - - - - - org.codehaus.mojo - flatten-maven-plugin - true - - - flatten - process-resources - - flatten - - - true - oss - - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Tests.java - - - **/Abstract*.java - - - file:/dev/./urandom - true - - - - - org.apache.maven.plugins - maven-install-plugin - - true - - - - org.apache.maven.plugins - maven-javadoc-plugin - true - - - org.apache.maven.plugins - maven-deploy-plugin - - - true - - - - - - \ No newline at end of file diff --git a/bubble-fireworks-project/bubble-fireworks-parent/pom.xml b/bubble-parent/pom.xml similarity index 79% rename from bubble-fireworks-project/bubble-fireworks-parent/pom.xml rename to bubble-parent/pom.xml index a4b384ea..c920dcb6 100644 --- a/bubble-fireworks-project/bubble-fireworks-parent/pom.xml +++ b/bubble-parent/pom.xml @@ -3,29 +3,15 @@ 4.0.0 cn.fxbin.bubble - bubble-fireworks-dependencies - 2022.0.2.BUILD-SNAPSHOT - ../bubble-fireworks-dependencies/pom.xml + bubble-dependencies + 2.0.0.BUILD-SNAPSHOT + ../bubble-dependencies/pom.xml - bubble-fireworks-parent + bubble-parent pom - Bubble Fireworks Parent - Bubble Fireworks Parent - - - - 1.8 - UTF-8 - UTF-8 - UTF-8 - 1.8 - 1.8 - UTF-8 - true - - - + Bubble Parent + Bubble Parent diff --git a/bubble-fireworks-project/bubble-fireworks-starters/bubble-fireworks-starter-data-elasticsearch/pom.xml b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/pom.xml similarity index 80% rename from bubble-fireworks-project/bubble-fireworks-starters/bubble-fireworks-starter-data-elasticsearch/pom.xml rename to bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/pom.xml index 5fc1c496..ef2d93bf 100644 --- a/bubble-fireworks-project/bubble-fireworks-starters/bubble-fireworks-starter-data-elasticsearch/pom.xml +++ b/bubble-spring-boot-starters/bubble-spring-boot-starter-data-elasticsearch/pom.xml @@ -4,18 +4,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - bubble-fireworks-starters + bubble-spring-boot-starters cn.fxbin.bubble - 2022.0.2.BUILD-SNAPSHOT + 2.0.0.BUILD-SNAPSHOT - bubble-fireworks-starter-data-elasticsearch - Bubble Fireworks Starter Data Elasticsearch + bubble-spring-boot-starter-data-elasticsearch + Bubble SpringBoot Starter Data Elasticsearch cn.fxbin.bubble - bubble-fireworks-starter + bubble-spring-boot-starter + bubble-spring-boot-starter + + + bubble-spring-boot-starter-web + bubble-spring-boot-starter-test + + bubble-spring-boot-starter-openfeign + + bubble-spring-boot-starter-data-redis + bubble-spring-boot-starter-data-mybatis-plus + bubble-spring-boot-starter-data-elasticsearch + + + bubble-spring-boot-starter-lock + bubble-spring-boot-starter-excel + bubble-spring-boot-starter-token + bubble-spring-boot-starter-logging + bubble-spring-boot-starter-xxl-job + bubble-spring-boot-starter-dynamic-threadpool + bubble-spring-boot-starter-i18n + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 499a7a57..7a9e6717 100644 --- a/pom.xml +++ b/pom.xml @@ -3,11 +3,11 @@ 4.0.0 cn.fxbin.bubble - bubble-fireworks-build - 2022.0.2.BUILD-SNAPSHOT + bubble-build + 2.0.0.BUILD-SNAPSHOT pom - Bubble Fireworks Build - Bubble Fireworks Build project, managing plugins + Bubble Build + Bubble Build project, managing plugins https://github.com/fxbin/bubble-fireworks @@ -74,8 +74,10 @@ - bubble-fireworks-project - bubble-fireworks-tests + bubble-dependencies + bubble-parent + bubble-core + bubble-spring-boot-starters @@ -338,7 +340,7 @@ - + org.codehaus.mojo versions-maven-plugin