bump: 发布2.5.0

details see: https://helio.uncarbon.cc/#/i18n/zh-CN/appendix/change-log

LICENSE

@@ -1,127 +1,20 @@
-                     木兰宽松许可证, 第2版
-
-   木兰宽松许可证， 第2版 
-   2020年1月 http://license.coscl.org.cn/MulanPSL2
-
-
-   您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
-
-   0. 定义
-
-      “软件”是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
-
-      “贡献”是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
-
-      “贡献者”是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
-
-      “法人实体”是指提交贡献的机构及其“关联实体”。
-
-      “关联实体”是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
-
-   1. 授予版权许可
-
-      每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
-
-   2. 授予专利许可
-
-      每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
-
-   3. 无商标许可
-
-      “本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
-
-   4. 分发限制
-
-      您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
-
-   5. 免责声明与责任限制
-
-      “软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。 
-
-   6. 语言
-      “本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
-
-   条款结束 
-
-   如何将木兰宽松许可证，第2版，应用到您的软件
-   
-   如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
-
-      1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
-
-      2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
-
-      3， 请将如下声明文本放入每个源文件的头部注释中。
-
-   Copyright (c) [Year] [name of copyright holder]
-   [Software Name] is licensed under Mulan PSL v2.
-   You can use this software according to the terms and conditions of the Mulan PSL v2. 
-   You may obtain a copy of Mulan PSL v2 at:
-            http://license.coscl.org.cn/MulanPSL2 
-   THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.  
-   See the Mulan PSL v2 for more details.  
-
-
-                     Mulan Permissive Software License，Version 2
-
-   Mulan Permissive Software License，Version 2 (Mulan PSL v2)
-   January 2020 http://license.coscl.org.cn/MulanPSL2
-
-   Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions: 
-   
-   0. Definition
-   
-      Software means the program and related documents which are licensed under this License and comprise all Contribution(s). 
-   
-      Contribution means the copyrightable work licensed by a particular Contributor under this License.
-   
-      Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
-   
-      Legal Entity means the entity making a Contribution and all its Affiliates.
-   
-      Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
-
-   1. Grant of Copyright License
-
-      Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
-
-   2. Grant of Patent License 
-
-      Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
-
-   3. No Trademark License
-
-      No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in Section 4.
-
-   4. Distribution Restriction
-
-      You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
-
-   5. Disclaimer of Warranty and Limitation of Liability
-
-      THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-   6. Language
-
-      THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
-
-   END OF THE TERMS AND CONDITIONS
-
-   How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
-
-      To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
-
-      i Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner; 
-
-      ii Create a file named “LICENSE” which contains the whole context of this License in the first directory of your software package;
-
-      iii Attach the statement to the appropriate annotated syntax at the beginning of each source file.
-
-
-   Copyright (c) [Year] [name of copyright holder]
-   [Software Name] is licensed under Mulan PSL v2.
-   You can use this software according to the terms and conditions of the Mulan PSL v2. 
-   You may obtain a copy of Mulan PSL v2 at:
-               http://license.coscl.org.cn/MulanPSL2 
-   THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.  
-   See the Mulan PSL v2 for more details.  
+The MIT License (MIT)
+
+Copyright (c) 2021 uncarbon97
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

helio-core/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-core/src/main/java/cc/uncarbon/framework/core/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * 公用核心, 包含配置项读取、常量、用户上下文、自定义业务异常、基础枚举类等
+ *
+ */
+package cc.uncarbon.framework.core;

helio-starter-aop/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-aop/src/main/java/cc/uncarbon/aop/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 空包，只是引入了 aspectj
+ */
+package cc.uncarbon.aop;

helio-starter-cloud/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-cloud/src/main/java/cc/uncarbon/framework/cloud/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 提供启用基于 Nacos 的服务注册、服务发现、配置更新
+ */
+package cc.uncarbon.framework.cloud;

helio-starter-crud/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -31,6 +31,11 @@
             <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.mysql</groupId>
             <artifactId>mysql-connector-j</artifactId>
@@ -41,18 +46,6 @@
             <artifactId>postgresql</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.oracle.database.jdbc</groupId>
-            <artifactId>ojdbc8</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>

helio-starter-crud/src/main/java/cc/uncarbon/framework/crud/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * 提供基础实体类、通用 Service、ServiceImpl 层等，及自动配置 Mybatis-Plus 实现分页、乐观锁、自动填充字段等特性
+ * -
+ * dynamicdatasource: 用于动态数据源
+ */
+
+package cc.uncarbon.framework.crud;

