v8.0.6

v8.0.6

NOTICE

@@ -0,0 +1,47 @@
+Bus Framework
+
+   Copyright (c) 2015-2024 miaixz.org and other contributors.
+
+   This product includes software developed by
+   The Miaixz Team (https://www.miaixz.org/).
+
+
+- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+MyBatis
+
+   This product includes software developed by
+   The Apache Software Foundation (https://www.apache.org/).
+
+   Copyright 2010 The Apache Software Foundation
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       https://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+Spring Framework
+
+   All Spring projects are licensed under the terms of the Apache License, Version 2.0
+
+   Copyright 2002-2024 the original author or authors
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -6,7 +6,7 @@
 </p>
 <p align="center">
     <a target="_blank" href="https://search.maven.org/search?q=org.miaixz">
-		<img src="https://img.shields.io/badge/maven--central-v8.0.5-blue.svg?label=Maven%20Central" />
+		<img src="https://img.shields.io/badge/maven--central-v8.0.6-blue.svg?label=Maven%20Central" />
 	</a>
 	<a target="_blank" href="https://travis-ci.org/839128/bus">
 		<img src="https://app.travis-ci.com/839128/bus.svg?token=TZPNK5FQiKMp9cao3SnY&branch=main">
@@ -52,35 +52,35 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java17
 
 ## 组件信息
 
-| 完成  | 模块            | 描述信息                                            |
-|-----|---------------|-------------------------------------------------|
-| [√] | bus-all       | 包含微服务所需的完整模块以及通用组件                              | 
+| 完成  | 模块            | 描述信息                                              |
+|-----|---------------|---------------------------------------------------|
+| [√] | bus-all       | 包含微服务所需的完整模块以及通用组件                                | 
 | [√] | bus-base      | 基础功能及base相关,实体(Entity),服务(Service),接口(Controller) |
-| [√] | bus-bom       | 包含所有组建信息,当然可以通过配置按需加载等                          |
-| [√] | bus-cache     | 缓存服务及工具,支持redis,memcached,,hessian等             |
-| [√] | bus-core      | 核心功能及工具类,包括常量、线程、类加载器、反射、集合、日期等常用工具             |
-| [√] | bus-cron      | 定时器及定时任务等功能                                     |
-| [√] | bus-crypto    | 加密解密，支持支持AES/DES/REA/MD5等常用加密算法                 |
-| [√] | bus-extra     | 扩展功能及文件操作,FTP/文件/二维码/短信相关支持                     |
-| [√] | bus-health    | 应用服务器健康信息，软件硬件信息采集等                             |
-| [√] | bus-http      | HTTP功能封装,根据业务场景可使用 Httpd/Httpx/Httpz 等方式        |
-| [√] | bus-image     | 图像/影像应用服务，解析预览等                                 |
-| [√] | bus-limiter   | 服务限流/降级/提升热点,根据不同业务设置不同策略                       |
-| [√] | bus-logger    | 日志信息及功能，动态检测日志实现的方式，使日志使用个更加便利灵活简单              |
-| [√] | bus-mapper    | 数据操作,在 MyBatis 的基础上只做增强不做改变，为简化开发、提高效率          |
-| [√] | bus-oauth     | 第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)                 |
-| [√] | bus-pager     | 数据分页,mybatis                                    |
-| [√] | bus-office    | office等相关转换及处理,POI封装实现，使Java操作Excel等文件变得简单      |
-| [√] | bus-opencv    | 图像识别及分析，提供丰富的图形图像处理算法,跨平台支持等                    |
-| [√] | bus-proxy     | 公共代理，使动态代理变得简单                                  |
-| [√] | bus-sensitive | 敏感数据脱敏,对应用和使用者透明，业务逻辑无感知，通过配置集成                 |
-| [√] | bus-setting   | 设置工具类， 用于支持设置/配置                                |
-| [√] | bus-shade     | Entity,Service,Mapper等相关代码生成工具                  |
-| [√] | bus-socket    | 基础NIO/AIO通讯,Socket封装，支持TCP/UDP服务端               |
-| [√] | bus-starter   | SpringBoot starter，spring相关配置，启动及相关配置文件信息       |
-| [√] | bus-storage   | 文件存储组件,,支持阿里云、七牛，提供了工厂模式和注入两种集成方式               |
-| [×] | bus-tracer    | 轻量级分布式链路跟踪监控，日志及访问流程追踪以及内部调用链追踪                 |
-| [√] | bus-validate  | 参数校验，会默认拦截所有的标记有`@Valid`的方法或类                   |
+| [√] | bus-bom       | 包含所有组建信息,当然可以通过配置按需加载等                            |
+| [√] | bus-cache     | 缓存服务及工具,支持redis,memcached,,hessian等               |
+| [√] | bus-core      | 核心功能及工具类,包括常量、线程、类加载器、反射、集合、日期等常用工具               |
+| [√] | bus-cron      | 定时器及定时任务等功能                                       |
+| [√] | bus-crypto    | 加密解密，支持支持AES/DES/REA/MD5等常用加密算法                   |
+| [√] | bus-extra     | 扩展功能及文件操作,FTP/文件/二维码/短信相关支持                       |
+| [√] | bus-health    | 应用服务器健康信息，软件硬件信息采集等                               |
+| [√] | bus-http      | HTTP功能封装,根据业务场景可使用 Httpd/Httpx/Httpz 等方式          |
+| [√] | bus-image     | 图像/影像应用服务，解析预览等                                   |
+| [√] | bus-limiter   | 服务限流/降级/提升热点,根据不同业务设置不同策略                         |
+| [√] | bus-logger    | 日志信息及功能，动态检测日志实现的方式，使日志使用个更加便利灵活简单                |
+| [√] | bus-mapper    | 数据操作,在 MyBatis 的基础上只做增强不做改变，为简化开发、提高效率            |
+| [√] | bus-oauth     | 第三方登录,已集成十多家第三方平台(国内外常用的基本都已包含)                   |
+| [√] | bus-pager     | 数据分页,mybatis等                                     |
+| [√] | bus-office    | office等相关转换及处理,POI封装实现，使Java操作Excel等文件变得简单        |
+| [√] | bus-opencv    | 图像识别及分析，提供丰富的图形图像处理算法,跨平台支持等                      |
+| [√] | bus-proxy     | 公共代理，使动态代理变得简单                                    |
+| [√] | bus-sensitive | 敏感数据脱敏,对应用和使用者透明，业务逻辑无感知，通过配置集成                   |
+| [√] | bus-setting   | 设置工具类， 用于支持设置/配置                                  |
+| [√] | bus-shade     | Entity,Service,Mapper等相关代码生成工具                    |
+| [√] | bus-socket    | 基础NIO/AIO通讯,Socket封装，支持TCP/UDP服务端                 |
+| [√] | bus-starter   | SpringBoot starter，spring相关配置，启动及相关配置文件信息         |
+| [√] | bus-storage   | 文件存储组件,,支持阿里云、七牛，提供了工厂模式和注入两种集成方式                 |
+| [×] | bus-tracer    | 轻量级分布式链路跟踪监控，日志及访问流程追踪以及内部调用链追踪                   |
+| [√] | bus-validate  | 参数校验，会默认拦截所有的标记有`@Valid`的方法或类                     |
 
 ## 功能概述
 
@@ -116,7 +116,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java17
 ### Gradle
 
 ```
-implementation 'org.839128:bus-all:x.x.x'
+implementation 'org.miaixz:bus-all:x.x.x'
 ```
 
 ### Downlad

VERSION

@@ -1 +1 @@
-8.0.5
+8.0.6

bus-all/pom.xml

@@ -33,7 +33,7 @@
 
     <groupId>org.miaixz</groupId>
     <artifactId>bus-all</artifactId>
-    <version>8.0.5</version>
+    <version>8.0.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-base/pom.xml

@@ -33,7 +33,7 @@
 
     <groupId>org.miaixz</groupId>
     <artifactId>bus-base</artifactId>
-    <version>8.0.5</version>
+    <version>8.0.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -71,9 +71,9 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
-        <lombok.version>1.18.32</lombok.version>
+        <lombok.version>1.18.34</lombok.version>
         <spring.boot.version>3.3.1</spring.boot.version>
-        <persistence.version>3.2.0</persistence.version>
+        <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
     </properties>
 
     <dependencies>
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${persistence.version}</version>
+            <version>${jakarta.persistence.version}</version>
             <optional>true</optional>
         </dependency>
         <dependency>

bus-base/src/main/java/org/miaixz/bus/base/entity/BaseEntity.java

@@ -54,7 +54,7 @@
 @AllArgsConstructor
 public class BaseEntity extends Tracer {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1L;
 
     /**
      * 数据状态:-1删除,0无效,1正常

bus-bom/pom.xml

@@ -33,7 +33,7 @@
 
     <groupId>org.miaixz</groupId>
     <artifactId>bus-bom</artifactId>
-    <version>8.0.5</version>
+    <version>8.0.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>

bus-cache/pom.xml

@@ -33,7 +33,7 @@
 
     <groupId>org.miaixz</groupId>
     <artifactId>bus-cache</artifactId>
-    <version>8.0.5</version>
+    <version>8.0.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -71,7 +71,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
-        <lombok.version>1.18.32</lombok.version>
+        <lombok.version>1.18.34</lombok.version>
         <spring.boot.version>3.3.1</spring.boot.version>
         <guice.version>7.0.0</guice.version>
         <jedis.version>5.1.3</jedis.version>

bus-cache/src/main/java/org/miaixz/bus/cache/Complex.java

@@ -35,9 +35,9 @@
 import org.miaixz.bus.cache.support.CacheInfoContainer;
 import org.miaixz.bus.cache.support.KeyGenerator;
 import org.miaixz.bus.cache.support.SpelCalculator;
-import org.miaixz.bus.core.annotation.Inject;
-import org.miaixz.bus.core.annotation.Named;
-import org.miaixz.bus.core.annotation.Singleton;
+import org.miaixz.bus.core.lang.annotation.Inject;
+import org.miaixz.bus.core.lang.annotation.Named;
+import org.miaixz.bus.core.lang.annotation.Singleton;
 import org.miaixz.bus.logger.Logger;
 import org.miaixz.bus.proxy.invoker.ProxyChain;
 

bus-cache/src/main/java/org/miaixz/bus/cache/Manage.java

@@ -29,8 +29,8 @@
 
 import org.miaixz.bus.cache.magic.CacheKeys;
 import org.miaixz.bus.cache.magic.CachePair;
-import org.miaixz.bus.core.annotation.Inject;
-import org.miaixz.bus.core.annotation.Singleton;
+import org.miaixz.bus.core.lang.annotation.Inject;
+import org.miaixz.bus.core.lang.annotation.Singleton;
 import org.miaixz.bus.core.lang.exception.InternalException;
 import org.miaixz.bus.core.xyz.StringKit;
 import org.miaixz.bus.logger.Logger;

bus-cache/src/main/java/org/miaixz/bus/cache/magic/MultiCacheReader.java

@@ -31,8 +31,8 @@
 import org.miaixz.bus.cache.Hitting;
 import org.miaixz.bus.cache.Manage;
 import org.miaixz.bus.cache.support.*;
-import org.miaixz.bus.core.annotation.Inject;
-import org.miaixz.bus.core.annotation.Singleton;
+import org.miaixz.bus.core.lang.annotation.Inject;
+import org.miaixz.bus.core.lang.annotation.Singleton;
 import org.miaixz.bus.logger.Logger;
 import org.miaixz.bus.proxy.invoker.ProxyChain;
 

bus-cache/src/main/java/org/miaixz/bus/cache/magic/SingleCacheReader.java

@@ -33,8 +33,8 @@
 import org.miaixz.bus.cache.support.KeyGenerator;
 import org.miaixz.bus.cache.support.PatternGenerator;
 import org.miaixz.bus.cache.support.PreventObjects;
-import org.miaixz.bus.core.annotation.Inject;
-import org.miaixz.bus.core.annotation.Singleton;
+import org.miaixz.bus.core.lang.annotation.Inject;
+import org.miaixz.bus.core.lang.annotation.Singleton;
 import org.miaixz.bus.logger.Logger;
 import org.miaixz.bus.proxy.invoker.ProxyChain;
 

bus-cache/src/main/java/org/miaixz/bus/cache/support/PreventObjects.java

@@ -45,7 +45,7 @@ public static boolean isPrevent(Object object) {
 
     private static final class PreventObject implements Serializable {
 
-        private static final long serialVersionUID = 1L;
+        private static final long serialVersionUID = -1L;
 
         private static final PreventObject INSTANCE = new PreventObject();
     }

bus-core/pom.xml

@@ -33,7 +33,7 @@
 
     <groupId>org.miaixz</groupId>
     <artifactId>bus-core</artifactId>
-    <version>8.0.5</version>
+    <version>8.0.6</version>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
@@ -71,8 +71,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
-        <lombok.version>1.18.32</lombok.version>
-        <persistence.version>3.2.0</persistence.version>
+        <lombok.version>1.18.34</lombok.version>
+        <jakarta.persistence.version>3.2.0</jakarta.persistence.version>
     </properties>
 
     <dependencies>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
-            <version>${persistence.version}</version>
+            <version>${jakarta.persistence.version}</version>
             <optional>true</optional>
         </dependency>
     </dependencies>

bus-core/src/main/java/org/miaixz/bus/core/Binder.java

@@ -28,14 +28,16 @@
 package org.miaixz.bus.core;
 
 import lombok.RequiredArgsConstructor;
-import org.miaixz.bus.core.annotation.Ignore;
-import org.miaixz.bus.core.annotation.Values;
 import org.miaixz.bus.core.convert.Convert;
 import org.miaixz.bus.core.io.resource.PropertySource;
 import org.miaixz.bus.core.lang.Assert;
 import org.miaixz.bus.core.lang.Symbol;
+import org.miaixz.bus.core.lang.annotation.Ignore;
+import org.miaixz.bus.core.lang.annotation.Values;
 import org.miaixz.bus.core.lang.exception.InternalException;
+import org.miaixz.bus.core.lang.reflect.JdkProxy;
 import org.miaixz.bus.core.xyz.FieldKit;
+import org.miaixz.bus.core.xyz.StringKit;
 
 import java.lang.reflect.Field;
 import java.util.*;
@@ -163,7 +165,7 @@ public <T> T bind(Class<T> clazz, String prefix) {
             throw new InternalException(e);
         }
 
-        Class<?> actualClass = null;// ClassKit.getCglibActualClass(clazz);
+        Class<?> actualClass = JdkProxy.getCglibActualClass(clazz);
         boolean b = (null == prefix || Symbol.DOT.equals(prefix)) && actualClass.isAnnotationPresent(Values.class);
         if (b) {
             prefix = actualClass.getAnnotation(Values.class).value();
@@ -180,12 +182,12 @@ public <T> T bind(Class<T> clazz, String prefix) {
      * @return the object
      */
     public <T> T bind(T object, String prefix) {
-        /* if (!StringKit.hasText(prefix) || Symbol.DOT.equals(prefix)) {
+        if (!StringKit.hasText(prefix) || Symbol.DOT.equals(prefix)) {
             prefix = null;
         }
-       for (Field field : ClassKit.getDeclaredFields(object.getClass())) {
+        for (Field field : FieldKit.getFields(object.getClass())) {
             bindField(object, field, prefix);
-        }*/
+        }
         return object;
     }
 

bus-core/src/main/java/org/miaixz/bus/core/Version.java

@@ -49,7 +49,7 @@ public class Version implements Comparable<Version>, Serializable {
     /**
      * 版本信息
      */
-    public static final String _VERSION = "8.0.5";
+    public static final String _VERSION = "8.0.6";
 
     private static final long serialVersionUID = -1L;
     private final String version;

bus-core/src/main/java/org/miaixz/bus/core/basics/entity/Entity.java

@@ -51,7 +51,7 @@
 @AllArgsConstructor
 public class Entity implements Serializable {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1L;
 
     /**
      * 数据主键

bus-core/src/main/java/org/miaixz/bus/core/basics/entity/OAuth2.java

@@ -47,7 +47,7 @@
 @AllArgsConstructor
 public class OAuth2 extends Entity {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1L;
 
     /**
      * 当前用户标识

bus-core/src/main/java/org/miaixz/bus/core/basics/entity/Result.java

@@ -49,7 +49,7 @@
 @AllArgsConstructor
 public class Result<T> {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = -1L;
 
     /**
      * 总数据

bus-core/src/main/java/org/miaixz/bus/core/beans/BeanInfoCache.java → bus-core/src/main/java/org/miaixz/bus/core/beans/BeanCache.java

@@ -41,7 +41,7 @@
  * @author Kimi Liu
  * @since Java 17+
  */
-public enum BeanInfoCache {
+public enum BeanCache {
 
     /**
      * 单例