Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	bubble-dependencies/pom.xml

CHANGELOG.md

@@ -0,0 +1,176 @@
+# 变更记录
+## 发行版本
+
+### [2022.0.1] - 2023.06.25
+🎇New Features
+* 增加枚举基础定义&枚举helper类
+* add HttpServletRequest wrapper classes
+* 增加mybatis-plus 相关组件依赖管理
+
+🛠 Bug Fix
+* 🐛 Buffer子类型 clear 方法兼容问题
+* 🐛 mybatis-plus 排序问题修复
+
+🎨 Other Changes
+* 优化mybatis-plus相关实现
+* 优化getIpAddr方法
+* redis setNX, keys 操作
+* BaseMapper 增加自定义方法
+* bean转化时日期数据处理
+
+ 🔨Dependency Upgrades
+* Upgrade to lombok 1.18.26
+* Upgrade to hutool 5.8.18
+* Upgrade to jjwt 0.11.5
+* Upgrade to fastjson 2.0.15
+* Upgrade to httpclient 4.5.14
+* Upgrade to protobuf-java 3.22.2
+* Upgrade to mapstruct 1.5.1.Final
+* Upgrade to easyexcel 3.2.1
+* Upgrade to xxl-job 2.4.0
+* Upgrade to dynamic-datasource-spring-boot-starter 3.6.1
+* Upgrade to aliyun-log 0.6.74
+* Upgrade to aliyun-sdk-oss 3.16.2
+* Upgrade to redisson 3.20.1
+* Upgrade to curator-framework 5.4.0
+* Upgrade to elasticsearch 7.13.4
+* Upgrade to spring-boot 2.7.5
+* Upgrade to spring-boot-admin 2.7.5
+* Upgrade to spring-cloud 2021.0.2
+* Upgrade to maven-jar-plugin 3.3.0
+* Upgrade to maven-enforcer-plugin 3.3.0
+* Upgrade to maven-deploy-plugin 3.0.0
+* Upgrade to maven-surefire-plugin 3.0.0
+* Upgrade to maven-javadoc-plugin 3.5.0
+* Upgrade to maven-install-plugin 3.1.1
+* Upgrade to maven-compiler-plugin 3.11.0
+* Upgrade to version-maven-plugin 2.11.0
+
+### [2022.0.0] - 2022.04.28
+🎇New Features
+* 移除swagger模块，独立为 [swagger-spring-boot-starter](https://github.com/fxbin/swagger-spring-boot-starter)
+* 增加项目启动信息
+* redis 记录操作日志
+* 项目结构调整
+
+🔨Dependency Upgrades
+
+* Upgrade to hutool 5.5.2
+* Upgrade to redisson 3.17.0
+* Upgrade to aliyun-log 0.6.69
+* Upgrade to transmittable-thread-local 2.12.6
+* Upgrade to easyexcel 3.0.5
+* Upgrade to aliyun-sdk-oss 3.14.0
+* Upgrade to springboot 2.6.6
+* Upgrade to knife4j 3.0.3
+
+### [1.0.1-RELEASE] - 2021.04.23
+🛠 Bug Fix
+* Swagger 在WebFlux 模式下Bean加载冲突问题修复
+
+### [1.0.0-RELEASE] - 2021.04.23
+🎇New Features
+* 适配SpringCloud2020
+* 适配SpringCloudAlibaba 2021.1
+* 相关依赖版本升级
+
+🛠 Bug Fix
+* Redis 时间序列化问题修复
+
+### [0.0.9-RELEASE] - 2020.12.13
+🎇New Features
+
+* expand ifpresent api for mybatis-plus
+* expand jwt generator & jwt parser & set default secret
+* unpack default feign exception
+
+🔨Dependency Upgrades
+
+* Upgrade to hutool 5.5.2
+* Upgrade to protobuf-java 3.14.0
+* Upgrade to redisson 3.14.0
+* Upgrade to aliyun-log 0.6.61
+* Upgrade to transmittable-thread-local 2.12.0
+* Upgrade to easyexcel 2.2.7
+* Upgrade to aliyun-sdk-oss 3.11.2
+* Upgrade to springboot 2.3.7.RELEASE
+* Upgrade to knife4j 2.0.8
+
+🛠 Bug Fix
+
+* filter swagger exclude path based on regular expression
+
+### [0.0.8-RELEASE] - 2020.11.15
+🎇New Features
+
+* add xxl-job-executor module
+* add token generator plugin module
+* support hot refreshing of resources
+
+🔨Dependency Upgrades
+
+* Upgrade to guava 30.0-jre
+* Upgrade to hutool 5.4.7
+* Upgrade to protobuf-java 3.13.0
+* Upgrade to aliyun-log 0.6.60
+* Upgrade to mapstruct 1.4.1.Final
+* Upgrade to knife4j 2.0.
+* Upgrade to matis-plus 3.4.1
+* Upgrade to SpringBootAdmin 2.3.1
+* Upgrade to SpringBoot 2.3.6.RELEASE
+* Upgrade to SpringCloud Hoxton SR9
+* Upgrade to maven-enforcer-plugin 3.0.0-M3
+* Upgrade to jacoco-maven-plugin 0.8.6
+* Upgrade to versions-maven-plugin 2.8.1
+
+🎨 Other Changes
+
+* remove expired swagger api
+* improve sentinel customize exception
+* `bubble-fireworks-core` add getRequestUrl method
+
+### [0.0.7-RELEASE] - 2020.10.18
+🎇New Features
+* layering package jar config
+* add spring-boot-admin-dependencies
+
+🛠 Bug Fix
+* swagger web resources auto configuration bug fixed
+
+🎨 Other Changes
+* redis try lock downgrade strategy log update
+* remove default global response handler
+* remove exclude dependency
+
+### [0.0.6-RELEASE] - 2020.09.22
+🎨 Other Changes
+* set default response and ignore swagger resources
+* set default error code of service exception
+* add swagger test example module
+
+🔨Dependency Upgrades
+* Upgrade to mybatis-plus 3.4.0
+* Upgrade to SpringBoot 2.3.4.RELEASE
+* Upgrade to SpringCloud Hoxton SR8
+* Upgrade to SpringCloud Alibaba 2.2.3.RELEASE
+
+### [0.0.5-RELEASE] - 2020.08.12
+🛠 bug fixed
+* 紧急修复 spring-configuration-metadata.json 文件不能自动生成问题
+
+### [0.0.4-RELEASE] - 2020.08.10
+🎇New Features
+* 新增动态线程池starter
+* 新增redis lock starter
+
+🎨 Other Changes
+* compiler default import mapstruct and lombok
+* set global configuration about web project
+* clean unused code
+
+🔨Dependency Upgrades
+* Upgrade to Hutool 5.3.10
+* Upgrade to SpringBoot 2.3.2.RELEASE
+
+### [0.0.3-RELEASE] - 2020.06.29
+* first release, base modules

README.md

@@ -1,26 +1,24 @@
-# 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.6.4-brightgreen.svg)](https://github.com/spring-projects/spring-boot)
-[![Spring Cloud](https://img.shields.io/badge/SpringCloud-2021.0.1-brightgreen.svg)](https://github.com/spring-cloud)
-[![Spring Cloud Alibaba](https://img.shields.io/badge/SpringCloudAlibaba-2021.0.1.0-brightgreen.svg)](https://github.com/alibaba/spring-cloud-alibaba)
+[![Spring Boot](https://img.shields.io/badge/SpringBoot-2.7.14-brightgreen.svg)](https://github.com/spring-projects/spring-boot)
+[![Spring Cloud](https://img.shields.io/badge/SpringCloud-2021.0.8-brightgreen.svg)](https://github.com/spring-cloud)
+[![Spring Cloud Alibaba](https://img.shields.io/badge/SpringCloudAlibaba-2021.0.5.0-brightgreen.svg)](https://github.com/alibaba/spring-cloud-alibaba)
 
 [![Star](https://img.shields.io/github/stars/fxbin/bubble-fireworks.svg?label=Stars&style=social)](https://github.com/fxbin/bubble-fireworks/stargazers)
 [![Members](https://img.shields.io/github/forks/fxbin/bubble-fireworks.svg?label=Fork&style=social)](https://github.com/fxbin/bubble-fireworks/network/members)
 [![Watchers](https://img.shields.io/github/watchers/fxbin/bubble-fireworks.svg?label=Watch&style=social)](https://github.com/fxbin/bubble-fireworks/watchers)
 
-
-| 依赖 | 版本 |
----|---
-| Spring Boot | 2.6.4 |
-| Spring Cloud | 2021.0.1 | 
-| Spring Cloud Alibaba | 2021.0.1.0 |
-| Mybatis-Plus | 3.5.1 | 
-
 ## 项目简介
 
-基于SpringBoot,SpringCloud,Mybatis Plus 的快速开发脚手架
+`bubble` 旨在为项目快速开发提供一系列的基础能力，方便使用者根据项目需求快速进行功能拓展。已将所有 JAR 包都推送至中央仓库，也会为每个版本的升级改动列出详细的更新日志
 
-## 参考文档
+## 更新记录详见
+[项目更新记录](CHANGELOG.md)
+
+## 参考链接
 * [lombok.config--lombok配置系统](https://www.freesion.com/article/8894123984/)
-* [Junit5 使用](https://www.morcat.cn/archives/junit5)
+* [Junit5 使用](https://www.morcat.cn/archives/junit5)
+
+## 规范定义
+* [项目规范定义](docs/规范定义.md)

bubble-fireworks-project/bubble-fireworks-core/pom.xml → bubble-core/pom.xml

@@ -3,14 +3,14 @@
  <modelVersion>4.0.0</modelVersion>
  <parent>
  <groupId>cn.fxbin.bubble</groupId>
- <artifactId>bubble-fireworks-parent</artifactId>
- <version>2022.0.1</version>
- <relativePath>../bubble-fireworks-parent/pom.xml</relativePath>
+ <artifactId>bubble-parent</artifactId>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
+ <relativePath>../bubble-parent/pom.xml</relativePath>
  </parent>
 
- <artifactId>bubble-fireworks-core</artifactId>
- <name>Bubble Fireworks Core</name>
- <description>Bubble Fireworks Core: core util</description>
+ <artifactId>bubble-core</artifactId>
+ <name>Bubble Core</name>
+ <description>Bubble Core: core util</description>
 
  <dependencies>
  <!-- spring-boot-starter-json -->