helio-starter-dubbo/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-dubbo/src/main/java/cc/uncarbon/framework/dubbo/filter/ConsumerContextFilter.java

@@ -31,14 +31,18 @@ public class ConsumerContextFilter implements Filter {
 
             UserContext userContext = UserContextHolder.getUserContext();
             if (userContext != null) {
-                log.debug("[Dubbo RPC] 设置当前用户上下文 >> {}", userContext);
+                if (log.isDebugEnabled()) {
+                    log.debug("[Dubbo RPC] 设置当前用户上下文 >> {}", userContext);
+                }
                 clientAttachment.setAttachment(UserContext.CAMEL_NAME, userContext);
             }
 
             TenantContext tenantContext = TenantContextHolder.getTenantContext();
             if (tenantContext != null && tenantContext.getTenantId() != null) {
                 // 实际启用了租户
-                log.debug("[Dubbo RPC] 设置当前租户上下文 >> {}", tenantContext);
+                if (log.isDebugEnabled()) {
+                    log.debug("[Dubbo RPC] 设置当前租户上下文 >> {}", tenantContext);
+                }
                 clientAttachment.setAttachment(TenantContext.CAMEL_NAME, tenantContext);
             }
         }
@@ -49,7 +53,7 @@ public class ConsumerContextFilter implements Filter {
      * 原来的 clientAttachment.isConsumerSide() 抽风了，只能手撸一个了
      * @return 调用源是否为【消费者】
      */
-    private boolean isConsumerSide(Invoker<?> invoker) {
+    private static boolean isConsumerSide(Invoker<?> invoker) {
         return CommonConstants.CONSUMER_SIDE.equals(invoker.getUrl().getSide());
     }
 

helio-starter-dubbo/src/main/java/cc/uncarbon/framework/dubbo/filter/ProviderContextFilter.java

@@ -36,13 +36,19 @@ public class ProviderContextFilter implements Filter {
             Object attachment = serverAttachment.getObjectAttachment(UserContext.CAMEL_NAME);
             if (attachment instanceof UserContext userContext) {
                 UserContextHolder.setUserContext(userContext);
-                log.debug("[Dubbo RPC] 取出当前用户上下文 >> {}", userContext);
+
+                if (log.isDebugEnabled()) {
+                    log.debug("[Dubbo RPC] 取出当前用户上下文 >> {}", userContext);
+                }
             }
 
             attachment = serverAttachment.getObjectAttachment(TenantContext.CAMEL_NAME);
             if (attachment instanceof TenantContext tenantContext) {
                 TenantContextHolder.setTenantContext(tenantContext);
-                log.debug("[Dubbo RPC] 取出当前租户上下文 >> {}", tenantContext);
+
+                if (log.isDebugEnabled()) {
+                    log.debug("[Dubbo RPC] 取出当前租户上下文 >> {}", tenantContext);
+                }
             }
         }
 
@@ -53,7 +59,7 @@ public class ProviderContextFilter implements Filter {
      * 原来的 serverAttachment.isProviderSide() 抽风了，只能手撸一个了
      * @return 调用源是否为【提供者】
      */
-    private boolean isProviderSide(Invoker<?> invoker) {
+    private static boolean isProviderSide(Invoker<?> invoker) {
         return CommonConstants.PROVIDER.equals(invoker.getUrl().getSide());
     }
 }

helio-starter-dubbo/src/main/java/cc/uncarbon/framework/dubbo/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * 提供自定义 Dubbo Filter 并自动注入 Spring, 实现 RPC 调用时携带当前用户上下文
+ */
+
+package cc.uncarbon.framework.dubbo;

helio-starter-i18n/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-i18n/src/main/java/cc/uncarbon/framework/i18n/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 提供国际化支持能力
+ * 文案资源文件见`helio-boot`以及`helio-cloud`的：src/main/resources/i18n/messages[语言编码].properties
+ */
+
+package cc.uncarbon.framework.i18n;

helio-starter-knife4j/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-knife4j/src/main/java/cc/uncarbon/framework/knife4j/package-info.java

@@ -0,0 +1,6 @@
+/**
+ * 引入 Knife4j 以标注、生成 API 文档
+ * 亮点：如果 DTO/VO 中字段使用枚举作为类型，在API文档自动展示枚举含义，如`性别(0=未知 1=男 2=女)`
+ */
+
+package cc.uncarbon.framework.knife4j;

helio-starter-rate-limit-redis/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-rate-limit-redis/src/main/java/cc/uncarbon/framework/ratelimit/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * 基于Redis实现的限流组件，内置简易的3种限流策略（全局限流、根据当前用户ID限流、根据客户端IP限流）
+ */
+
+package cc.uncarbon.framework.ratelimit;

helio-starter-redis/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-redis/src/main/java/cc/uncarbon/framework/redis/package-info.java

@@ -0,0 +1,8 @@
+/**
+ * 作用：
+ * 1️⃣使用 Jackson 作为 RedisTemplate 的 value-serializer
+ * 2️⃣封装基于 Redisson 的Redis分布式可重入锁（`RedisDistributedLock` 以及对应的模板类 `RedisDistributedLockTemplate`）
+ * 3️⃣提供`RedisKeyDefinition`统一 Redis Key 定义，方便集中管理
+ */
+
+package cc.uncarbon.framework.redis;

helio-starter-rocketmq-aliyun/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-rocketmq-aliyun/src/main/java/cc/uncarbon/framework/rocketmq/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * 提供对阿里云 Rocket MQ 的封装，基于源项目[rocketmq-spring-boot-starter](https://github.com/ThierrySquirrel/rocketmq-spring-boot-starter) 改造适配
+ */
+
+package cc.uncarbon.framework.rocketmq;

helio-starter-satoken/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-satoken/src/main/java/cc/uncarbon/framework/satoken/dao/SaTokenLocalCacheDao.java

@@ -2,6 +2,7 @@ package cc.uncarbon.framework.satoken.dao;
 
 import cc.uncarbon.framework.core.cache.TimedCacheEx;
 import cn.dev33.satoken.dao.SaTokenDaoForRedisTemplate;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * SA-Token 读取时，本地缓存一定时长，减少对 Redis 的 IO
@@ -11,6 +12,7 @@ import cn.dev33.satoken.dao.SaTokenDaoForRedisTemplate;
  * @since 2.1.0
  * @author Uncarbon
  */
+@Slf4j
 public class SaTokenLocalCacheDao extends SaTokenDaoForRedisTemplate {
 
     /**
@@ -42,6 +44,8 @@ public class SaTokenLocalCacheDao extends SaTokenDaoForRedisTemplate {
         // 默认开nullValueMarker的清理定时任务，避免长时间缓存空值
         enableNullValueMarkerPruneSchedule(400);
         // 不默认开stringValueCache、objectValueCache的清理定时任务
+
+        log.info("[framework][SA-Token] 本地二级缓存已生效");
     }
 
     /**

helio-starter-satoken/src/main/java/cc/uncarbon/framework/satoken/package-info.java

@@ -0,0 +1,7 @@
+/**
+ * 引入 SA-Token 实现 Web 登录及权限控制
+ * 亮点：
+ * 1️⃣提供`SaTokenLocalCacheDao`作为 Redis 之外的二级缓存
+ */
+
+package cc.uncarbon.framework.satoken;

helio-starter-tenant/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

helio-starter-tenant/src/main/java/cc/uncarbon/framework/tenant/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * 提供了多租户能力，已内置行级租户、数据源级租户实现
+ */
+
+package cc.uncarbon.framework.tenant;

helio-starter-test/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-test/src/main/java/cc/uncarbon/framework/test/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * 只是引入了 spring-boot-starter-test
+ */
+
+package cc.uncarbon.framework.test;

helio-starter-web/pom.xml

@@ -8,7 +8,7 @@
     <parent>
         <artifactId>helio-starters</artifactId>
         <groupId>cc.uncarbon.framework</groupId>
-        <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+        <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
         <relativePath>../pom.xml</relativePath>
     </parent>
 

helio-starter-web/src/main/java/cc/uncarbon/framework/web/jackson/HelioJacksonModule.java

@@ -35,7 +35,6 @@ public class HelioJacksonModule extends SimpleModule {
         /*
         时间相关；时区跟随JVM设置
         */
-        // knife4j-aggression用的hutool 5.4.1版本还没有DatePattern.*FORMATTER常量，为了兼容只能先手动构造了
         DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(HelioConstant.Jackson.DATE_TIME_FORMAT);
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(HelioConstant.Jackson.DATE_FORMAT);
         DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern(HelioConstant.Jackson.TIME_FORMAT);

helio-starter-web/src/main/java/cc/uncarbon/framework/web/package-info.java

@@ -0,0 +1,11 @@
+/**
+ * 封装了：
+ * 1️⃣通用返回体外层包装 ApiResult
+ * 2️⃣全局异常处理器
+ * 3️⃣反XSS注入增强
+ * 4️⃣注册并增强全局单例Jackson ObjectMapper
+ * 5️⃣Web请求及响应日志切面
+ * 6️⃣Web容器启动以后，打印IP与端口
+ */
+
+package cc.uncarbon.framework.web;

pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.4.7</version>
+        <version>3.5.6</version>
     </parent>
 
     <name>${project.artifactId}</name>
@@ -33,48 +33,50 @@
 
     <groupId>cc.uncarbon.framework</groupId>
     <artifactId>helio-starters</artifactId>
-    <version>2.4.1</version><!-- BATCH REPLACEMENT MARK -->
+    <version>2.5.0</version><!-- BATCH REPLACEMENT MARK -->
 
     <properties>
         <!-- core versions -->
-        <helio-starters.version>2.4.1</helio-starters.version>
+        <helio-starters.version>2.5.0</helio-starters.version>
         <!-- 可根据实际JDK版本修改；JDK17则改为'17'  JDK21则改为'21' -->
         <java.version>17</java.version>
         <!-- 若变更Spring Boot版本, 上面parent依赖版本也要变 -->
-        <spring-boot.version>3.4.7</spring-boot.version>
+        <spring-boot.version>3.5.6</spring-boot.version>
 
 
         <!-- Spring Cloud versions -->
+        <!-- https://spring.io/projects/spring-cloud -->
         <!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-dependencies -->
-        <spring-cloud.version>2023.0.4</spring-cloud.version>
-        <spring-cloud-starter.version>4.2.0</spring-cloud-starter.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
+        <spring-cloud-starter.version>4.3.0</spring-cloud-starter.version>
         <spring-cloud-commons.version>${spring-cloud-starter.version}</spring-cloud-commons.version>
         <spring-cloud-context.version>${spring-cloud-starter.version}</spring-cloud-context.version>
 
 
         <!-- Spring Cloud Alibaba versions -->
-        <spring-cloud-alibaba.version>2023.0.3.2</spring-cloud-alibaba.version>
+        <!-- https://mvnrepository.com/artifact/com.alibaba.cloud/spring-cloud-starter-alibaba-nacos-discovery -->
+        <spring-cloud-alibaba.version>2023.0.3.3</spring-cloud-alibaba.version>
         <dubbo.version>3.3.2</dubbo.version>
         <nacos-client.vesion>2.4.3</nacos-client.vesion>
 
 
         <!-- 3rd-party versions -->
-        <lombok.version>1.18.30</lombok.version>
+        <lombok.version>1.18.40</lombok.version>
         <slf4j.version>2.0.12</slf4j.version>
         <hutool.version>5.8.38</hutool.version>
         <sa-token.version>1.44.0</sa-token.version>
         <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
-        <!-- 如果 mp 较新版存在问题，可以回退至 3.5.5 试试  -->
-        <mybatis-plus.version>3.5.7</mybatis-plus.version>
+        <!-- 如果 mp 较新版存在问题，可以回退至 3.5.7 试试  -->
+        <mybatis-plus.version>3.5.14</mybatis-plus.version>
         <!-- 不要升级 knife4j，升级 SpringDoc 依赖版本即可 -->
         <knife4j.version>4.4.0</knife4j.version>
-        <!-- 以下两个 SpringDoc 依赖不完全配套，但能适配 Spring Boot 3.4.x -->
+        <!-- 以下两个 SpringDoc 依赖不完全配套，但能适配 Spring Boot 3.5.x -->
         <!-- https://central.sonatype.com/artifact/org.springdoc/springdoc-openapi-starter-common/版本号/dependencies -->
         <springdoc-openapi-starter.version>2.7.0</springdoc-openapi-starter.version>
         <springdoc-annotations.version>2.2.27</springdoc-annotations.version>
 
         <!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter -->
-        <redisson.version>3.33.0</redisson.version>
+        <redisson.version>3.51.0</redisson.version>
         <aspectj.version>1.9.22.1</aspectj.version>
         <ons-client.version>1.8.8.1.Final</ons-client.version>
         <mybatis-plus-dynamic-datasource.version>4.3.1</mybatis-plus-dynamic-datasource.version>
@@ -91,18 +93,17 @@
         <maven.version>3.6.3</maven.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
-        <buildTime>v.${project.version} build ${maven.build.timestamp.format}</buildTime>
-        <main.user.dir>${basedir}/..</main.user.dir>
         <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
 
 
         <!-- for mitigating vulnerabilities -->
-        <guava.version>33.2.1-jre</guava.version>
-        <commons-compress.version>1.26.2</commons-compress.version>
-        <xnio-api.version>3.8.16.Final</xnio-api.version>
-        <commons-lang3.no-vulnerability-version>3.18.0</commons-lang3.no-vulnerability-version>
-        <commons-io.no-vulnerability-version>2.19.0</commons-io.no-vulnerability-version>
+        <guava.safe-version>33.2.1-jre</guava.safe-version>
+        <commons-compress.safe-version>1.26.2</commons-compress.safe-version>
+        <xnio-api.safe-version>3.8.16.Final</xnio-api.safe-version>
+        <commons-lang3.safe-version>3.18.0</commons-lang3.safe-version>
+        <commons-io.safe-version>2.19.0</commons-io.safe-version>
+        <undertow-core.safe-version>2.3.19.Final</undertow-core.safe-version>
+        <netty-codec.safe-version>4.1.127.Final</netty-codec.safe-version>
     </properties>
 
     <!-- 全局使用 -->
@@ -127,31 +128,49 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>${guava.version}</version>
+                <version>${guava.safe-version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>${commons-compress.version}</version>
+                <version>${commons-compress.safe-version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.jboss.xnio</groupId>
                 <artifactId>xnio-api</artifactId>
-                <version>${xnio-api.version}</version>
+                <version>${xnio-api.safe-version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.no-vulnerability-version}</version>
+                <version>${commons-lang3.safe-version}</version>
             </dependency>
 
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>${commons-io.no-vulnerability-version}</version>
+                <version>${commons-io.safe-version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.undertow</groupId>
+                <artifactId>undertow-core</artifactId>
+                <version>${undertow-core.safe-version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec</artifactId>
+                <version>${netty-codec.safe-version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-codec-http</artifactId>
+                <version>${netty-codec.safe-version}</version>
             </dependency>
 
 
@@ -358,6 +377,13 @@
                 <version>${mybatis-plus.version}</version>
             </dependency>
 
+            <!-- mybatis-plus ^3.5.9 需要另外追加 -->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-jsqlparser</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatis-plus-annotation</artifactId>
@@ -504,4 +530,88 @@
         <connection>scm:git:https://github.com/uncarbon97/helio-starters.git</connection>
         <developerConnection>scm:git:https://github.com/uncarbon97/helio-starters.git</developerConnection>
     </scm>
+
+    <profiles>
+        <profile>
+            <id>push-helio-starters-to-maven-central</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Maven 编译插件 -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.8.1</version>
+                        <configuration>
+                            <source>${java.version}</source>
+                            <target>${java.version}</target>
+                        </configuration>
+                    </plugin>
+
+                    <!-- 源码打包插件 -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <version>3.2.1</version>
+                        <executions>
+                            <execution>
+                                <id>attach-sources</id>
+                                <goals><goal>jar-no-fork</goal></goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- Javadoc 打包插件 -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.5.0</version>
+                        <configuration>
+                            <show>private</show>
+                            <nohelp>true</nohelp>
+                            <charset>UTF-8</charset>
+                            <encoding>UTF-8</encoding>
+                            <docencoding>UTF-8</docencoding>
+                            <!-- 解决不规范的Javadoc生成报错 -->
+                            <doclint>none</doclint>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>attach-javadocs</id>
+                                <goals><goal>jar</goal></goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- GPG 签名插件 -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>3.1.0</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals><goal>sign</goal></goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <!-- 部署插件 -->
+                    <plugin>
+                        <groupId>org.sonatype.central</groupId>
+                        <artifactId>central-publishing-maven-plugin</artifactId>
+                        <version>0.8.0</version>
+                        <extensions>true</extensions>
+                        <configuration>
+                            <publishingServerId>central</publishingServerId>
+                            <autoPublish>true</autoPublish>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>