diff --git a/README.md b/README.md index caf61ce1a9..5d75929568 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

- + @@ -98,7 +98,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav org.aoju bus-all - 6.1.5 + 6.1.6 ``` @@ -115,7 +115,7 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架,它基于Jav ### Gradle ``` -implementation 'org.aoju:bus-all:6.1.5' +implementation 'org.aoju:bus-all:6.1.6' ``` ### Downlad diff --git a/bus-all/pom.xml b/bus-all/pom.xml index ba9548d1c2..80abe11362 100755 --- a/bus-all/pom.xml +++ b/bus-all/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-all - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-all/src/main/java/org/aoju/bus/Bus.java b/bus-all/src/main/java/org/aoju/bus/Bus.java index fbde4c1fc5..618eed7eab 100644 --- a/bus-all/src/main/java/org/aoju/bus/Bus.java +++ b/bus-all/src/main/java/org/aoju/bus/Bus.java @@ -43,7 +43,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Bus extends Version { diff --git a/bus-base/pom.xml b/bus-base/pom.xml index c2e1bd2fa6..3b8bb6ed42 100755 --- a/bus-base/pom.xml +++ b/bus-base/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-base - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java b/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java index f903c24ca6..768165ed4d 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java +++ b/bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java @@ -48,7 +48,7 @@ * 异常信息拦截处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ControllerAdvice diff --git a/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java b/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java index bfee6846be..3ee80802fd 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java +++ b/bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java @@ -32,7 +32,7 @@ * 公共常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Consts extends Normal { diff --git a/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java b/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java index 7145e8436e..6aca91a5ba 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java +++ b/bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java @@ -35,7 +35,7 @@ * 系统响应码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ErrorCode { diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java b/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java index 388c9ae30c..25e6a11f22 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java @@ -40,7 +40,7 @@ * Entity 基本信息. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java index d223d1f1e9..efb24194d1 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java @@ -34,7 +34,7 @@ * Entity 实体 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java index 7098a2747a..d0e48f70f4 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Message.java @@ -34,7 +34,7 @@ * 返回值公用类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java b/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java index d076703b74..76e7d8dbfe 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java @@ -34,7 +34,7 @@ * 授权公用类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java index b1a9d1c565..3b64e0a7a6 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Result.java @@ -36,7 +36,7 @@ * 返回结果公用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java b/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java index 079075562c..f285866358 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java +++ b/bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java @@ -34,7 +34,7 @@ * 访问链路跟踪 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java b/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java index 4ad12367fd..af80d3b366 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java +++ b/bus-base/src/main/java/org/aoju/bus/base/mapper/BaseMapper.java @@ -29,7 +29,7 @@ * BaseMapper 接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BaseMapper extends Mapper { diff --git a/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java b/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java index 372920e5a1..33f3b836a8 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java +++ b/bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java @@ -29,7 +29,7 @@ * CoreMapper 接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Mapper extends org.aoju.bus.mapper.common.Mapper { diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java b/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java index e2e5604cff..e470849356 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java +++ b/bus-base/src/main/java/org/aoju/bus/base/service/BaseService.java @@ -33,7 +33,7 @@ * BaseService 接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BaseService extends Service { diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/Service.java b/bus-base/src/main/java/org/aoju/bus/base/service/Service.java index 71fe8ff09b..767bb21156 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/service/Service.java +++ b/bus-base/src/main/java/org/aoju/bus/base/service/Service.java @@ -28,7 +28,7 @@ * Service 接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Service { diff --git a/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java b/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java index 34be72ea0b..562de328ac 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java +++ b/bus-base/src/main/java/org/aoju/bus/base/service/impl/BaseServiceImpl.java @@ -44,7 +44,7 @@ * BaseService 接口实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaseServiceImpl, T extends BaseEntity> diff --git a/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java b/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java index 4d894184a2..f4769dfd93 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java +++ b/bus-base/src/main/java/org/aoju/bus/base/spring/BaseController.java @@ -36,7 +36,7 @@ * 基础请求封装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaseController, T> extends Controller { diff --git a/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java b/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java index bb1a70c66b..03036a39ff 100755 --- a/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java +++ b/bus-base/src/main/java/org/aoju/bus/base/spring/Controller.java @@ -33,7 +33,7 @@ * 基础输出封装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Controller { diff --git a/bus-bom/pom.xml b/bus-bom/pom.xml index 2244eb7e84..51001a17e3 100755 --- a/bus-bom/pom.xml +++ b/bus-bom/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-bom - 6.1.5 + 6.1.6 pom ${project.artifactId} diff --git a/bus-cache/README.md b/bus-cache/README.md index 89ebfc5fc9..c8c433bec7 100755 --- a/bus-cache/README.md +++ b/bus-cache/README.md @@ -69,7 +69,7 @@ Object func(@CacheKey("#arg0[#i]") List ids){ org.aoju.bus bus-cache - 6.1.5 + 6.1.6 ``` diff --git a/bus-cache/pom.xml b/bus-cache/pom.xml index 9ab5cb14ad..ab71be10f2 100755 --- a/bus-cache/pom.xml +++ b/bus-cache/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-cache - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java b/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java index 70c393bca4..820f900491 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/CacheX.java @@ -32,7 +32,7 @@ * 缓存接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java b/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java index c8ff02cbc2..95bec5ec58 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Complex.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Context.java b/bus-cache/src/main/java/org/aoju/bus/cache/Context.java index 5996defa03..6695ab5ba6 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Context.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Context.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Context { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java index 869941d743..9a197abf4e 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Hitting.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java b/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java index a461aa9cbb..7541ba80e3 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Manage.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/Module.java b/bus-cache/src/main/java/org/aoju/bus/cache/Module.java index c4ae6ba1d0..68596e3e93 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/Module.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/Module.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Module extends AbstractModule { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java index 1b578c96d9..43dafa06a4 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CacheKey.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java index 11e9739d33..5b816e48c0 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Cached.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java index ba278b89dd..54dbbdee1d 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/CachedGet.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java index 44033a598a..3f47c6da04 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/annotation/Invalid.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java index a8ef2810d5..1c5e1c45ed 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AbstractReader.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractReader { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java index f302601dac..99a97bf768 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/AnnoHolder.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AnnoHolder { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java index d63f836e8a..607262141f 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheExpire.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CacheExpire { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java index 72af29b429..0816ca6a52 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CacheKeys.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CacheKeys { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java index 71fff18c81..1dcd0eaed7 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/CachePair.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CachePair { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java index 7b7c61e525..d5086a9c9d 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MethodHolder.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java index 187c975c5e..649afbae1b 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/MultiCacheReader.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java b/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java index 1e982f607a..9399787aae 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/magic/SingleCacheReader.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Singleton diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java index 1005821c50..b4291599f1 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/EhCache.java @@ -47,7 +47,7 @@ * 具有快速、精干等特点 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EhCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java index d4b16f805f..1a7e39209c 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/ExtendCache.java @@ -29,7 +29,7 @@ * 缓存接口,方便用户扩展 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ExtendCache { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java index a74d38d0f7..f43fffcff0 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/GuavaCache.java @@ -39,7 +39,7 @@ * Guava 缓存支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GuavaCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java index be8cd92b0d..fad42624eb 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemcachedCache.java @@ -44,7 +44,7 @@ * Memcached 缓存支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MemcachedCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java index bf441b69f4..a9b3b743f9 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/MemoryCache.java @@ -47,7 +47,7 @@ * 内存缓存支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MemoryCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java index 5ed43317eb..406006557c 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/NoOpCache.java @@ -35,7 +35,7 @@ * 无缓存实现,用于快速关闭缓存 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NoOpCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java index 50b7a386c7..0c0d4b38e9 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisCache.java @@ -43,7 +43,7 @@ * Redis 单机缓存支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RedisCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java index d654303366..93ab4fb12c 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/metric/RedisClusterCache.java @@ -39,7 +39,7 @@ * Redis 集群缓存支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RedisClusterCache implements CacheX { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java index 3d2e0ae51e..fe1f22e440 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/AbstractHitting.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractHitting implements Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java index 636de20bfa..f4bbabcbb8 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/H2Hitting.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class H2Hitting extends AbstractHitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java index 5b8baa29cb..2f4bd84c26 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MemoryHitting.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MemoryHitting implements Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java index 07868d036f..a7f7a83248 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/MySQLHitting.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MySQLHitting extends AbstractHitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java index ac20cee63d..1cdc87a97f 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/SqliteHitting.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqliteHitting extends AbstractHitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java b/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java index 2d7a0bd78a..87a811ec35 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/provider/ZookeeperHitting.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ZookeeperHitting implements Hitting { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java index 085c9e4850..07bae36966 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/AbstractSerializer.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSerializer implements BaseSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java index 4437f90b18..799091fe6b 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/BaseSerializer.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BaseSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java index 3a8aa3a36f..762f761874 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/FastJsonSerializer.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FastJsonSerializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java index 9cd9c7384a..ec3998ff2b 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/Hessian2Serializer.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Hessian2Serializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java index d95269330c..1c789802c2 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkGzipSerializer.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkGzipSerializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java index 194c206065..e3e27012c4 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/serialize/JdkSerializer.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkSerializer extends AbstractSerializer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java index c93089623a..227be2c821 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/Addables.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Addables { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java index bebe5fa6ac..6f8ac1beb3 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/ArgNameGenerator.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArgNameGenerator { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java index a6d216f5e0..41be6caef0 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/CacheInfoContainer.java @@ -49,7 +49,7 @@ * 定位: 将@Cached、@Invalid、@CachedGet、(@CachedPut未来)以及将@CacheKey整体融合到一起 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CacheInfoContainer { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java index 5fd9827574..eb4c5f6308 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyGenerator.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class KeyGenerator { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java index 50c81d0840..faf308dadb 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/KeyValue.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class KeyValue { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java index 9366e7006b..ad79c6f9e6 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/PatternGenerator.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PatternGenerator { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java index cd61918866..95bb2cc1d5 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/PreventObjects.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PreventObjects { diff --git a/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java b/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java index bb8cce5545..e1f9e9fff6 100755 --- a/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java +++ b/bus-cache/src/main/java/org/aoju/bus/cache/support/SpelCalculator.java @@ -36,7 +36,7 @@ * Spel表达式的计算功能(@Cached内的condition、@CacheKey内的spel只是作为一个增值服务, 并不作为核心功能, 只是作为key拼装的一个亮点, 并不是必须功能) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SpelCalculator { diff --git a/bus-core/README.md b/bus-core/README.md index cb3cada07c..49af43de36 100755 --- a/bus-core/README.md +++ b/bus-core/README.md @@ -14,7 +14,7 @@ org.aoju bus-core - 6.1.5 + 6.1.6 ``` diff --git a/bus-core/pom.xml b/bus-core/pom.xml index 3ae0de0c6d..37b4dd9d6f 100755 --- a/bus-core/pom.xml +++ b/bus-core/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-core - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-core/src/main/java/org/aoju/bus/core/Binder.java b/bus-core/src/main/java/org/aoju/bus/core/Binder.java index e1feadfbb2..61441e6013 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Binder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Binder.java @@ -43,7 +43,7 @@ * 属性绑定器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @RequiredArgsConstructor diff --git a/bus-core/src/main/java/org/aoju/bus/core/Order.java b/bus-core/src/main/java/org/aoju/bus/core/Order.java index 3414da680f..275a538179 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Order.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Order.java @@ -29,7 +29,7 @@ * 排序 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Order extends Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/Plugin.java b/bus-core/src/main/java/org/aoju/bus/core/Plugin.java index de1cef2d04..ef2fb49b2a 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Plugin.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Plugin.java @@ -29,7 +29,7 @@ * 插件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Plugin extends Order { diff --git a/bus-core/src/main/java/org/aoju/bus/core/Version.java b/bus-core/src/main/java/org/aoju/bus/core/Version.java index f18957689f..6007bc651c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/Version.java +++ b/bus-core/src/main/java/org/aoju/bus/core/Version.java @@ -34,7 +34,7 @@ * Version is Licensed under the MIT License, Version 3.0.0 (the "License") * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Version { @@ -61,7 +61,7 @@ public class Version { * @return 项目的版本号 */ public static String get() { - return "6.1.5.RELEASE"; + return "6.1.6.RELEASE"; } /** diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java index 11952b0d4a..b15b23f585 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Alias.java @@ -34,7 +34,7 @@ * 用于字段、方法、参数等提供别名 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java index 628d7b9330..cda414a586 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Async.java @@ -36,7 +36,7 @@ * 将类或方法标记为异步 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java index c4bcef9b61..57f08ba305 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Binding.java @@ -34,7 +34,7 @@ * 用于绑定的注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target(ElementType.ANNOTATION_TYPE) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java index 2bac7967c5..daae558782 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Copyable.java @@ -29,7 +29,7 @@ * 设置返回元素的类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java index a79cdd98b0..b8577ded22 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Element.java @@ -39,7 +39,7 @@ * 核心实现使用了递归获取指定元素上的注解以及注解的注解,以实现复合注解的获取 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Element implements AnnotatedElement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java index fd0ceed7f9..7920835bed 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/GuardeBy.java @@ -34,7 +34,7 @@ * 有助于代码的维护与审查,以及一些自动化的分析工具找到潜在的安全性错误 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java index 611dfed5eb..e38e8c057d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Immutable.java @@ -31,7 +31,7 @@ * 不可变类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java index 1207c011e0..409efe739b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Inject.java @@ -31,7 +31,7 @@ * 注释实现类的成员(构造函数、方法和字段) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.CONSTRUCTOR, ElementType.FIELD}) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java index 63fae90d1f..6e17055095 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Label.java @@ -34,7 +34,7 @@ * 用于在输出到CLI表或Excel/CSV等时为字段/getter提供标签. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java index 664678c3df..0cc547bac6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Lazy.java @@ -35,7 +35,7 @@ * 或者标记为不受立即加载影响的方法(例如,AppConfig中的方法) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.TYPE, ElementType.METHOD}) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java index c031c524b4..80d9706d07 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Metadata.java @@ -31,7 +31,7 @@ * 元注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java index 99b6e1f55c..4ccc0deab3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Named.java @@ -34,7 +34,7 @@ * 注解命名 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Binding diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java index 903ea1af80..b9cacc952f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/NotThreadSafe.java @@ -31,7 +31,7 @@ * 线程不安全安全注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java index 15f40f02b1..a1934b75b1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Qualifier.java @@ -32,7 +32,7 @@ * 标识qualifier注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target(ElementType.ANNOTATION_TYPE) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java index a45cbe7c74..6b6e1da018 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/SPI.java @@ -48,7 +48,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java index 08dc2b3a09..18374d4f61 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scheduled.java @@ -33,7 +33,7 @@ * 定时任务注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java index 59857a6f41..26a6ac11ea 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Scope.java @@ -35,7 +35,7 @@ * 注释用于确定作用域的注释. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target(ElementType.ANNOTATION_TYPE) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java index c5bf2502af..bb377a0b97 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Singleton.java @@ -34,7 +34,7 @@ * 当您希望仅对该绑定的所有注入重用一个实例时,将此应用于实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Scope diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java index 88bd4d357b..02af83e1b0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/ThreadSafe.java @@ -37,7 +37,7 @@ * 后期用途:可能会直接基于 class 进行反射创建,要求有些类需要显示指定这个注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java index e91d48bc5d..464bb24ef5 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/Trace.java @@ -33,7 +33,7 @@ * 日志追溯 * * @author Kimi Liu - * @version 5.9.9 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.PARAMETER, ElementType.METHOD}) diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java index 630b7f821b..dab061773b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Dev.java @@ -32,7 +32,7 @@ * 表示当前方法禁止用于生产环境,仅可用于开发测试 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java index bad70e8984..da88c25490 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java +++ b/bus-core/src/main/java/org/aoju/bus/core/annotation/env/Prod.java @@ -32,7 +32,7 @@ * 表示当前方法性能安全性各方面达标,可以用于生产环境 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java index 70c41e2422..d1ec877e6e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDesc.java @@ -55,7 +55,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanDesc implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java index 57b85b0fd8..f5b6e48760 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanDescCache.java @@ -33,7 +33,7 @@ * 缓存用于防止多次反射造成的性能问题 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum BeanDescCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java index b174ba779b..8ae8a4800f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanInfoCache.java @@ -36,7 +36,7 @@ * 缓存用于防止多次反射造成的性能问题 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum BeanInfoCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java index 22687469c6..3ec919f4f3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/BeanPath.java @@ -51,7 +51,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanPath implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java b/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java index c1f2a4ad1e..bec2f66579 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/DynaBean.java @@ -41,7 +41,7 @@ * 支持Map和普通Bean * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DynaBean extends Support implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/WrapperBean.java b/bus-core/src/main/java/org/aoju/bus/core/beans/WrapperBean.java index 2694a480d0..6233f2fd3a 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/WrapperBean.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/WrapperBean.java @@ -30,7 +30,7 @@ * * @param Null值对应的类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WrapperBean { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java index baa283f224..3b8f5eec47 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/BeanCopier.java @@ -45,7 +45,7 @@ * * @param 目标对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanCopier implements Copier, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java index ce734abe92..88f308779f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/CopyOptions.java @@ -38,7 +38,7 @@ * 3、忽略的属性列表,设置一个属性列表,不拷贝这些属性值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CopyOptions { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java index 2d3e6bd4ee..7820e71723 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/ValueProvider.java @@ -35,7 +35,7 @@ * * @param KEY类型,一般情况下为 {@link String} * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ValueProvider { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java index 785c4d3d96..8146f3b383 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/BeanValueProvider.java @@ -41,7 +41,7 @@ * Bean的值提供者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanValueProvider implements ValueProvider { diff --git a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java index 675817810a..abf2cf02a5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java +++ b/bus-core/src/main/java/org/aoju/bus/core/beans/copier/provider/MapValueProvider.java @@ -37,7 +37,7 @@ * Map值提供者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapValueProvider implements ValueProvider { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java index 6a1818a132..df81647c2e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/Builder.java @@ -32,7 +32,7 @@ * * @param 建造对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Builder extends Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java index fd029d132a..86e54772ce 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/CompareBuilder.java @@ -70,7 +70,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompareBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java b/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java index aab6d18f91..744dc38aa2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/Different.java @@ -38,7 +38,7 @@ * * @param 这个{@code Diff}中包含的对象类型. * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Different extends Pair { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java index 3105f03226..64f7be6a3c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentBuilder.java @@ -59,7 +59,7 @@ * {@link DifferentResult#toString(ToStringStyle)}覆盖此样式选择。. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Differentable * @see Different * @see DifferentResult diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java index ff612c4561..6e89b4cc3f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/DifferentResult.java @@ -38,7 +38,7 @@ * 该方法返回一个字符串,该字符串描述对象之间不同的字段. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DifferentResult implements Iterable> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java b/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java index 34ae2e71cb..96ad2074b2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/Differentable.java @@ -41,7 +41,7 @@ * * @param 这个对象可能被区分的对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Differentable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java index 831ba40154..7b09f270ea 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsBuilder.java @@ -63,7 +63,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EqualsBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java index ff1a275361..ec373b4b35 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/EqualsExclude.java @@ -35,7 +35,7 @@ * 上的各种reflectionEquals方法使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java index 1eb9997195..98b058da99 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeBuilder.java @@ -64,7 +64,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HashCodeBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java index 0b495c9bd7..e0ddf30270 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/HashCodeExclude.java @@ -35,7 +35,7 @@ * 上的各种reflectionHashcode方法使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java index b85bb71f2b..558b523fd0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/MultilineToStringStyle.java @@ -54,7 +54,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MultilineToStringStyle extends RecursiveToStringStyle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java index 8c0962d50b..8c7f5c953a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/RecursiveToStringStyle.java @@ -54,7 +54,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RecursiveToStringStyle extends ToStringStyle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java index c02e5881d6..144e0ec47e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionBuilder.java @@ -59,7 +59,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReflectionBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java index 03e754415a..df5fbfaefb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ReflectionToStringBuilder.java @@ -56,7 +56,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReflectionToStringBuilder extends ToStringBuilder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java index 433164f403..efb7280cb8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/StandardToStringStyle.java @@ -34,7 +34,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StandardToStringStyle extends ToStringStyle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java index 40e997008f..924421e6b6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringBuilder.java @@ -64,7 +64,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ToStringBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java index 278ed60a28..3171509ddb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringExclude.java @@ -34,7 +34,7 @@ * 使用这个注释来排除字段被{@link ReflectionToStringBuilder}使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java index 5acb5e1345..3eda07a160 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringStyle.java @@ -63,7 +63,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class ToStringStyle implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java index d3ce366ebb..9bbbac3e01 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java +++ b/bus-core/src/main/java/org/aoju/bus/core/builder/ToStringSummary.java @@ -35,7 +35,7 @@ * 在字段上使用这个注释来获得摘要,而不是详细信息. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java b/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java index f544b59e00..9ae9e3a383 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/clone/Cloneable.java @@ -32,7 +32,7 @@ * * @param 实现克隆接口的类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Cloneable extends java.lang.Cloneable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java b/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java index 2189d10a37..c070b932f5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java +++ b/bus-core/src/main/java/org/aoju/bus/core/clone/Support.java @@ -34,7 +34,7 @@ * * @param 继承类的类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Support implements Cloneable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java b/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java index 4b509be89d..3e7412a548 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/BCD.java @@ -34,7 +34,7 @@ * 使二进制和十进制之间的转换得以快捷的进行 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BCD { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java index 434e9e2f60..fbb7bd2684 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base32.java @@ -37,7 +37,7 @@ * see http://blog.csdn.net/earbao/article/details/44453937 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Base32 { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java index c65a536ce8..f961d4fc25 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64.java @@ -41,7 +41,7 @@ * 也就是三位二进制数组经过编码后变为四位的ASCII字符显示,长度比原来增加1/3 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Base64 { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java index ad69f4317c..eb114df25b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Decoder.java @@ -38,7 +38,7 @@ * Base64解码实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Base64Decoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java index a467d778df..871413ec81 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Base64Encoder.java @@ -35,7 +35,7 @@ * Base64编码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Base64Encoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java index a3edea758f..fa41867dc0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Caesar.java @@ -31,7 +31,7 @@ * 凯撒密码实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Caesar { diff --git a/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java b/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java index 7c0ed9bdaf..0acd9fdba9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java +++ b/bus-core/src/main/java/org/aoju/bus/core/codec/Morse.java @@ -37,7 +37,7 @@ * 莫尔斯电码的编码和解码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Morse { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java b/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java index 5a6c2a0a12..2c9e9237db 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/ArrayIterator.java @@ -38,7 +38,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArrayIterator implements Iterator, Iterable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java b/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java index a2f8c533e3..4d3b1c1f2a 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/ConcurrentHashSet.java @@ -35,7 +35,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConcurrentHashSet extends AbstractSet implements java.io.Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java b/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java index be3f5d204d..df20eefe5e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/CopiedIter.java @@ -41,7 +41,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CopiedIter implements Iterator, Iterable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java b/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java index 8f17998a65..d0f63bfa26 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/EnumerationIter.java @@ -33,7 +33,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EnumerationIter implements Iterator, Iterable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java b/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java index 41b01fbaea..102d8bb94b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/IteratorEnumeration.java @@ -33,7 +33,7 @@ * * @param 元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IteratorEnumeration implements Enumeration { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java b/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java index 857804b15d..3eeb26d864 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/LineIter.java @@ -39,7 +39,7 @@ * 此对象遍历结束后,应关闭之,推荐使用方式: * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LineIter implements Iterator, Iterable, Closeable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java b/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java index 800d3281a3..9ac0ac1afc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java +++ b/bus-core/src/main/java/org/aoju/bus/core/collection/PriorityQueue.java @@ -33,7 +33,7 @@ * 按照给定的排序规则淘汰末尾元素 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PriorityQueue extends java.util.PriorityQueue { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java b/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java index 25a6550c95..2e67995237 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/Comparables.java @@ -33,7 +33,7 @@ * * @param 比较对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Comparables> implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java b/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java index 29bcfb826b..375957ae40 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/CompareChain.java @@ -36,7 +36,7 @@ * 此类copy from Apache-commons-collections * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompareChain implements Chain, CompareChain>, Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java index f86189925a..cdd0100dec 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/FieldCompare.java @@ -41,7 +41,7 @@ * * @param 被比较的Bean * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FieldCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java index 3cb6c6c122..94b4b52f09 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/IndexedCompare.java @@ -36,7 +36,7 @@ * * @param 被排序元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IndexedCompare implements Comparator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java index f02eadf582..386d9b156c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/InstanceCompare.java @@ -34,7 +34,7 @@ * * @param 用于比较的对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InstanceCompare implements Comparator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java index 4f7953ae47..69dbf1bb37 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/PinyinCompare.java @@ -34,7 +34,7 @@ * 按照GBK拼音顺序对给定的汉字字符串排序 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PinyinCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java index 3d0d142dd1..6b3098f0e0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/PropertyCompare.java @@ -38,7 +38,7 @@ * * @param 被比较的Bean * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PropertyCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java index fd94e16c1b..a75f48d205 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/ReverseCompare.java @@ -33,7 +33,7 @@ * * @param 被比较对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReverseCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java b/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java index 6a5775e299..df4853e274 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java +++ b/bus-core/src/main/java/org/aoju/bus/core/compare/VersionCompare.java @@ -39,7 +39,7 @@ * 支持如:1.3.20.8,6.82.20160101,8.5a/8.5c等版本形式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class VersionCompare implements Comparator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java index 0bd096cff9..2a5c65971c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AbstractConverter.java @@ -37,7 +37,7 @@ * 转换器不会抛出转换异常,转换失败时会返回{@code null} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractConverter implements Converter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java index 211eca8e9b..628f5c4e03 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ArrayConverter.java @@ -41,7 +41,7 @@ * 数组转换器,包括原始类型数组 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArrayConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java index ee9df211c6..0b4a4d7943 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicBooleanConverter.java @@ -33,7 +33,7 @@ * {@link AtomicBoolean}转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AtomicBooleanConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicIntegerArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicIntegerArrayConverter.java index e29fce0950..ab30990338 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicIntegerArrayConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicIntegerArrayConverter.java @@ -31,7 +31,7 @@ * {@link AtomicIntegerArray}转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AtomicIntegerArrayConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicLongArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicLongArrayConverter.java index f924de19c1..c5e13a6469 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicLongArrayConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicLongArrayConverter.java @@ -31,7 +31,7 @@ * {@link AtomicLongArray}转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AtomicLongArrayConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java index 16b623c524..13efbcb419 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/AtomicReferenceConverter.java @@ -34,7 +34,7 @@ * {@link AtomicReference}转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AtomicReferenceConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java b/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java index 22df6bf82b..b013608b77 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/BasicType.java @@ -33,7 +33,7 @@ * 基本类型枚举包括原始类型和包装类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum BasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java index 624ca0614c..4e45afb342 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/BeanConverter.java @@ -47,7 +47,7 @@ * * @param Bean类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java index d920696ec9..f814007e0e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/BooleanConverter.java @@ -31,7 +31,7 @@ * 波尔转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BooleanConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java index 8012cfb4e5..377652d700 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ByteArrayConverter.java @@ -31,7 +31,7 @@ * byte 类型数组转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ByteArrayConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java index 454434316d..71b1b8b455 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CalendarConverter.java @@ -35,7 +35,7 @@ * 日期转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CalendarConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java index 7760609978..4a7a78fb91 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CastConverter.java @@ -32,7 +32,7 @@ * * @param 强制转换到的类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CastConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java index 6bc733fc54..7a082fe81c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CharacterConverter.java @@ -32,7 +32,7 @@ * 字符转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CharacterConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java index 14dca2e065..a1416af18a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CharsetConverter.java @@ -31,7 +31,7 @@ * 编码对象转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CharsetConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java index 7ba4a6f71b..5532abf5d2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ClassConverter.java @@ -32,7 +32,7 @@ * 将类名转换为类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ClassConverter extends AbstractConverter> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java index 96aa9a5faa..cb1561f375 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CollectionConverter.java @@ -36,7 +36,7 @@ * 各种集合类转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CollectionConverter implements Converter> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java b/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java index b9bdb008c2..b25619732c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/Convert.java @@ -46,7 +46,7 @@ * 类型转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Convert { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java index 2cb90c6164..b2096e21a4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/Converter.java @@ -29,7 +29,7 @@ * 转换器接口,实现类型转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Converter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java index 6d8ab198b0..8e02747b09 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ConverterRegistry.java @@ -54,7 +54,7 @@ * 转换器,默认转换器预定义的一些转换器,自定义转换器存放用户自定的转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConverterRegistry { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java index 7fe1995428..53a1677d16 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/CurrencyConverter.java @@ -31,7 +31,7 @@ * 货币{@link Currency} 转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CurrencyConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java index d43dc277ca..011fe6b31c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/DateConverter.java @@ -37,7 +37,7 @@ * 日期转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DateConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java index 0a4158de6a..60d9a20165 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/DurationConverter.java @@ -32,7 +32,7 @@ * {@link Duration}对象转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DurationConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java index 3e85916c2c..819d6fee4a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/EnumConverter.java @@ -37,7 +37,7 @@ * 无泛型检查的枚举转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EnumConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java index ca82870946..f0f982e9d7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/GenericEnumConverter.java @@ -29,7 +29,7 @@ * 泛型枚举转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GenericEnumConverter> extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java index 0814bcdccf..8827caa37f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/LocaleConverter.java @@ -35,7 +35,7 @@ * 只提供String转换支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LocaleConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java index 3a5f9da3b2..c4463ad093 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/MapConverter.java @@ -39,7 +39,7 @@ * {@link Map} 转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapConverter extends AbstractConverter> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java index ee6e274063..dc2ab3e274 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberChinese.java @@ -38,7 +38,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NumberChinese { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java index 17dc63b417..572ba2d47c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberConverter.java @@ -56,7 +56,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NumberConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java index b075be3cc8..86538e885b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/NumberWord.java @@ -34,7 +34,7 @@ * 将浮点数类型的number转换成英语的表达方式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NumberWord { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java index 68d921ba52..1ddbc5797c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/OptionalConverter.java @@ -31,7 +31,7 @@ * {@link Optional}对象转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OptionalConverter extends AbstractConverter> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java index 803afe6ce4..e50f2dc21f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/PathConverter.java @@ -35,7 +35,7 @@ * 字符串转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PathConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java index ab90d0f413..28ff80f47c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/PeriodConverter.java @@ -32,7 +32,7 @@ * {@link Period}对象转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PeriodConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java index c8837a7546..042c8c32cf 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/PrimitiveConverter.java @@ -46,7 +46,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PrimitiveConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java index 56a86a1f1e..cf768a10f5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/ReferenceConverter.java @@ -37,7 +37,7 @@ * {@link Reference}转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReferenceConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java index 81524f3eaa..e99d266996 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/StackTraceConverter.java @@ -35,7 +35,7 @@ * 只支持Map方式转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StackTraceConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java index e4da8c67df..6b502797fa 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/StringConverter.java @@ -41,7 +41,7 @@ * 字符串转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StringConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java index 81fb13c3d0..b8fe0df318 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/TemporalConverter.java @@ -52,7 +52,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TemporalConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java index a8ac66b794..6735780ebf 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/TimeZoneConverter.java @@ -31,7 +31,7 @@ * TimeZone转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TimeZoneConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java index 3007e2c146..584c5ff7a9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/URIConverter.java @@ -33,7 +33,7 @@ * URI对象转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class URIConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java index 91b6f0fd0b..d9f8c0d3ef 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/URLConverter.java @@ -33,7 +33,7 @@ * URL对象转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class URLConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java b/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java index 580dcb1729..a8e3d04d4a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/convert/UUIDConverter.java @@ -31,7 +31,7 @@ * UUID对象转换器转换器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UUIDConverter extends AbstractConverter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/Between.java b/bus-core/src/main/java/org/aoju/bus/core/date/Between.java index 0df8ecee60..a1e6e24e3f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/Between.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/Between.java @@ -36,7 +36,7 @@ * 日期间隔 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Between { @@ -123,7 +123,7 @@ public long between(Fields.Time unit) { /** * 计算两个日期相差月数 - * 在非重置情况下,如果起始日期的天小于结束日期的天,月数要少算1(不足1个月) + * 在非重置情况下,如果起始日期的天大于结束日期的天,月数要少算1(不足1个月) * * @param isReset 是否重置时间为起始时间(重置天时分秒) * @return 相差月数 diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java b/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java index 739b1bf8f0..2352e7b8e8 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/Boundary.java @@ -35,7 +35,7 @@ * 日期范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Boundary extends Range { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java b/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java index c1fb1d2b11..929365c70e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/DateTime.java @@ -52,7 +52,7 @@ * 包装java.utils.Date * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DateTime extends Date { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java b/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java index d5b4416cc3..dd7eeaf080 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/StopWatch.java @@ -58,7 +58,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StopWatch { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java b/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java index 58c7e36214..5d192c343a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/SystemClock.java @@ -38,7 +38,7 @@ * 后台定时更新时钟,JVM退出时,线程自动回收 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SystemClock { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java b/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java index 9786e9fa2d..a5010e0053 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/TimeInterval.java @@ -33,7 +33,7 @@ * 计算某个过程花费的时间,精确到毫秒 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TimeInterval { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java index eb208905ca..402cd435ef 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/AbstractFormater.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractFormater implements Formatter, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java index 513ce020d8..5f32ab964e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/DateParser.java @@ -34,7 +34,7 @@ * 日期解析接口,用于解析日期字符串为 {@link Date} 对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DateParser extends Formatter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java index 0cc24352cb..5629e43869 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePeriod.java @@ -32,7 +32,7 @@ * 时长格式化器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DatePeriod { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java index f527f8850d..8c95e91f0a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/DatePrinter.java @@ -32,7 +32,7 @@ * 日期格式化输出接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DatePrinter extends Formatter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java index e57091c173..e4742806fa 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDateParser.java @@ -43,7 +43,7 @@ * 用于解析日期字符串并转换为 {@link Date} 对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FastDateParser extends AbstractFormater implements DateParser { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java index 2fb633e206..023eaf54c3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FastDatePrinter.java @@ -39,7 +39,7 @@ * {@link java.text.SimpleDateFormat} 的线程安全版本,用于将 {@link Date} 格式化输出 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FastDatePrinter extends AbstractFormater implements DatePrinter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java index 8cdc97cc7e..28005813bd 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatBuilder.java @@ -40,7 +40,7 @@ * {@link #getDateTimeInstance(int, int, TimeZone, Locale)} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FormatBuilder extends Format implements DateParser, DatePrinter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java index 25ba5fbff8..52f35432e2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/FormatCache.java @@ -40,7 +40,7 @@ * 日期格式化器缓存 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class FormatCache { diff --git a/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java b/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java index 3619179bd6..6d6079cc45 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/date/format/Formatter.java @@ -32,7 +32,7 @@ * 日期基本信息获取接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Formatter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java index 6ce4f79025..7a78864741 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/ArrayType.java @@ -32,7 +32,7 @@ * 数组类型的Get接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ArrayType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java index f9b4c9f7a6..d29939eb0e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/BasicType.java @@ -34,7 +34,7 @@ * 提供一个统一的接口定义返回不同类型的值(基本类型) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java index 4f48bc1696..565ce2b5b3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/GroupedType.java @@ -32,7 +32,7 @@ * 基于分组的Get接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface GroupedType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java index 80ca8828fd..16ebe09dcc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/ListType.java @@ -33,7 +33,7 @@ * 列表类型的Get接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ListType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java index 8c4388a500..977671fb57 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptArrayType.java @@ -34,7 +34,7 @@ * 如果值不存在或获取错误,返回默认值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OptArrayType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java index 43d1469491..6aa9dd88f1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptBasicType.java @@ -35,7 +35,7 @@ * 如果值不存在或获取错误,返回默认值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OptBasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java index 65a42cfa94..92f6212e43 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullObject.java @@ -37,7 +37,7 @@ * 在不提供默认值的情况下, 如果值不存在或获取错误,返回null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OptNullObject extends OptNullType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java index 88a4b8918b..06b7297a11 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullString.java @@ -36,7 +36,7 @@ * 用户只需实现getStr方法即可,其他类型将会从String结果中转换 在不提供默认值的情况下, 如果值不存在或获取错误,返回null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OptNullString extends OptNullType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java index f588f29e8e..aa3a0e56b4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/getter/OptNullType.java @@ -35,7 +35,7 @@ * 在不提供默认值的情况下, 如果值不存在或获取错误,返回null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OptNullType extends BasicType, OptBasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java b/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java index 1f47ddabd6..937e328157 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/GifDecoder.java @@ -54,7 +54,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GifDecoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java b/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java index 83a41d9838..478fddfa2e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/GifEncoder.java @@ -48,7 +48,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GifEncoder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java b/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java index 0201897f2f..96a5489254 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/Graphics.java @@ -34,7 +34,7 @@ * {@link java.awt.Graphics}相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Graphics { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/Image.java b/bus-core/src/main/java/org/aoju/bus/core/image/Image.java index 8bfaa90f82..256fc43474 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/image/Image.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/Image.java @@ -57,7 +57,7 @@ * 图像编辑器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Image implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java b/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java index 42b4d7d795..2a0dd9b56b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/NeuQuant.java @@ -29,7 +29,7 @@ * NeuQuant Neural-Net Quantization Algorithm * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NeuQuant { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java b/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java index 78ec6a51e2..3ac4242096 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/element/AbstractElement.java @@ -29,7 +29,7 @@ * 合并元素抽象类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractElement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java b/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java index 7a2a09d3ad..39e7eeb6b7 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/element/ImageElement.java @@ -35,7 +35,7 @@ * 图片合并元素 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageElement extends AbstractElement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java b/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java index 1a489e60aa..9d52862141 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/element/TextElement.java @@ -33,7 +33,7 @@ * 文本元素合成 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java index b2cd3068d8..acff83aa98 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/ImagePainter.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImagePainter implements Painter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java index 10a29b1379..4ed6eac677 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/Painter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Painter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java index 3f31d1eb4d..2bfc271c1c 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/PainterFactory.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PainterFactory { diff --git a/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java b/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java index 0f686515b6..3bbbd1d77f 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/image/painter/TextPainter.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TextPainter implements Painter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java b/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java index 101534f60d..9946261e4a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java +++ b/bus-core/src/main/java/org/aoju/bus/core/instance/Instance.java @@ -33,7 +33,7 @@ * 2. 当前类出于测试阶段 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Instance { diff --git a/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java b/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java index 04325af23b..6d2bdaf467 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/instance/InstanceFactory.java @@ -39,7 +39,7 @@ * 实例化工厂类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class InstanceFactory implements Instance { diff --git a/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java b/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java index f14b4442c2..c14d984bcf 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java +++ b/bus-core/src/main/java/org/aoju/bus/core/instance/Instances.java @@ -33,7 +33,7 @@ * 对于 {@link InstanceFactory} 的便于使用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java b/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java index 446aeed11f..d4563c6c29 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/AbstractBlending.java @@ -31,7 +31,7 @@ * 可以读取的一组索引值 {@link BufferSource#select}. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AbstractBlending extends AbstractList implements RandomAccess { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java b/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java index 9cbeb4d276..36cc1a049b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/AsyncTimeout.java @@ -36,7 +36,7 @@ * 在本地不支持超时的地方实现超时,例如对阻塞的套接字操作. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AsyncTimeout extends Timeout { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java index 0a121ce670..6a06079f29 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Buffer.java @@ -47,7 +47,7 @@ * 内存中字节的集合. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Buffer implements BufferSource, BufferSink, Cloneable, ByteChannel { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java index f469dc918c..bee1fd1483 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSink.java @@ -35,7 +35,7 @@ * 以便调用者可以进行小的写操作没有性能损失 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BufferSink extends Sink, WritableByteChannel { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java index 4174eb6332..e6dd36ca8d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/BufferSource.java @@ -35,7 +35,7 @@ * 它还允许客户端提前读取,在消费之前进行必要的缓冲输入 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BufferSource extends Source, ReadableByteChannel { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java index facb0cf2aa..4a4f314e14 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/ByteBuffer.java @@ -43,7 +43,7 @@ * 两个半部分,描述段如何组成这个字节字符串 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ByteBuffer extends ByteString { @@ -409,7 +409,7 @@ public Thread newThread(Runnable target, String name) { * * @return 缓存页对象 */ - public PageBuffer allocateBufferPage() { + public PageBuffer allocatePageBuffer() { assertEnabled(); //轮训游标,均衡分配内存页 int index = cursor.getAndIncrement(); diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java b/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java index f45ad45e29..5fd00f0f71 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/ByteString.java @@ -46,7 +46,7 @@ * 不可变的字节序列. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ByteString implements Serializable, Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java index 648822131e..b57308c6b1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/DeflaterSink.java @@ -37,7 +37,7 @@ * 这种早期压缩可能不如执行的压缩有效 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeflaterSink implements Sink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java b/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java index 31bd8ed76f..83ca430868 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Delegate.java @@ -32,7 +32,7 @@ * 将调用转发给另一个调用的 {@link Timeout}. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Delegate extends Timeout { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java index bfc26edae6..e3a7c1177a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSink.java @@ -33,7 +33,7 @@ * 将调用转发给另一个调用的{@link Sink} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class DelegateSink implements Sink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java index af9d4692da..c505ce9c0c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/DelegateSource.java @@ -33,7 +33,7 @@ * 将调用转发给另一个调用的{@link Source} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class DelegateSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java b/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java index 3df98d35b7..7168eb8312 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/EventFactory.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface EventFactory { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java index 77910b8018..575c7c09b4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FastByteBuffer.java @@ -30,7 +30,7 @@ * 快速缓冲,将数据存放在缓冲集中,取代以往的单一数组 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FastByteBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java index fd5b935d12..e48dca0ea8 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FaultHideSink.java @@ -32,7 +32,7 @@ * 即使底层接收器抛出了IOExceptions * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FaultHideSink extends DelegateSink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java b/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java index 5612656c83..a7aaf7431f 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FileOperator.java @@ -33,7 +33,7 @@ * 读取和写入目标文件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class FileOperator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java b/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java index 4656b8a891..65a200892d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/FileSystem.java @@ -38,7 +38,7 @@ * 例如加密) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface FileSystem { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java index dc02b449ce..e33db799c5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSink.java @@ -37,7 +37,7 @@ * 只在应用程序行为需要时调用{@link #flush} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class GzipSink implements Sink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java index 57d1261ddd..ba55d36fcc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/GzipSource.java @@ -36,7 +36,7 @@ * 解压读取数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class GzipSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java index 1af60ff4c7..5274e00340 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/HashSink.java @@ -41,7 +41,7 @@ * {@link #hash()}来计算最终的哈希值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class HashSink extends DelegateSink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java index 47ab15cf9d..3775601852 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/HashSource.java @@ -40,7 +40,7 @@ * 然后调用{@link #hash()}来计算最终的哈希值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class HashSource extends DelegateSource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java index c0f9db77a9..0fded24f66 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/InflaterSource.java @@ -37,7 +37,7 @@ * 解压从另一个源读取的数据. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class InflaterSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java b/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java index 9641b01d44..c20ce4be07 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/LifeCycle.java @@ -30,7 +30,7 @@ * 这个池是一个线程安全的静态单例 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class LifeCycle { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java b/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java index f35803ef9d..d8e3a965ce 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/LineHandler.java @@ -29,7 +29,7 @@ * 行处理器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface LineHandler { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java index 0017d34198..918e4870fe 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/PageBuffer.java @@ -39,7 +39,7 @@ * ByteBuffer内存页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageBuffer { @@ -47,11 +47,11 @@ public class PageBuffer { /** * 共享内存页 */ - private final PageBuffer sharedBufferPage; + private final PageBuffer sharedPageBuffer; /** * 同组内存池中的各内存页 */ - private final PageBuffer[] poolPages; + private final PageBuffer[] pagePool; /** * 条件锁 */ @@ -77,9 +77,9 @@ public class PageBuffer { * @param size 缓存页大小 * @param direct 是否使用堆外内存 */ - PageBuffer(PageBuffer[] poolPages, PageBuffer sharedBufferPage, int size, boolean direct) { - this.poolPages = poolPages; - this.sharedBufferPage = sharedBufferPage; + PageBuffer(PageBuffer[] pagePool, PageBuffer sharedPageBuffer, int size, boolean direct) { + this.pagePool = pagePool; + this.sharedPageBuffer = sharedPageBuffer; availableBuffers = new LinkedList<>(); this.buffer = allocate0(size, direct); availableBuffers.add(new VirtualBuffer(this, null, buffer.position(), buffer.limit())); @@ -104,16 +104,16 @@ private ByteBuffer allocate0(int size, boolean direct) { */ public VirtualBuffer allocate(final int size) { VirtualBuffer virtualBuffer; - if (poolPages != null && Thread.currentThread() instanceof ThreadKit.FastBufferThread) { - virtualBuffer = poolPages[(int) (Thread.currentThread().getId() % poolPages.length)].allocate0(size); + if (pagePool != null && Thread.currentThread() instanceof ThreadKit.FastBufferThread) { + virtualBuffer = pagePool[(int) (Thread.currentThread().getId() % pagePool.length)].allocate0(size); } else { virtualBuffer = allocate0(size); } if (virtualBuffer != null) { return virtualBuffer; } - if (sharedBufferPage != null) { - virtualBuffer = sharedBufferPage.allocate0(size); + if (sharedPageBuffer != null) { + virtualBuffer = sharedPageBuffer.allocate0(size); } if (virtualBuffer == null) { virtualBuffer = new VirtualBuffer(null, allocate0(size, false), 0, 0); @@ -312,7 +312,7 @@ void release() { @Override public String toString() { - return "BufferPage{availableBuffers=" + availableBuffers + ", cleanBuffers=" + cleanBuffers + '}'; + return "PageBuffer{availableBuffers=" + availableBuffers + ", cleanBuffers=" + cleanBuffers + '}'; } } diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java index d841d3ae72..32172c6e38 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/PeekSource.java @@ -36,7 +36,7 @@ * 无效,在以后的读取中抛出{@link IllegalStateException} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ final class PeekSource implements Source { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java b/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java index 869ba4d17d..0367772b25 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Pipe.java @@ -32,7 +32,7 @@ * 通常每个线程都由自己的线程访问:生产者线程向接收器写入数据,消费者线程从源读取数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Pipe { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java b/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java index 5c4689a323..afad1e5487 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RealSink.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RealSink implements BufferSink { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java b/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java index d303a80719..a52ef48974 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RealSource.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RealSource implements BufferSource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java index 39beababc6..d4d0b67bde 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RelayBuffer.java @@ -38,7 +38,7 @@ * 这个类保留一个最近从上游读取的字节的小缓冲区。减少文件I/O和数据复制 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ final class RelayBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java index 1a921df7cc..f67c6cd2d6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/RingBuffer.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RingBuffer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java b/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java index 42a098b067..a63060d9c9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Segment.java @@ -37,7 +37,7 @@ * 限制、prev和next引用不共享 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Segment { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java b/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java index 4e274d9b5e..20948cfa8d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Sink.java @@ -36,7 +36,7 @@ * {@link BufferSink#outputStream}使一个接收器适应{@code outputStream} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Sink extends Closeable, Flushable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Source.java b/bus-core/src/main/java/org/aoju/bus/core/io/Source.java index b81baccec8..13732544b5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Source.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Source.java @@ -34,7 +34,7 @@ * 分层以转换提供的数据,例如解压、解密或移除协议框架 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Source extends Closeable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java b/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java index 98f055ee76..bd7d9814e3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/StreamProgress.java @@ -29,7 +29,7 @@ * Stream进度条 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface StreamProgress { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java b/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java index 60341d0c64..a459e9b559 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/Timeout.java @@ -37,7 +37,7 @@ * 适用规则:关闭洗涤槽,稍后重试 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Timeout { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java index 12465c88c1..26f7f0cf0d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/VirtualBuffer.java @@ -31,7 +31,7 @@ * 虚拟ByteBuffer缓冲区 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class VirtualBuffer { @@ -39,7 +39,7 @@ public final class VirtualBuffer { /** * 当前虚拟buffer的归属内存页 */ - private final PageBuffer bufferPage; + private final PageBuffer pageBuffer; /** * 通过ByteBuffer.slice()隐射出来的虚拟ByteBuffer * @@ -60,13 +60,17 @@ public final class VirtualBuffer { */ private int parentLimit; - VirtualBuffer(PageBuffer bufferPage, ByteBuffer buffer, int parentPosition, int parentLimit) { - this.bufferPage = bufferPage; + VirtualBuffer(PageBuffer pageBuffer, ByteBuffer buffer, int parentPosition, int parentLimit) { + this.pageBuffer = pageBuffer; this.buffer = buffer; this.parentPosition = parentPosition; this.parentLimit = parentLimit; } + public static VirtualBuffer wrap(ByteBuffer buffer) { + return new VirtualBuffer(null, buffer, 0, 0); + } + int getParentPosition() { return parentPosition; } @@ -110,8 +114,8 @@ public void clean() { throw new UnsupportedOperationException("buffer has cleaned"); } clean = true; - if (bufferPage != null) { - bufferPage.clean(this); + if (pageBuffer != null) { + pageBuffer.clean(this); } } diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/WriteBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/WriteBuffer.java index 261c1b4a1a..bd4b6cb961 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/WriteBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/WriteBuffer.java @@ -36,7 +36,7 @@ * 包装当前会话分配到的虚拟Buffer,提供流式操作方式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class WriteBuffer extends OutputStream { @@ -60,7 +60,7 @@ public final class WriteBuffer extends OutputStream { /** * 为当前 WriteBuffer 提供数据存放功能的缓存页 */ - private final PageBuffer bufferPage; + private final PageBuffer pageBuffer; /** * 缓冲区数据刷新Function */ @@ -98,8 +98,8 @@ public final class WriteBuffer extends OutputStream { */ private byte[] cacheByte; - public WriteBuffer(PageBuffer bufferPage, Function flushFunction, int chunkSize, int capacity) { - this.bufferPage = bufferPage; + public WriteBuffer(PageBuffer pageBuffer, Function flushFunction, int chunkSize, int capacity) { + this.pageBuffer = pageBuffer; this.function = flushFunction; this.items = new VirtualBuffer[capacity]; this.chunkSize = chunkSize; @@ -137,10 +137,10 @@ public void writeByte(byte b) { lock.lock(); try { if (writeInBuf == null) { - writeInBuf = bufferPage.allocate(chunkSize); + writeInBuf = pageBuffer.allocate(chunkSize); } writeInBuf.buffer().put(b); - flushWriteBuffer(); + flushWriteBuffer(false); } finally { lock.unlock(); } @@ -148,8 +148,8 @@ public void writeByte(byte b) { function.apply(this); } - private void flushWriteBuffer() { - if (writeInBuf.buffer().hasRemaining()) { + private void flushWriteBuffer(boolean forceFlush) { + if (!forceFlush && writeInBuf.buffer().hasRemaining()) { return; } function.apply(this); @@ -203,7 +203,7 @@ public void write(byte[] b, int off, int len) throws IOException { waitPreWriteFinish(); do { if (writeInBuf == null) { - writeInBuf = bufferPage.allocate(Math.max(chunkSize, len)); + writeInBuf = pageBuffer.allocate(Math.max(chunkSize, len)); } ByteBuffer writeBuffer = writeInBuf.buffer(); if (closed) { @@ -214,7 +214,7 @@ public void write(byte[] b, int off, int len) throws IOException { writeBuffer.put(b, off, minSize); off += minSize; len -= minSize; - flushWriteBuffer(); + flushWriteBuffer(false); } while (len > 0); notifyWaiting(); } finally { @@ -222,6 +222,32 @@ public void write(byte[] b, int off, int len) throws IOException { } } + public void write(ByteBuffer buffer) throws IOException { + write(VirtualBuffer.wrap(buffer)); + } + + public void write(VirtualBuffer virtualBuffer) throws IOException { + lock.lock(); + try { + waitPreWriteFinish(); + if (writeInBuf != null && !virtualBuffer.buffer().isDirect() + && writeInBuf.buffer().remaining() > virtualBuffer.buffer().remaining()) { + writeInBuf.buffer().put(virtualBuffer.buffer()); + virtualBuffer.clean(); + } else { + if (writeInBuf != null) { + flushWriteBuffer(true); + } + virtualBuffer.buffer().compact(); + writeInBuf = virtualBuffer; + } + flushWriteBuffer(false); + notifyWaiting(); + } finally { + lock.unlock(); + } + } + /** * 唤醒处于waiting状态的线程 */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java index fef186b3a3..1eb767efc0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileAppender.java @@ -40,7 +40,7 @@ * 在调用append方法后会缓存于内存,只有超过容量后才会一次性写入文件,因此内存中随时有剩余未写入文件的内容,在最后必须调用flush方法将剩余内容刷入文件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileAppender implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java index 96dc38947c..a233698b8c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileCopier.java @@ -49,7 +49,7 @@ * 4、目录下的文件和目录复制到另一个目录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileCopier extends Duplicate { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java index 140f51ce3f..ceb7ebb0b3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileMode.java @@ -29,7 +29,7 @@ * 文件读写模式,常用于RandomAccessFile * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum FileMode { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java index e826657402..028b0c2d82 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileReader.java @@ -41,7 +41,7 @@ * 文件读取器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileReader extends FileWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java index c6beb97277..f41bb0b67c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWrapper.java @@ -34,7 +34,7 @@ * 文件包装器,扩展文件对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java index d819c1c856..cf292011fd 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/FileWriter.java @@ -41,7 +41,7 @@ * 文件写入器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileWriter extends FileWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java index 7322123bc6..b1cdbffc1b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineReadWatcher.java @@ -40,7 +40,7 @@ * 行处理的Watcher实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LineReadWatcher extends SimpleWatcher implements Runnable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java index e4fd9294e3..de5bc49553 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/LineSeparator.java @@ -37,7 +37,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see #MAC * @see #LINUX * @see #WINDOWS diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java b/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java index 69021a5a32..039768cbd2 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/file/Tailer.java @@ -44,7 +44,7 @@ * 文件内容跟随器,实现类似Linux下"tail -f"命令功能 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Tailer implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java index 3cc379c60e..4a2579b4ff 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/BytesResource.java @@ -38,7 +38,7 @@ * 注意:此对象中getUrl方法始终返回null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BytesResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/CharSequenceResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/CharSequenceResource.java index f809c31c39..f0f3b85895 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/CharSequenceResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/CharSequenceResource.java @@ -39,7 +39,7 @@ * {@link CharSequence}资源,字符串做为资源 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CharSequenceResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java index 2937635bf4..5add630b9e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/ClassPathResource.java @@ -36,7 +36,7 @@ * 传入的path所指向的资源必须存在,否则报错 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ClassPathResource extends UriResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileObjectResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileObjectResource.java index 45cfed4651..d72ef58129 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileObjectResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileObjectResource.java @@ -40,7 +40,7 @@ * {@link FileObject} 资源包装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileObjectResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java index bf34954ec0..6bf74fba38 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/FileResource.java @@ -37,7 +37,7 @@ * 文件资源访问对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileResource implements Resource { @@ -48,7 +48,6 @@ public class FileResource implements Resource { * 构造 * * @param path 文件 - * @since 4.4.1 */ public FileResource(Path path) { this(path.toFile()); diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java index 7946095306..8b1e41b3f3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/InputStreamResource.java @@ -33,7 +33,7 @@ * 注意:此对象中getUrl方法始终返回null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InputStreamResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java index 86ca6e53b5..a081a55b07 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiFileResource.java @@ -33,7 +33,7 @@ * 此资源为一个利用游标自循环资源,只有调用{@link #next()} 方法才会获取下一个资源,使用完毕后调用{@link #reset()}方法重置游标 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MultiFileResource extends MultiResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java index f3dbfa461d..2792ce7d8c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/MultiResource.java @@ -42,7 +42,7 @@ * 此资源为一个利用游标自循环资源,只有调用{@link #next()} 方法才会获取下一个资源,使用完毕后调用{@link #reset()}方法重置游标 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MultiResource implements Resource, Iterable, Iterator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java index 37d2d1399f..fd83fa3fc9 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/PropertySource.java @@ -33,7 +33,7 @@ * 配置文件源 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java index f9735958e7..7565af429e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/Resource.java @@ -40,7 +40,7 @@ * 资源可以是文件、URL、ClassPath中的文件亦或者jar包中的文件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java index 5ff6830c92..7935349bd0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/StringResource.java @@ -31,7 +31,7 @@ * 字符串资源,字符串做为资源 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StringResource extends CharSequenceResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java index 59fdbc8b7b..4ce47c639e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/UriResource.java @@ -39,7 +39,7 @@ * URL资源访问类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UriResource implements Resource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java b/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java index 4490dc05a4..f0d5b763aa 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/resource/WebAppResource.java @@ -33,7 +33,7 @@ * Web root资源访问对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WebAppResource extends FileResource { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java index 05a9575284..c41fb79e22 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/BOMInputStream.java @@ -50,7 +50,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BOMInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java index c72051cfb3..8e3607672c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/ByteArrayOutputStream.java @@ -39,7 +39,7 @@ * 避免重新分配内存块而是分配新增的缓冲区,缓冲区不会被GC,数据也不会被拷贝到其他缓冲区 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ByteArrayOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java index bb37b05c7b..37c1ba61bf 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/NullOutputStream.java @@ -33,7 +33,7 @@ * 来自 Apache Commons io * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NullOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java index e19e2bffbb..968c43dc1d 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueInputStream.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QueueInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java index 56b8b9e372..b6d80a5228 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/QueueReader.java @@ -35,7 +35,7 @@ * 队列InputStream * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QueueReader extends Reader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java index 871577b499..0c0d796850 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileInputStream.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RandomFileInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java index 054a691947..9a7289e7ba 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/RandomFileOutputStream.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RandomFileOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java index e896ecff41..b52afa09e4 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StreamBuffer.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StreamBuffer extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java index 82ce08f540..e1f4f97466 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringInputStream.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StringInputStream extends ByteArrayInputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java index 9ccc569c65..1b15d59f4d 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringOutputStream.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StringOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java index 3affc72ed0..5bb1741f39 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringReader.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StringReader extends Reader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java index 83d02de70c..92b142b40b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/StringWriter.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StringWriter extends Writer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java index 95532a8b83..bffb61b84e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidInputStream.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class VoidInputStream extends InputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java index 20c8c9f093..c9fe1046bc 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/streams/VoidOutputStream.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class VoidOutputStream extends OutputStream { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java index c3b83b517e..676dbde5a8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/DelayWatcher.java @@ -42,7 +42,7 @@ * 此类通过维护一个Set将短时间内相同文件多次modify的事件合并处理触发,从而避免以上问题 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DelayWatcher implements Watcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java index eb5795196b..15c1f96d2e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/IgnoreWatcher.java @@ -33,7 +33,7 @@ * 用户继承此类后实现需要监听的方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IgnoreWatcher implements Watcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java index 3bc5f6dee1..f17dc795ec 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/SimpleWatcher.java @@ -30,7 +30,7 @@ * 用户继承此类后实现需要监听的方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleWatcher extends IgnoreWatcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java index ac69497024..a260c17292 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchMonitor.java @@ -45,7 +45,7 @@ * 递归监听目录时,并不会监听新创建的目录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WatchMonitor extends WatchServer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java index 9cbd9ef493..977d493796 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatchServer.java @@ -42,7 +42,7 @@ * 文件监听服务,此服务可以同时监听多个路径 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WatchServer extends Thread implements Closeable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java index dd9328fa0f..53e52b7186 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/Watcher.java @@ -32,7 +32,7 @@ * 观察者(监视器) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Watcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java index d38ef25ab7..a61a97ae00 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java +++ b/bus-core/src/main/java/org/aoju/bus/core/io/watchers/WatcherChain.java @@ -38,7 +38,7 @@ * 用于加入多个观察者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WatcherChain implements Watcher, Chain { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java b/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java index d97429a792..474fe1a540 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/HashID.java @@ -38,7 +38,7 @@ * 数据库id,将它们用作忘记密码散列、邀请码、存储碎片号 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HashID { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java b/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java index e5ffdad413..c47a12cc11 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/LongID.java @@ -49,7 +49,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LongID { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java b/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java index f36bde6d3f..c2628b52af 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/ObjectID.java @@ -41,7 +41,7 @@ * 由12个字节组成,分割如下: * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ObjectID implements Comparable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java b/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java index 45b27f5d3e..1133411291 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/Snowflake.java @@ -48,7 +48,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Snowflake implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java b/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java index be8b2bcf6f..3a206dbfa8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java +++ b/bus-core/src/main/java/org/aoju/bus/core/key/UUID.java @@ -62,7 +62,7 @@ * 这些类型的 version 值分别为 1、2、3 和 4 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UUID implements java.io.Serializable, Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java index ca096ac137..770c70804b 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Algorithm.java @@ -29,7 +29,7 @@ * 加解密算法类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Algorithm { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/style/Align.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Align.java similarity index 97% rename from bus-office/src/main/java/org/aoju/bus/office/support/excel/style/Align.java rename to bus-core/src/main/java/org/aoju/bus/core/lang/Align.java index af075b111e..dd85600179 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/style/Align.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Align.java @@ -23,13 +23,13 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.office.support.excel.style; +package org.aoju.bus.core.lang; /** * 对齐方式枚举 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Align { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java index cc1327cbfe..39ca733676 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Ansi.java @@ -42,7 +42,7 @@ * 注意:同时出现多种组合FG颜色或BG颜色,只有最后一个会显示 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Ansi { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java index 475dfd20eb..889e6a629d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Assert.java @@ -38,7 +38,7 @@ * 断言某些对象或值是否符合规定,否则抛出异常 经常用于做变量检查 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Assert { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java index 037008b7f9..ac9d97e53b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Chain.java @@ -31,7 +31,7 @@ * @param 元素类型 * @param 目标类类型,用于返回this对象 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Chain extends Iterable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java index 7956ea13b4..c237100936 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Charset.java @@ -36,7 +36,7 @@ * 编码常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Charset { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java index 21b57c04db..c980193146 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Console.java @@ -40,7 +40,7 @@ * 此类主要针对{@link java.lang.System#out} 和 {@link java.lang.System#err} 做封装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Console { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java index 1f74d750a3..8896665d96 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Dict.java @@ -41,7 +41,7 @@ * 字典对象,扩充了HashMap中的方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Dict extends LinkedHashMap implements BasicType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java index 287da2e82b..375c24002e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Editor.java @@ -36,7 +36,7 @@ * * @param 被编辑对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Editor { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java index 4334359526..da5af576c9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Fields.java @@ -36,7 +36,7 @@ * 日期场景属性 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Fields { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java b/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java index 09674bb5cb..c17a69b3dc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/FileType.java @@ -41,7 +41,7 @@ * 文件类型(扩展名) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileType { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java index 2c0526a0d2..72a2e9b2af 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Filter.java @@ -29,7 +29,7 @@ * 过滤器接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java index 509a522217..dc7cdf07ac 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Func.java @@ -32,7 +32,7 @@ * 此接口用于将一个函数包装成为一个对象,从而传递对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Header.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Header.java index be9a518636..734e3e5cc1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Header.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Header.java @@ -29,7 +29,7 @@ * Header 常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Header { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java index 6529909b7b..9ef160d47a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Holder.java @@ -32,7 +32,7 @@ * * @param 所持有值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Holder extends MutableObject { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java index 22b1694a8a..86ee4c6e03 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Http.java @@ -31,7 +31,7 @@ * HTTP 相关常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Http { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java index 326ff510a3..b94f1d9065 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Lazy.java @@ -32,7 +32,7 @@ * 持有一个计算延迟的值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Lazy implements Supplier, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java index d8f4eff74b..254586667f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Locale.java @@ -29,7 +29,7 @@ * 翻译语言枚举 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Locale { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java index cbcc40ddf8..6c6f761cef 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Matcher.java @@ -30,7 +30,7 @@ * * @param 匹配的对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Matcher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/MediaType.java b/bus-core/src/main/java/org/aoju/bus/core/lang/MediaType.java index c3236fdbd0..1667cc6c42 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/MediaType.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/MediaType.java @@ -38,7 +38,7 @@ * HTTP 媒体类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java index f44bfdb97c..dc8f1aec44 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Murmur.java @@ -33,7 +33,7 @@ * Murmur3 32bit、64bit、128bit 哈希算法实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Murmur implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java index 0837fe258f..cecee5b6f8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Normal.java @@ -35,7 +35,7 @@ * 默认常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Normal { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java index 69354f56a8..aafa634028 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Range.java @@ -45,7 +45,7 @@ * * @param 生成范围对象的类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Range implements Iterable, Iterator, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java b/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java index ae068575da..a98f8c2b25 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/RegEx.java @@ -34,7 +34,7 @@ * 正则表达式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RegEx { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java index e4efd3f054..25843e3fe9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Replacer.java @@ -31,7 +31,7 @@ * * @param 被替换操作的类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Replacer { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java index f9e8901d72..8b3503f221 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Scale.java @@ -6,7 +6,7 @@ * 缩放常量信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Scale { @@ -37,7 +37,7 @@ public enum Mode { * 图片缩略类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Type { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java index 6ad01c9216..ec579c310b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Scaner.java @@ -43,7 +43,7 @@ * 类扫描器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Scaner { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java b/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java index 25eb0e37a0..b6c9b761e6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/SimpleCache.java @@ -37,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleCache implements Iterable>, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java index ba619f0e6d..0ec261db9f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Symbol.java @@ -29,7 +29,7 @@ * 标点符号常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Symbol { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/System.java b/bus-core/src/main/java/org/aoju/bus/core/lang/System.java index b53b457f30..dbdb3d37e9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/System.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/System.java @@ -31,7 +31,7 @@ * 系统常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class System { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java index 305c3d7acd..97577fbd2a 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Typed.java @@ -36,7 +36,7 @@ * {@link ParameterizedType} 接口实现,用于重新定义泛型类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Typed implements ParameterizedType, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java index 2e649645e4..d1605a604d 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Types.java @@ -39,7 +39,7 @@ * * @param 需要自定义的参考类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Types implements Type { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java index 1487a7be5d..0f76b4f544 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Validator.java @@ -36,7 +36,7 @@ * 字段验证器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Validator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java b/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java index 9c8bd084cd..447bd2ad91 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/VoidFunc.java @@ -33,7 +33,7 @@ * * @param

参数类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java b/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java index 55c9fca59b..02046277e4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/Weighing.java @@ -47,7 +47,7 @@ * * @param 权重随机获取的对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Weighing implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java index bab593e6b7..0343207d9f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/Caller.java @@ -32,7 +32,7 @@ * 可以通过此接口的实现类方法获取调用者、多级调用者以及判断是否被调用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Caller { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java index 677dd6b050..4d8d52f5aa 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/SecurityCaller.java @@ -31,7 +31,7 @@ * 方式获取调用者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SecurityCaller extends SecurityManager implements Caller { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java index b72a0627e2..400fc8a1b2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/caller/StackTraceCaller.java @@ -31,7 +31,7 @@ * 通过StackTrace方式获取调用者 此方式效率最低,不推荐使用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StackTraceCaller implements Caller { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java index b509a8b5e2..023f178dd5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Copier.java @@ -30,7 +30,7 @@ * * @param 拷贝目标类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Copier { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java index 57df9df387..259830fd85 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/copier/Duplicate.java @@ -35,7 +35,7 @@ * @param 拷贝的对象 * @param 本类的类型 用于set方法返回本对象,方便流式编程 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Duplicate> implements Copier { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java index d6bbf836fd..4af3c1c909 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/AuthorizedException.java @@ -29,7 +29,7 @@ * 自定义异常: 认证异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AuthorizedException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java index 5f4b46cdab..d6801b6f9c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/BusinessException.java @@ -29,7 +29,7 @@ * 自定义异常: 业务异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BusinessException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java index 02ba583b95..885c456a0a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/CrontabException.java @@ -29,7 +29,7 @@ * 自定义异常: 定时任务执行异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CrontabException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java index 4a10f8fce4..5d78113fb4 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/DisableException.java @@ -29,7 +29,7 @@ * 自定义异常: 数据被禁用异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DisableException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java index fae6ba2b86..508c54c450 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ExistsException.java @@ -29,7 +29,7 @@ * 自定义异常: 对象已存在异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExistsException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java index b9c570a464..c445f382db 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ForbiddenException.java @@ -29,7 +29,7 @@ * 自定义异常: 权限不足异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ForbiddenException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java index f2cc836aa0..c0e0c28a88 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/HttpUncheckException.java @@ -29,7 +29,7 @@ * HTTP请求异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HttpUncheckException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java index 8cdf4ed81b..892ed8f33c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstanceException.java @@ -29,7 +29,7 @@ * 自定义异常: 实例化异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InstanceException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java index 549c0201eb..c452d9fa38 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InstrumentException.java @@ -29,7 +29,7 @@ * 自定义异常: 内部处理异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InstrumentException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java index d6dfcb9896..5a7eff6aec 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidClaimException.java @@ -29,7 +29,7 @@ * 自定义异常: 无效的范围要求 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InvalidClaimException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java index d801a9fe35..112c5848ee 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/InvalidParamsException.java @@ -29,7 +29,7 @@ * 无效的参数异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InvalidParamsException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java index c0af8b426e..502b086707 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NoSuchException.java @@ -29,7 +29,7 @@ * 自定义异常: 无法找到方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NoSuchException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java index f4fbace5db..22b9d5224a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotExistsException.java @@ -29,7 +29,7 @@ * 自定义异常: 对象不存在 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotExistsException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java index a968d6ad6f..b5cb49dae9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotFoundException.java @@ -29,7 +29,7 @@ * 自定义异常: 资源不存在 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotFoundException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java index 45997d2f7a..6dbfe220bc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/NotInitedException.java @@ -29,7 +29,7 @@ * 自定义异常: 未初始化异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotInitedException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java index 080dbb3bcb..9b1f24ced9 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RelevantException.java @@ -35,7 +35,7 @@ * 自定义异常: 未受检异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java index 03e9b6d4d7..eed0f7d429 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/RevisedException.java @@ -29,7 +29,7 @@ * 自定义异常: 无法找到方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RevisedException extends RelevantException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java index 9938126033..82bd693f80 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SignatureException.java @@ -29,7 +29,7 @@ * 自定义异常: 签名异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SignatureException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java index 34fe182440..ec16d97465 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/SocketException.java @@ -29,7 +29,7 @@ * 自定义异常: Socket异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SocketException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java index 4d8fad288e..2af11c50d2 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/TokenExpiredException.java @@ -29,7 +29,7 @@ * 自定义异常: 令牌过期 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TokenExpiredException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java index 65d119e4f8..a904b7a344 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/UncheckedException.java @@ -35,7 +35,7 @@ * 自定义异常: 未受检异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java index eba5527737..82d7750f95 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/exception/ValidateException.java @@ -29,7 +29,7 @@ * 自定义异常: 参数验证失败 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ValidateException extends UncheckedException { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java index 69b3979b49..57762cf7cd 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/Mutable.java @@ -30,7 +30,7 @@ * * @param 值得类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Mutable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java index 2d0966fed2..b98e6839d8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableBool.java @@ -29,7 +29,7 @@ * 可变 boolean 类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Boolean * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java index ca948437a8..107c30ae17 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableByte.java @@ -32,7 +32,7 @@ * 可变 byte 类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Byte * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java index dc568e3c8f..937aae5efb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableDouble.java @@ -32,7 +32,7 @@ * 可变 double 类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Double * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java index 02f0f4e71e..6fceeb54ee 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableFloat.java @@ -32,7 +32,7 @@ * 可变 float 类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Float * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java index 20b809cdaf..08a98c1888 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableInt.java @@ -32,7 +32,7 @@ * 可变 int 类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Integer * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java index 1bc4cf6391..4bf4c72113 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableLong.java @@ -31,7 +31,7 @@ * 可变 long 类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Long * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java index b26b5faa4d..7b5fe850aa 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableObject.java @@ -34,7 +34,7 @@ * * @param 可变的类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MutableObject implements Mutable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java index 7c6f129266..f4ff2f5625 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/mutable/MutableShort.java @@ -32,7 +32,7 @@ * 可变 short 类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Short * @since JDK 1.8+ */ diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java index 649c8385ba..23943a61f2 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/Node.java @@ -30,7 +30,7 @@ * * @param 类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Node extends Comparable> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java index 324020ac74..4404065f16 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeEntity.java @@ -29,7 +29,7 @@ * 树配置属性相关 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TreeEntity { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java index 155d9294e4..cb5c8473af 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeMap.java @@ -37,7 +37,7 @@ * * @param ID类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TreeMap extends LinkedHashMap implements Node { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java index fadc96fd2b..77ecd9247e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/TreeNode.java @@ -31,7 +31,7 @@ * 类树节点实体: 包含key,父Key.不限于这些属性的可以构造成一颗树的实体对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TreeNode implements Node { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java index 73ae531d98..c27296a579 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/DefaultNodeParser.java @@ -33,7 +33,7 @@ * * @param ID类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultNodeParser implements NodeParser, T> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java index 1a66bdbe0d..a511fcbd93 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tree/parser/NodeParser.java @@ -32,7 +32,7 @@ * * @param 转换的实体 为数据源里的对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface NodeParser { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java index adbef21cea..6884b28bfe 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutablePair.java @@ -38,7 +38,7 @@ * @param the left element type * @param the right element type * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ImmutablePair extends Pair { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java index f936288ca5..8e59f3bbe1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/ImmutableTriple.java @@ -39,7 +39,7 @@ * @param the middle element type * @param the right element type * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ImmutableTriple extends Triple { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java index 916fca1821..37f7769c08 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutablePair.java @@ -31,7 +31,7 @@ * @param 左元素类型 * @param 左元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MutablePair extends Pair { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java index c244c48a38..bc505159d0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/MutableTriple.java @@ -32,7 +32,7 @@ * @param 中间元素类型 * @param 左元素类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MutableTriple extends Triple { diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java index 69b6ccb092..c38e40a69c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Pair.java @@ -46,7 +46,7 @@ * @param the left element type * @param the right element type * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java index 4e0b086e1f..3bbdd76dfc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java +++ b/bus-core/src/main/java/org/aoju/bus/core/lang/tuple/Triple.java @@ -44,7 +44,7 @@ * @param the middle element type * @param the right element type * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java index b7637ae862..1d9392fe80 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AllFilter.java @@ -34,7 +34,7 @@ * 如果没有过滤器的时候则认为所有过滤器都满足 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AllFilter extends MixFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java index 60a0ee83a9..39263d6567 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AntFilter.java @@ -31,7 +31,7 @@ * ANT风格路径过滤器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AntFilter extends RegexFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java index 73c0f35ae8..2ea3aff45b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AntLoader.java @@ -35,7 +35,7 @@ * ANT风格路径资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AntLoader extends PatternLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java index d11ed65544..a714c59425 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/AnyFilter.java @@ -32,7 +32,7 @@ * ANY逻辑复合过滤器,即任意一个过滤器满足时就满足,当没有过滤器的时候则认为没有过滤器满足,也就是不满足 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AnyFilter extends MixFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java index f7cf9afa1c..6a93c010ac 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/DelegateLoader.java @@ -29,7 +29,7 @@ * 委派的资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class DelegateLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java index 4772f6e456..f4b15928b5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/FileLoader.java @@ -41,7 +41,7 @@ * 文件资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java index 2f907f7e91..f0daa675f6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Filter.java @@ -31,7 +31,7 @@ * 资源过滤器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java index f905987200..3fafba256a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Filters.java @@ -31,7 +31,7 @@ * 过滤器工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Filters { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java index c1672e2f3b..f199514d08 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoader.java @@ -44,7 +44,7 @@ * Jar包资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java index 553a7272b0..cde16e3213 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/JarLoaders.java @@ -40,7 +40,7 @@ * 外部Jar的类加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarLoaders extends URLClassLoader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java index 65f42e55d4..5d86da7d7a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Loader.java @@ -36,7 +36,7 @@ * 调用时,避免无用的提前全部预加载 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java b/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java index 7c34579338..a352897c19 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/Loaders.java @@ -34,7 +34,7 @@ * 资源加载器工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Loaders { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java index 5e2344f764..face943707 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/MixFilter.java @@ -34,7 +34,7 @@ * 复合过滤器,实际上内部维护一个过滤器的{@link LinkedHashSet}集合,提供添加/删除以及链式拼接的方法来混合多个子过滤器,该过滤器的具体逻辑由子类拓展 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class MixFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java index f2edcd90b7..24e2b8ce57 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/NatLoader.java @@ -42,7 +42,7 @@ * Jar包资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NatLoader extends StdLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java index ae5d99e913..cc0811678f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/PatternLoader.java @@ -34,7 +34,7 @@ * 模式匹配资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class PatternLoader extends DelegateLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java index 9ce39a9c28..d12aefc768 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/PkgLoader.java @@ -35,7 +35,7 @@ * 包名表达式资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PkgLoader extends DelegateLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java index 5f32476ed2..227b70cd68 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexFilter.java @@ -32,7 +32,7 @@ * 正则表达式过滤器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RegexFilter implements Filter { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java index 8b3c5a329a..4c804f24da 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/RegexLoader.java @@ -31,7 +31,7 @@ * 正则表达式资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RegexLoader extends PatternLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java index 6288188e1a..f3f39b752d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/ResourceLoader.java @@ -35,7 +35,7 @@ * 资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java b/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java index 8a2db42460..f9be22fa68 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/loader/StdLoader.java @@ -45,7 +45,7 @@ * 标准的资源加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StdLoader extends ResourceLoader implements Loader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java index bd57b6556b..4f4fe1881b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseLinkedMap.java @@ -35,7 +35,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CamelCaseLinkedMap extends CamelCaseMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java index 31f4bc36a2..5eb2f3d70c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CamelCaseMap.java @@ -37,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CamelCaseMap extends CustomKeyMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java index 217799e655..f051f52b81 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveLinkedMap.java @@ -35,7 +35,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CaseInsensitiveLinkedMap extends CaseInsensitiveMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java index c3c15b81fa..842d41216b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CaseInsensitiveMap.java @@ -35,7 +35,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CaseInsensitiveMap extends CustomKeyMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java index 4bc324938f..0a1717a458 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/CustomKeyMap.java @@ -33,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CustomKeyMap extends MapWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java index f738c75d9b..e1f0674e72 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/FixedLinkedHashMap.java @@ -33,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FixedLinkedHashMap extends LinkedHashMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java index 76acfa6f39..92d031784b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapBuilder.java @@ -36,7 +36,7 @@ * @param Key类型 * @param Value类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapBuilder implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java index 53be0f48b0..506b1301bb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapProxy.java @@ -45,7 +45,7 @@ * Map代理,提供各种getXXX方法,并提供默认值支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapProxy implements Map, OptNullObject, InvocationHandler, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java b/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java index b605d1a2d2..1bced7bf9c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/MapWrapper.java @@ -37,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapWrapper implements Map, Iterable>, Serializable, Cloneable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java index e206f2ed6e..461bab7ea7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/TableMap.java @@ -37,7 +37,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TableMap implements Map, Iterable>, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java index cdb358e7fb..8464eed8c6 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/TolerantMap.java @@ -33,7 +33,7 @@ * 提供默认值的Map * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TolerantMap extends MapWrapper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java index 405bb380df..f5a17d20b3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/multi/CollectionValueMap.java @@ -38,7 +38,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CollectionValueMap extends MapWrapper> { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java index 1c049e2a5a..4172286b66 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/multi/ListValueMap.java @@ -33,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ListValueMap extends CollectionValueMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java b/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java index b329f7aa0a..c81f33c327 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java +++ b/bus-core/src/main/java/org/aoju/bus/core/map/multi/SetValueMap.java @@ -33,7 +33,7 @@ * @param 键类型 * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SetValueMap extends CollectionValueMap { diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java b/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java index b14d24528c..f8eee9ad0f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Arrangement.java @@ -36,7 +36,7 @@ * 排列组合相关类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Arrangement { diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java b/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java index 74a0ca64cb..e0869f7e50 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Calculator.java @@ -37,7 +37,7 @@ * 数学表达式计算 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Calculator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java b/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java index 327bbaff98..314c0df4c8 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Combination.java @@ -37,7 +37,7 @@ * 排列组合相关类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Combination { diff --git a/bus-core/src/main/java/org/aoju/bus/core/math/Money.java b/bus-core/src/main/java/org/aoju/bus/core/math/Money.java index a49f30c9ea..bd97e64e9e 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/math/Money.java +++ b/bus-core/src/main/java/org/aoju/bus/core/math/Money.java @@ -61,7 +61,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Money implements Serializable, Comparable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java index 2b7a122d7a..12be2b234e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardListener.java @@ -33,7 +33,7 @@ * 用户通过实现此接口,实现监听剪贴板内容变化 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ClipboardListener { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java index d9056995a5..e67a0858dc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/ClipboardMonitor.java @@ -40,7 +40,7 @@ * 剪贴板监听 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum ClipboardMonitor implements ClipboardOwner, Runnable, Closeable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java b/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java index 28d701be2e..51686694be 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/ImageSelection.java @@ -37,7 +37,7 @@ * 此对象也用于将图像文件和{@link DataFlavor#imageFlavor} 元信息对应 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageSelection implements Transferable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java b/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java index 9caab82510..c1a9e907f1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java +++ b/bus-core/src/main/java/org/aoju/bus/core/swing/StringListener.java @@ -36,7 +36,7 @@ * 剪贴板字符串内容监听 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class StringListener implements ClipboardListener, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java b/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java index 11d72405ec..bee11438c0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Builders.java @@ -41,7 +41,7 @@ * 提供比StringBuffer更灵活和更强大的API. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Builders implements CharSequence, Appendable, Serializable, Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java b/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java index 24fc37f954..6c46c423f2 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Lookups.java @@ -33,7 +33,7 @@ * 查找字符串值的字符串键. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Lookups { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java b/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java index eb23319844..710476ff5f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Matchers.java @@ -36,7 +36,7 @@ * 如果这些还不够,您可以子类化并实现自己的匹配器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Matchers { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java b/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java index 5a2464a4b9..aff4dec124 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Replacers.java @@ -34,7 +34,7 @@ * 按值替换字符串中的变量. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Replacers { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java b/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java index fa1ecca82c..16a64c6cd0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/Similarity.java @@ -39,7 +39,7 @@ * 在hash之后,仍然能保持这种相似性,就称之为局部敏感hash * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Similarity { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java index 86fd2fc877..9d955a5106 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvConfig.java @@ -33,7 +33,7 @@ * CSV基础配置项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CsvConfig implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java index 3f025ff180..586f8f5bb1 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvData.java @@ -32,7 +32,7 @@ * CSV数据,包括头部信息和行数据,参考:FastCSV * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CsvData { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java index 1b65d33c28..1453079955 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvHandler.java @@ -29,7 +29,7 @@ * CSV的行处理器,实现此接口用于按照行处理数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java index aab6ecdc77..29c028d9cc 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvParser.java @@ -41,7 +41,7 @@ * CSV行解析器,参考:FastCSV * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CsvParser implements Closeable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java index e7a629899c..3ec363b179 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReadConfig.java @@ -31,7 +31,7 @@ * CSV读取配置项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CsvReadConfig extends CsvConfig implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java index 9fbf5a13e6..3116715b30 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvReader.java @@ -46,7 +46,7 @@ * CSV文件读取器,参考:FastCSV * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CsvReader { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java index f8af8494bf..7a31c6b57c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvRow.java @@ -34,7 +34,7 @@ * CSV中一行的表示 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CsvRow implements List { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java index fb2e9abafd..a70de10f98 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriteConfig.java @@ -33,7 +33,7 @@ * CSV写出配置项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CsvWriteConfig extends CsvConfig implements Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java index 54d4ec2e56..23566cef40 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/csv/CsvWriter.java @@ -37,7 +37,7 @@ * CSV数据写出器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CsvWriter implements Closeable, Flushable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java index eacd850983..c8caee0412 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/EscapeCodeValues.java @@ -43,7 +43,7 @@ * ESCAPE信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EscapeCodeValues { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java index 4371280cae..a3fa725200 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/JavaUnicodeEscaper.java @@ -29,7 +29,7 @@ * Translates codepoints to their Unicode escaped value suitable for Java source. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JavaUnicodeEscaper extends UnicodeEscaper { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java index 5f5811bc5e..7033a51e5c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericEscaper.java @@ -37,7 +37,7 @@ * Translates codepoints to their XML numeric entity escaped value. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NumericEscaper extends CodePointTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java index 0152f5c491..88a8dce9fe 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/NumericUnescaper.java @@ -40,7 +40,7 @@ * Note that the semi-colon is optional. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NumericUnescaper extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java index d19f6e2d72..e6cce8580f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/OctalUnescaper.java @@ -40,7 +40,7 @@ * 1 to 377. This is because parsing Java is the main use case. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OctalUnescaper extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java index 701f77e6cc..815e1eaa06 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeEscaper.java @@ -35,7 +35,7 @@ * Translates codepoints to their Unicode escaped value. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UnicodeEscaper extends CodePointTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java index 2927eb9add..9c9cfe5c08 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnescaper.java @@ -37,7 +37,7 @@ * without the +. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UnicodeUnescaper extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java index afc81f37d9..1ae697bf93 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/escape/UnicodeUnpaired.java @@ -33,7 +33,7 @@ * Helper subclass to CharSequenceTranslator to remove unpaired surrogates. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UnicodeUnpaired extends CodePointTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java index 1ccb1d1d74..81fb86e533 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/AggregateTranslator.java @@ -35,7 +35,7 @@ * 第一个转换器使用输入中的代码点. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AggregateTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java index 91a1d26a54..0b094d9d57 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CharSequenceTranslator.java @@ -35,7 +35,7 @@ * 其核心用途是转义和反转义文本 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java index 54d345ef15..3f6163c61b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/CodePointTranslator.java @@ -33,7 +33,7 @@ * 以支持翻译一次最多替换一个字符. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CodePointTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java index 63dfcb5f4c..553c215311 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/LookupTranslator.java @@ -37,7 +37,7 @@ * 使用查找表转换值. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LookupTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java b/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java index af41aa469f..1240fb1a7e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java +++ b/bus-core/src/main/java/org/aoju/bus/core/text/translate/SinglePassTranslator.java @@ -33,7 +33,7 @@ * 处理初始索引检查和返回代码点的计数. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ abstract class SinglePassTranslator extends CharSequenceTranslator { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java b/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java index 3b61ae2989..10e065b7fb 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/AtomicNoLock.java @@ -33,7 +33,7 @@ * 无锁实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AtomicNoLock implements Lock { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java b/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java index 2305a6cc09..d8d885d650 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/DelegatedService.java @@ -34,7 +34,7 @@ * ExecutorService 代理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DelegatedService extends AbstractExecutorService { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java index 089ffd2919..4d5ceeadc6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorBuilder.java @@ -41,7 +41,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExecutorBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java index 2b945191a4..409e748110 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/ExecutorService.java @@ -29,7 +29,7 @@ * 保证ExecutorService在对象回收时正常结束 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExecutorService extends DelegatedService { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java b/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java index 16c92f5d34..a522ef1238 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/GlobalThread.java @@ -35,7 +35,7 @@ * 全局公共线程池 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GlobalThread { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java index 7f204e251b..ecaced3b51 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThread.java @@ -31,7 +31,7 @@ * * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NamedThread extends InheritableThreadLocal { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java index cc65d3ec91..f54b56aa50 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadFactory.java @@ -41,7 +41,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NamedThreadFactory implements ThreadFactory { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java index 7da3061a27..2d78b5b20b 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/NamedThreadLocal.java @@ -31,7 +31,7 @@ * * @param 值类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NamedThreadLocal extends ThreadLocal { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java b/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java index 81f63296dd..b951c3ac27 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/RejectPolicy.java @@ -37,7 +37,7 @@ * 此枚举为JDK预定义的几种策略枚举表示 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum RejectPolicy { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java b/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java index f35f22e423..b0a7cead7d 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/Semaphore.java @@ -35,7 +35,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Semaphore implements Runnable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java b/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java index d6280c334b..b438fdbcda 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/SyncFinisher.java @@ -40,7 +40,7 @@ * 不能保证同时开始 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SyncFinisher { diff --git a/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java b/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java index 132c4a120b..7a5ad12819 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java +++ b/bus-core/src/main/java/org/aoju/bus/core/thread/ThreadBuilder.java @@ -37,7 +37,7 @@ * ThreadFactory创建器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ThreadBuilder implements Builder { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java index b95ad5362c..f109d26f76 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/$.java @@ -32,7 +32,7 @@ * 工具包集合,工具类快捷方式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class $ { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java index 39c734a960..182eb4d976 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/AnnoKit.java @@ -40,7 +40,7 @@ * 快速获取注解对象、注解值等工具封装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AnnoKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java index 5eb00475f9..d781546282 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ArrayKit.java @@ -42,7 +42,7 @@ * 数组工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArrayKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java index df0e1b1473..3b46437518 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BeanKit.java @@ -49,7 +49,7 @@ * 把一个拥有对属性进行set和get方法的类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java index e6718237d6..4ebc41f7f5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BooleanKit.java @@ -32,7 +32,7 @@ * Boolean类型相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BooleanKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java index e03582c9ff..a717de547c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/BufferKit.java @@ -27,9 +27,13 @@ import org.aoju.bus.core.lang.Normal; import org.aoju.bus.core.lang.Symbol; +import org.aoju.bus.core.lang.exception.InstrumentException; import java.nio.ByteBuffer; +import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CodingErrorAction; /** * {@link ByteBuffer} 工具类 @@ -37,7 +41,7 @@ * ByteBuffer的相关介绍见:https://www.cnblogs.com/ruber/p/6857159.html * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BufferKit { @@ -211,10 +215,29 @@ public static String readLine(ByteBuffer buffer, Charset charset) { } else if (endPosition == startPosition) { return Normal.EMPTY; } - return null; } + /** + * 将字节内容解码为新的字符 + * + * @param buffer ByteBuffer + * @return 解码后的字符串信息 + */ + public static String readLine(ByteBuffer buffer) { + try { + CharsetDecoder decode = org.aoju.bus.core.lang.Charset.UTF_8.newDecoder(); + decode.onMalformedInput(CodingErrorAction.REPORT); + decode.onUnmappableCharacter(CodingErrorAction.REPORT); + buffer.mark(); + String str = decode.decode(buffer).toString(); + buffer.reset(); + return str; + } catch (CharacterCodingException e) { + throw new InstrumentException(e); + } + } + /** * 创建新Buffer * @@ -246,4 +269,26 @@ public static ByteBuffer create(CharSequence data, Charset charset) { return create(StringKit.bytes(data, charset)); } + /** + * 检查提供的BytebBuffer是否包含有效的utf8编码字符串 + * + * @param data the ByteBuffer + * @param off 偏移量(出于性能原因) + * @return 字节缓冲区是否包含一个有效的utf8编码字符串 + */ + public static boolean isValidUTF8(ByteBuffer data, int off) { + int len = data.remaining(); + if (len < off) { + return false; + } + int state = 0; + for (int i = off; i < len; ++i) { + state = Normal.DECODE_64_TABLE[256 + (state << 4) + Normal.DECODE_64_TABLE[(0xff & data.get(i))]]; + if (state == 1) { + return false; + } + } + return true; + } + } diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java index 0435c8fe2b..98e18d5c6a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ByteKit.java @@ -32,11 +32,350 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ByteKit { + public static byte[] getBytes(int data) { + byte[] bytes = new byte[4]; + bytes[0] = (byte) (data & 0xff); + bytes[1] = (byte) ((data & 0xff00) >> 8); + bytes[2] = (byte) ((data & 0xff0000) >> 16); + bytes[3] = (byte) ((data & 0xff000000) >> 24); + return bytes; + } + + public static byte[] getBytes(long data) { + byte[] bytes = new byte[8]; + bytes[0] = (byte) (data & 0xff); + bytes[1] = (byte) ((data >> 8) & 0xff); + bytes[2] = (byte) ((data >> 16) & 0xff); + bytes[3] = (byte) ((data >> 24) & 0xff); + bytes[4] = (byte) ((data >> 32) & 0xff); + bytes[5] = (byte) ((data >> 40) & 0xff); + bytes[6] = (byte) ((data >> 48) & 0xff); + bytes[7] = (byte) ((data >> 56) & 0xff); + return bytes; + } + + public static byte[] getBytes(float data) { + int intBits = Float.floatToIntBits(data); + return getBytes(intBits); + } + + public static byte[] getBytes(double data) { + long intBits = Double.doubleToLongBits(data); + return getBytes(intBits); + } + + public static byte[] getBytes(short data) { + byte[] bytes = new byte[2]; + bytes[0] = (byte) (data & 0xff); + bytes[1] = (byte) ((data & 0xff00) >> 8); + return bytes; + } + + public static byte[] getBytes(char data) { + byte[] bytes = new byte[2]; + bytes[0] = (byte) (data); + bytes[1] = (byte) (data >> 8); + return bytes; + } + + public static byte[] getBytes(String data) { + return getBytes(data, Charset.DEFAULT_GBK); + } + + public static byte[] getBytes(String data, String charsetName) { + return data.getBytes(Charset.charset(charsetName)); + } + + public static byte[] getBytes(char[] data) { + CharBuffer cb = CharBuffer.allocate(data.length); + cb.put(data); + cb.flip(); + ByteBuffer bb = Charset.UTF_8.encode(cb); + return bb.array(); + } + + public static int getInt(byte[] bytes) { + return (0xff & bytes[0]) | (0xff00 & (bytes[1] << 8)) | (0xff0000 & (bytes[2] << 16)) | (0xff000000 & (bytes[3] << 24)); + } + + public static long getLong(byte[] bytes) { + return (0xffL & (long) bytes[0]) | (0xff00L & ((long) bytes[1] << 8)) | (0xff0000L & ((long) bytes[2] << 16)) | (0xff000000L & ((long) bytes[3] << 24)) + | (0xff00000000L & ((long) bytes[4] << 32)) | (0xff0000000000L & ((long) bytes[5] << 40)) | (0xff000000000000L & ((long) bytes[6] << 48)) | (0xff00000000000000L & ((long) bytes[7] << 56)); + } + + public static float getFloat(byte[] bytes) { + return Float.intBitsToFloat(getInt(bytes)); + } + + public static double getDouble(byte[] bytes) { + return Double.longBitsToDouble(getLong(bytes)); + } + + public static short getShort(byte[] bytes) { + return (short) ((0xff & bytes[0]) | (0xff00 & (bytes[1] << 8))); + } + + public static char getChar(byte[] bytes) { + return (char) ((0xff & bytes[0]) | (0xff00 & (bytes[1] << 8))); + } + + public static String getString(byte[] bytes) { + return getString(bytes, "GBK"); + } + + public static String getString(byte[] bytes, String charsetName) { + return new String(bytes, Charset.charset(charsetName)); + } + + /** + * 根据分隔符拆分字节数组 + * + * @param arr 字节数组 + * @param separator 分隔符 + * @return the byte + */ + public static byte[][] split(byte[] arr, byte separator) { + int count = countOf(arr, separator); + byte[][] result = new byte[count + 1][]; + int index = indexOf(arr, separator, 0, arr.length); + if (index < 0) { + result[0] = arr; + } else { + result[0] = subArray(arr, 0, index); + for (int i = 1; i <= count; i++) { + int from = index + 1; + index = indexOf(arr, separator, from, arr.length); + if (index < from) { + index = arr.length; + } + result[i] = subArray(arr, from, index); + } + } + return result; + } + + + /** + * 拆分byte数组为几个等份(最后一份可能小于len) + * + * @param array 数组 + * @param len 每个小节的长度 + * @return 拆分后的数组 + */ + public static byte[][] split(byte[] array, int len) { + int x = array.length / len; + int y = array.length % len; + int z = 0; + if (y != 0) { + z = 1; + } + byte[][] arrays = new byte[x + z][]; + byte[] arr; + for (int i = 0; i < x + z; i++) { + arr = new byte[len]; + if (i == x + z - 1 && y != 0) { + System.arraycopy(array, i * len, arr, 0, y); + } else { + System.arraycopy(array, i * len, arr, 0, len); + } + arrays[i] = arr; + } + return arrays; + } + + /** + * 截取子数组 + * + * @param arr 字节数组 + * @param from 开始下标(包含) + * @return the byte + */ + public static byte[] subArray(byte[] arr, int from) { + return subArray(arr, from, arr.length); + } + + + /** + * 截取子数组 + * + * @param arr 字节数组 + * @param from 开始下标(包含) + * @param to 结束下标(不包含) + * @return the byte + */ + public static byte[] subArray(byte[] arr, int from, int to) { + byte[] result = new byte[to - from]; + if (to > from) { + System.arraycopy(arr, from, result, 0, result.length); + } + return result; + } + + /** + * 连接多个字节数组 + * + * @param hyphen 连字符 + * @param arrs 二维数组 + * @return the byte + */ + public static byte[] join(byte hyphen, byte[]... arrs) { + int length = 0; + for (byte[] arr : arrs) { + length += arr.length; + } + byte[] result = new byte[length + arrs.length - 1]; + int index = 0; + for (int i = 0; i < arrs.length; i++) { + byte[] arr = arrs[i]; + System.arraycopy(arr, 0, result, index, arr.length); + index += arr.length; + if (i < arrs.length - 1) { + result[index] = hyphen; + index++; + } + } + return result; + } + + /** + * 连接多个字节数组 + * + * @param arrs 二维数组 + * @return the byte + */ + public static byte[] join(byte[]... arrs) { + int length = 0; + for (byte[] arr : arrs) { + length += arr.length; + } + byte[] result = new byte[length]; + int index = 0; + for (byte[] arr : arrs) { + System.arraycopy(arr, 0, result, index, arr.length); + index += arr.length; + } + return result; + } + + /** + * 首尾去掉空字符 + * + * @param src 字节数组 + * @param empty 空数组 + * @return the byte + */ + public static byte[] trim(byte[] src, byte empty) { + return trim(src, empty, 0, src.length); + } + + /** + * 从 from 到 to 截取子串 并 首尾去掉空字符 + * + * @param src 字节数组 + * @param empty 空字节 + * @param from 开始下标(包含) + * @param to 结束下标(不包含) + * @return the byte + */ + public static byte[] trim(byte[] src, byte empty, int from, int to) { + while (from < src.length - 1 && src[from] == empty) { + from++; + } + while (to > from && src[to - 1] == empty) { + to--; + } + return subArray(src, from, to); + } + + + /** + * 寻找目标字节在字节数组中的下标 + * + * @param arr 字节数组 + * @param target 目标字节 + * @param from 检索开始下标(包含) + * @param to 检索结束下标(不包含) + * @return 找不到则返回-1 + */ + public static int indexOf(byte[] arr, byte target, int from, int to) { + for (int i = from; i < to; i++) { + if (arr[i] == target) { + return i; + } + } + return -1; + } + + /** + * 统计目标字节在字节数组中出现的次数 + * + * @param arr 字节数组 + * @param target 目标字节 + * @return the int + */ + public static int countOf(byte[] arr, byte target) { + int count = 0; + for (byte b : arr) { + if (b == target) { + count++; + } + } + return count; + } + + + /** + * 解析 BCD 码 + * + * @param src 字节数组 + * @param from 开始下标(包含) + * @param to 结束下标(不包含) + * @return the string + */ + public static String bcd(byte[] src, int from, int to) { + char[] chars = new char[2 * (to - from)]; + for (int i = from; i < to; i++) { + int b = unsigned(src[i]); + chars[2 * (i - from)] = (char) ((b >> 4) + 0x30); + chars[2 * (i - from) + 1] = (char) ((b & 0xF) + 0x30); + } + return new String(chars); + } + + /** + * 无符号整数 + * + * @param value 字节 + * @return the int + */ + public static int unsigned(byte value) { + if (value >= 0) { + return value; + } + return 256 + value; + } + + /** + * 异或值,返回 + * + * @param bytes 数组 + * @return 异或值 + */ + public static int xor(byte[] bytes) { + int temp = 0; + if (bytes != null) { + for (int i = 0; i < bytes.length; i++) { + temp ^= bytes[i]; + } + } + return temp; + } + public static int bytesToVR(byte[] bytes, int off) { return bytesToUShortBE(bytes, off); } @@ -54,11 +393,6 @@ public static int bytesToUShortLE(byte[] bytes, int off) { return ((bytes[off + 1] & 255) << 8) + (bytes[off] & 255); } - public static int bytesToShort(byte[] bytes, int off, boolean bigEndian) { - return bigEndian ? bytesToShortBE(bytes, off) - : bytesToShortLE(bytes, off); - } - public static int bytesToShortBE(byte[] bytes, int off) { return (bytes[off] << 8) + (bytes[off + 1] & 255); } @@ -67,14 +401,7 @@ public static int bytesToShortLE(byte[] bytes, int off) { return (bytes[off + 1] << 8) + (bytes[off] & 255); } - public static void bytesToShorts(byte[] b, short[] s, int off, int len, boolean bigEndian) { - if (bigEndian) - bytesToShortsBE(b, s, off, len); - else - bytesToShortsLE(b, s, off, len); - } - - public static void bytesToShortsLE(byte[] b, short[] s, int off, int len) { + public static void bytesToShortLE(byte[] b, short[] s, int off, int len) { int boff = 0; for (int j = 0; j < len; j++) { int b0 = b[boff + 1]; @@ -94,6 +421,18 @@ public static void bytesToShortsBE(byte[] b, short[] s, int off, int len) { } } + public static int bytesToShort(byte[] bytes, int off, boolean bigEndian) { + return bigEndian ? bytesToShortBE(bytes, off) + : bytesToShortLE(bytes, off); + } + + public static void bytesToShort(byte[] b, short[] s, int off, int len, boolean bigEndian) { + if (bigEndian) + bytesToShortsBE(b, s, off, len); + else + bytesToShortLE(b, s, off, len); + } + public static int bytesToInt(byte[] bytes, int off, boolean bigEndian) { return bigEndian ? bytesToIntBE(bytes, off) : bytesToIntLE(bytes, off); } @@ -356,48 +695,20 @@ public static byte[] intsToBytesLE(int... values) { return ret; } - public static byte[] getBytes(char[] chars) { - java.nio.charset.Charset cs = Charset.UTF_8; - CharBuffer cb = CharBuffer.allocate(chars.length); - cb.put(chars); - cb.flip(); - ByteBuffer bb = cs.encode(cb); - return bb.array(); - } - - public static byte[] charToByte(char c) { - byte[] b = new byte[2]; - b[0] = (byte) ((c & 0xFF00) >> 8); - b[1] = (byte) (c & 0xFF); - return b; - } - /** - * 拆分byte数组为几个等份(最后一份可能小于len) + * 将两个字节数组连接到一个新的字节数组 * - * @param array 数组 - * @param len 每个小节的长度 - * @return 拆分后的数组 + * @param buf1 字节数组 + * @param buf2 字节数组 + * @return the byte */ - public static byte[][] split(byte[] array, int len) { - int x = array.length / len; - int y = array.length % len; - int z = 0; - if (y != 0) { - z = 1; - } - byte[][] arrays = new byte[x + z][]; - byte[] arr; - for (int i = 0; i < x + z; i++) { - arr = new byte[len]; - if (i == x + z - 1 && y != 0) { - System.arraycopy(array, i * len, arr, 0, y); - } else { - System.arraycopy(array, i * len, arr, 0, len); - } - arrays[i] = arr; - } - return arrays; + public static byte[] concat(byte[] buf1, byte[] buf2) { + byte[] buffer = new byte[buf1.length + buf2.length]; + int offset = 0; + System.arraycopy(buf1, 0, buffer, offset, buf1.length); + offset += buf1.length; + System.arraycopy(buf2, 0, buffer, offset, buf2.length); + return buffer; } } diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java index c66fa5d17b..8557555c25 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CallerKit.java @@ -34,7 +34,7 @@ * 调用者 可以通过此类的方法获取调用者、多级调用者以及判断是否被调用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CallerKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java index 4c42068d9c..b78484ce56 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CardKit.java @@ -35,7 +35,7 @@ * 银行卡工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CardKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CertKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CertKit.java index 125ee7acce..8e24eaba9d 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CertKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CertKit.java @@ -36,7 +36,7 @@ * 获取ssl证书信息工具类 * * @author zhaocy - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CertKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java index 65c30385d7..df8cabaf35 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CharKit.java @@ -36,7 +36,7 @@ * 部分工具来自于Apache * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CharKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java index a564764597..bac6efd972 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CitizenIdKit.java @@ -37,7 +37,7 @@ * 身份证相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CitizenIdKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java index 3e704ae751..df8c955476 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ClassKit.java @@ -53,7 +53,7 @@ * Class工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ClassKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CollKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CollKit.java index e10c642920..ec35b2213a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CollKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CollKit.java @@ -56,7 +56,7 @@ * 集合相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CollKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java index 3d466ad230..4dc1895744 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/CsvKit.java @@ -38,7 +38,7 @@ * CSV工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CsvKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java index 875944e061..2947421621 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/DateKit.java @@ -55,7 +55,7 @@ * 时间工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DateKit extends GregorianCalendar { @@ -1816,7 +1816,7 @@ public static long betweenDay(Date beginDate, Date endDate, boolean isReset) { /** * 计算两个日期相差月数 - * 在非重置情况下,如果起始日期的天小于结束日期的天,月数要少算1(不足1个月) + * 在非重置情况下,如果起始日期的天大于结束日期的天,月数要少算1(不足1个月) * * @param beginDate 起始日期 * @param endDate 结束日期 @@ -1829,7 +1829,7 @@ public static long betweenMonth(Date beginDate, Date endDate, boolean isReset) { /** * 计算两个日期相差年数 - * 在非重置情况下,如果起始日期的月小于结束日期的月,年数要少算1(不足1年) + * 在非重置情况下,如果起始日期的月大于结束日期的月,年数要少算1(不足1年) * * @param beginDate 起始日期 * @param endDate 结束日期 diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java index afd7b0b9c4..cd39d24bcb 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EnumKit.java @@ -34,7 +34,7 @@ * 枚举工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EnumKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java index 3a77671315..c8d8460b8a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/EscapeKit.java @@ -34,7 +34,7 @@ * Java, Java Script, HTML and XML. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EscapeKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java index d9247dc05e..297edce4ca 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/FileKit.java @@ -39,9 +39,7 @@ import java.io.*; import java.lang.System; -import java.net.URI; -import java.net.URL; -import java.net.URLConnection; +import java.net.*; import java.nio.file.*; import java.nio.file.attribute.BasicFileAttributes; import java.text.DecimalFormat; @@ -55,7 +53,7 @@ * 文件工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileKit { @@ -3534,11 +3532,31 @@ public static File checkSlip(File parentFile, File file) throws IllegalArgumentE /** * 根据文件扩展名获得MimeType * - * @param filePath 文件路径或文件名 + * @param path 文件路径或文件名 * @return MimeType */ - public static String getMimeType(String filePath) { - return URLConnection.getFileNameMap().getContentTypeFor(filePath); + public static String getMimeType(String path) { + try { + FileNameMap fileNameMap = URLConnection.getFileNameMap(); + return fileNameMap.getContentTypeFor(URLEncoder.encode(path, Charset.DEFAULT_UTF_8)); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return null; + } + + /** + * 获得文件的MimeType + * + * @param file 文件 + * @return MimeType + */ + public static String getMimeType(Path file) { + try { + return Files.probeContentType(file); + } catch (IOException e) { + throw new InstrumentException(e); + } } /** @@ -3896,6 +3914,53 @@ public static boolean isType(String fileName, String... extNames) { return StringKit.equalsAnyIgnoreCase(extName(fileName), extNames); } + /** + * 判断文件或目录是否存在 + * + * @param path 文件 + * @param isFollowLinks 是否跟踪软链(快捷方式) + * @return 是否存在 + */ + public static boolean isEexist(Path path, boolean isFollowLinks) { + final LinkOption[] options = isFollowLinks ? new LinkOption[0] : new LinkOption[]{LinkOption.NOFOLLOW_LINKS}; + return Files.exists(path, options); + } + + /** + * 判断给定的目录是否为给定文件或文件夹的子目录 + * + * @param parent 父目录 + * @param sub 子目录 + * @return 子目录是否为父目录的子目录 + */ + public static boolean isSub(File parent, File sub) { + Assert.notNull(parent); + Assert.notNull(sub); + return isSub(parent.toPath(), sub.toPath()); + } + + /** + * 判断给定的目录是否为给定文件或文件夹的子目录 + * + * @param parent 父目录 + * @param sub 子目录 + * @return 子目录是否为父目录的子目录 + */ + public static boolean isSub(Path parent, Path sub) { + return toAbsNormal(sub).startsWith(toAbsNormal(parent)); + } + + /** + * 将Path路径转换为标准的绝对路径 + * + * @param path 文件或目录Path + * @return 转换后的Path + */ + public static Path toAbsNormal(Path path) { + Assert.notNull(path); + return path.toAbsolutePath().normalize(); + } + /** * 根据压缩包中的路径构建目录结构,在Win下直接构建,在Linux下拆分路径单独构建 * @@ -3917,7 +3982,6 @@ private static File buildFile(File outFile, String fileName) { //由于路径拆分,slip不检查,在最后一步检查 outFile = new File(outFile, pathParts.get(i)); } - //noinspection ResultOfMethodCallIgnored outFile.mkdirs(); // 最后一个部分如果非空,作为文件名 fileName = pathParts.get(lastPartIndex); diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java index 40f7e02c70..1063b54bd2 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/GeoKit.java @@ -40,7 +40,7 @@ * 地理区域坐标距离计算工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GeoKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java index f736185a90..d118a9808c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HashKit.java @@ -30,7 +30,7 @@ * 推荐使用FNV1算法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HashKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java index 49632a34a7..aef00978e7 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/HexKit.java @@ -39,7 +39,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HexKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java index 01d94fda2f..fa2b3a754c 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ImageKit.java @@ -56,7 +56,7 @@ * 彩色转黑白、文字水印、图片水印等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java index 5b7ef9796b..82d1b6abb5 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IoKit.java @@ -56,7 +56,7 @@ * 原因是流可能被多次读写,读写关闭后容易造成问题 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IoKit { @@ -263,6 +263,50 @@ public static long copy(InputStream in, OutputStream out, int bufferSize, Stream return size; } + /** + * 拷贝文件Channel,使用NIO,拷贝后不会关闭channel + * + * @param inChannel {@link FileChannel} + * @param outChannel {@link FileChannel} + * @return 拷贝的字节数 + * @throws InstrumentException IO异常 + */ + public static long copy(FileChannel inChannel, FileChannel outChannel) throws InstrumentException { + Assert.notNull(inChannel, "In channel is null!"); + Assert.notNull(outChannel, "Out channel is null!"); + + try { + return inChannel.transferTo(0, inChannel.size(), outChannel); + } catch (IOException e) { + throw new InstrumentException(e); + } + } + + /** + * 拷贝流,使用NIO,不会关闭channel + * + * @param in {@link ReadableByteChannel} + * @param out {@link WritableByteChannel} + * @return 拷贝的字节数 + * @throws InstrumentException IO异常 + */ + public static long copy(ReadableByteChannel in, WritableByteChannel out) throws InstrumentException { + return copy(in, out, DEFAULT_BUFFER_SIZE); + } + + /** + * 拷贝流,使用NIO,不会关闭channel + * + * @param in {@link ReadableByteChannel} + * @param out {@link WritableByteChannel} + * @param bufferSize 缓冲大小,如果小于等于0,使用默认 + * @return 拷贝的字节数 + * @throws InstrumentException IO异常 + */ + public static long copy(ReadableByteChannel in, WritableByteChannel out, int bufferSize) throws InstrumentException { + return copy(in, out, bufferSize, null); + } + /** * 拷贝流 thanks to: https://github.com/venusdrogon/feilong-io/blob/master/src/main/java/com/feilong/io/IOWriteUtil.java * 本方法不会关闭流 @@ -462,8 +506,26 @@ public static String read(InputStream in, java.nio.charset.Charset charset) thro * @throws InstrumentException 异常 */ public static ByteArrayOutputStream read(InputStream in) throws InstrumentException { + return read(in, true); + } + + /** + * 从流中读取内容,读到输出流中,读取完毕后并不关闭流 + * + * @param in 输入流 + * @param isClose 读取完毕后是否关闭流 + * @return 输出流 + * @throws InstrumentException IO异常 + */ + public static ByteArrayOutputStream read(InputStream in, boolean isClose) throws InstrumentException { final ByteArrayOutputStream out = new ByteArrayOutputStream(); - copy(in, out); + try { + copy(in, out); + } finally { + if (isClose) { + close(in); + } + } return out; } @@ -544,6 +606,32 @@ public static String read(FileChannel fileChannel, java.nio.charset.Charset char return StringKit.toString(buffer, charset); } + /** + * 从流中读取内容,读取完毕后并不关闭流 + * + * @param channel 可读通道,读取完毕后并不关闭通道 + * @param charset 字符集 + * @return 内容 + * @throws InstrumentException IO异常 + */ + public static String read(ReadableByteChannel channel, java.nio.charset.Charset charset) throws InstrumentException { + ByteArrayOutputStream out = read(channel); + return null == charset ? out.toString() : out.toString(charset); + } + + /** + * 从流中读取内容,读到输出流中 + * + * @param channel 可读通道,读取完毕后并不关闭通道 + * @return 输出流 + * @throws InstrumentException IO异常 + */ + public static ByteArrayOutputStream read(ReadableByteChannel channel) throws InstrumentException { + final ByteArrayOutputStream out = new ByteArrayOutputStream(); + copy(channel, Channels.newChannel(out)); + return out; + } + /** * 从流中读取bytes * @@ -552,9 +640,35 @@ public static String read(FileChannel fileChannel, java.nio.charset.Charset char * @throws InstrumentException 异常 */ public static byte[] readBytes(InputStream in) throws InstrumentException { - final ByteArrayOutputStream out = new ByteArrayOutputStream(); - copy(in, out); - return out.toByteArray(); + return readBytes(in, true); + } + + /** + * 从流中读取bytes + * + * @param in {@link InputStream} + * @param isCLose 是否关闭输入流 + * @return bytes + * @throws InstrumentException IO异常 + */ + public static byte[] readBytes(InputStream in, boolean isCLose) throws InstrumentException { + if (in instanceof FileInputStream) { + // 文件流的长度是可预见的,此时直接读取效率更高 + final byte[] result; + try { + final int available = in.available(); + result = new byte[available]; + final int readLength = in.read(result); + if (readLength != available) { + throw new IOException(StringKit.format("File length is [{}] but read [{}]!", available, readLength)); + } + } catch (IOException e) { + throw new InstrumentException(e); + } + return result; + } + // 未知bytes总量的流 + return read(in, isCLose).toByteArray(); } /** diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java index 99ec209068..0b8ecd3a47 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/IterKit.java @@ -38,7 +38,7 @@ * {@link Iterable} 和 {@link Iterator} 相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IterKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java index 496eee8e13..3b97b9abc3 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MapKit.java @@ -40,7 +40,7 @@ * Map相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapKit { @@ -1030,6 +1030,34 @@ public static T get(Map map, Object key, Class type, T defaultValue return null == map ? null : Convert.convert(type, map.get(key), defaultValue); } + /** + * 获取Map指定key的值,并转换为指定类型,此方法在转换失败后不抛异常,返回null。 + * + * @param 目标值类型 + * @param map Map + * @param key 键 + * @param type 值类型 + * @param defaultValue 默认值 + * @return 值 + */ + public static T getQuietly(Map map, Object key, Class type, T defaultValue) { + return null == map ? null : Convert.convertQuietly(type, map.get(key), defaultValue); + } + + /** + * 获取Map指定key的值,并转换为指定类型,转换失败后返回null,不抛异常 + * + * @param 目标值类型 + * @param map Map + * @param key 键 + * @param type 值类型 + * @param defaultValue 默认值 + * @return 值 + */ + public static T getQuietly(Map map, Object key, Types type, T defaultValue) { + return null == map ? null : Convert.convertQuietly(type, map.get(key), defaultValue); + } + /** * 重命名键 * 实现方式为一处然后重新put,当旧的key不存在直接返回 diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java index 240d09d73a..34fce16761 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/MathKit.java @@ -47,7 +47,7 @@ * 计量标准 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MathKit { @@ -55,7 +55,7 @@ public class MathKit { /** * 默认除法运算精度 */ - private static final int DEFAUT_DIV_SCALE = 10; + private static final int DEFAULT_DIV_SCALE = 10; /** * bytes 长度 */ @@ -457,7 +457,7 @@ public static BigDecimal mul(BigDecimal... values) { * @return 两个参数的商 */ public static double div(float v1, float v2) { - return div(v1, v2, DEFAUT_DIV_SCALE); + return div(v1, v2, DEFAULT_DIV_SCALE); } /** @@ -468,7 +468,7 @@ public static double div(float v1, float v2) { * @return 两个参数的商 */ public static double div(float v1, double v2) { - return div(v1, v2, DEFAUT_DIV_SCALE); + return div(v1, v2, DEFAULT_DIV_SCALE); } /** @@ -479,7 +479,7 @@ public static double div(float v1, double v2) { * @return 两个参数的商 */ public static double div(double v1, float v2) { - return div(v1, v2, DEFAUT_DIV_SCALE); + return div(v1, v2, DEFAULT_DIV_SCALE); } /** @@ -490,7 +490,7 @@ public static double div(double v1, float v2) { * @return 两个参数的商 */ public static double div(double v1, double v2) { - return div(v1, v2, DEFAUT_DIV_SCALE); + return div(v1, v2, DEFAULT_DIV_SCALE); } /** @@ -501,7 +501,7 @@ public static double div(double v1, double v2) { * @return 两个参数的商 */ public static BigDecimal div(Number v1, Number v2) { - return div(v1, v2, DEFAUT_DIV_SCALE); + return div(v1, v2, DEFAULT_DIV_SCALE); } /** @@ -512,7 +512,7 @@ public static BigDecimal div(Number v1, Number v2) { * @return 两个参数的商 */ public static BigDecimal div(String v1, String v2) { - return div(v1, v2, DEFAUT_DIV_SCALE); + return div(v1, v2, DEFAULT_DIV_SCALE); } /** diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java index cedb478749..159308af12 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NameKit.java @@ -32,7 +32,7 @@ * 生成姓名 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NameKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java index 050e7985d3..7e40b324d6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/NetKit.java @@ -39,7 +39,7 @@ * 网络相关工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NetKit { @@ -202,7 +202,7 @@ public static TreeSet getUsableLocalPorts(int numRequested, int minPort /** * 判定是否为内网IP - * 私有IP:A类 10.0.0.0-10.255.255.255 B类 172.16.1.5-172.31.255.255 C类 192.168.0.0-192.168.255.255 当然,还有127这个网段是环回地址 + * 私有IP:A类 10.0.0.0-10.255.255.255 B类 172.16.1.6-172.31.255.255 C类 192.168.0.0-192.168.255.255 当然,还有127这个网段是环回地址 * * @param ipAddress IP地址 * @return 是否为内网IP @@ -214,7 +214,7 @@ public static boolean isInnerIP(String ipAddress) { long aBegin = ipv4ToLong("10.0.0.0"); long aEnd = ipv4ToLong("10.255.255.255"); - long bBegin = ipv4ToLong("172.16.1.5"); + long bBegin = ipv4ToLong("172.16.1.6"); long bEnd = ipv4ToLong("172.31.255.255"); long cBegin = ipv4ToLong("192.168.0.0"); @@ -461,7 +461,7 @@ public static InetAddress getLocalhost() { final LinkedHashSet localAddressList = localAddressList(address -> { // 非loopback地址,指127.*.*.*的地址 return false == address.isLoopbackAddress() - // 非地区本地地址,指10.0.0.0 ~ 10.255.255.255、172.16.1.5 ~ 172.31.255.255、192.168.0.0 ~ 192.168.255.255 + // 非地区本地地址,指10.0.0.0 ~ 10.255.255.255、172.16.1.6 ~ 172.31.255.255、192.168.0.0 ~ 192.168.255.255 && false == address.isSiteLocalAddress() // 需为IPV4地址 && address instanceof Inet4Address; diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java index 0769f41796..ddf3f8d8ed 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ObjectKit.java @@ -45,7 +45,7 @@ * 一些通用的函数 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ObjectKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java index d406c8c385..aa6e90e270 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/PatternKit.java @@ -40,7 +40,7 @@ * 常用正则表达式集合 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PatternKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/RandomKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/RandomKit.java index 67db27f79b..38716db54a 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/RandomKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/RandomKit.java @@ -44,7 +44,7 @@ * 随机工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RandomKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ReflectKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ReflectKit.java index c17cf0f16b..60443cd535 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ReflectKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ReflectKit.java @@ -38,7 +38,7 @@ * 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReflectKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java index 9af270c0bb..2f85fad15e 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/RuntimeKit.java @@ -48,7 +48,7 @@ * 用于执行系统命令的工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RuntimeKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java index 93bdb3145a..c425cf4408 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StreamKit.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StreamKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java index 288ce4f40a..4b39ed04c6 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/StringKit.java @@ -45,7 +45,7 @@ * 用于MD5,加解密和字符串编码转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StringKit { @@ -5397,7 +5397,7 @@ public static String brief(CharSequence str, int maxLength) { if (null == str) { return null; } - if (str.length() <= maxLength) { + if (maxLength <= 0 || str.length() <= maxLength) { return str.toString(); } int w = maxLength / 2; diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java index 7ec8550fd1..aa9a60226f 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/SwingKit.java @@ -44,7 +44,7 @@ * 显示器等相关工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SwingKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java index e10eeac68c..bfdeb1fcea 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TextKit.java @@ -36,7 +36,7 @@ * 可复用的字符串生成器,非线程安全 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TextKit implements CharSequence, Appendable, Serializable { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java index 6c1e85b320..4e86d01ff0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ThreadKit.java @@ -37,7 +37,7 @@ * 线程池工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ThreadKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java index a9b146ca61..1bd0bce7ef 100644 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TreeKit.java @@ -46,7 +46,7 @@ * 6、代码简洁轻量无额外依赖 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TreeKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java index 381bfe7c42..228d2ee3e0 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/TypeKit.java @@ -44,7 +44,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TypeKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/UriKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/UriKit.java index 666a9964fa..32db0ec081 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/UriKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/UriKit.java @@ -39,7 +39,7 @@ * URL相关工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UriKit { @@ -521,9 +521,11 @@ public static JarFile getJarFile(URL url) { /** * 标准化URL字符串,包括: * - *

-     * 1. 多个/替换为一个
-     * 
+ *
    + *
  1. 自动补齐“http://”头
  2. + *
  3. 去除开头的\或者/
  4. + *
  5. 替换\为/
  6. + *
* * @param url URL字符串 * @return 标准化后的URL字符串 @@ -535,15 +537,35 @@ public static String normalize(String url) { /** * 标准化URL字符串,包括: * - *
-     * 1. 多个/替换为一个
-     * 
+ *
    + *
  1. 自动补齐“http://”头
  2. + *
  3. 去除开头的\或者/
  4. + *
  5. 替换\为/
  6. + *
* * @param url URL字符串 - * @param isEncode 是否对URL中path部分的中文和特殊字符做转义(不包括 http:, /和域名部分) + * @param isEncode 是否对URL中path部分的中文和特殊字符做转义(不包括 http:, /和域名部分) * @return 标准化后的URL字符串 */ public static String normalize(String url, boolean isEncode) { + return normalize(url, isEncode, false); + } + + /** + * 标准化URL字符串,包括: + * + *
    + *
  1. 自动补齐“http://”头
  2. + *
  3. 去除开头的\或者/
  4. + *
  5. 替换\为/
  6. + *
+ * + * @param url URL字符串 + * @param isEncode 是否对URL中path部分的中文和特殊字符做转义(不包括 http:, /和域名部分) + * @param isReplace 是否替换url body中的 // + * @return 标准化后的URL字符串 + */ + public static String normalize(String url, boolean isEncode, boolean isReplace) { if (StringKit.isBlank(url)) { return url; } @@ -554,7 +576,7 @@ public static String normalize(String url, boolean isEncode) { protocol = StringKit.subPre(url, sepIndex + 3); body = StringKit.subSuf(url, sepIndex + 3); } else { - protocol = "http://"; + protocol = Http.HTTP_PREFIX; body = url; } @@ -567,10 +589,13 @@ public static String normalize(String url, boolean isEncode) { if (StringKit.isNotEmpty(body)) { // 去除开头的\或者/ - //noinspection ConstantConditions body = body.replaceAll("^[\\\\/]+", Normal.EMPTY); // 替换多个\或/为单个/ - body = body.replace(Symbol.BACKSLASH, Symbol.SLASH).replaceAll("//+", Symbol.SLASH); + body = body.replace(Symbol.BACKSLASH, Symbol.SLASH); + // 双斜杠在URL中是允许存在的,默认不做替换 + if (isReplace) { + body = body.replaceAll("//+", Symbol.SLASH); + } } final int pathSepIndex = StringKit.indexOf(body, Symbol.C_SLASH); diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java index 2e58a970df..e6e61898ce 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/WatchKit.java @@ -40,7 +40,7 @@ * 主要负责文件监听器的快捷创建 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WatchKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java index 1b429c1fa4..46ac237941 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/XmlKit.java @@ -60,7 +60,7 @@ * 工具类封装了XML文档的创建、读取、写出和部分XML操作 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class XmlKit { diff --git a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java index 2480047f23..868ff24840 100755 --- a/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java +++ b/bus-core/src/main/java/org/aoju/bus/core/toolkit/ZipKit.java @@ -43,7 +43,7 @@ * 压缩工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ZipKit { @@ -874,7 +874,6 @@ public static InputStream get(File zipFile, Charset charset, String path) { * @param zipFile 压缩文件 * @param path 需要提取文件的文件名或路径 * @return 压缩文件流,如果未找到返回{@code null} - * @since 5.5.2 */ public static InputStream get(ZipFile zipFile, String path) { final ZipEntry entry = zipFile.getEntry(path); diff --git a/bus-cron/pom.xml b/bus-cron/pom.xml index 38ab82e24d..68c742d69f 100755 --- a/bus-cron/pom.xml +++ b/bus-cron/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-cron - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java b/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java index fd7322650b..7a010902c2 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Builder.java @@ -44,7 +44,7 @@ * {@link #setMatchSecond(boolean)} 方法用于定义是否使用秒匹配模式,如果为true,则定时任务表达式中的第一位为秒,否则为分,默认是分 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Configure.java b/bus-cron/src/main/java/org/aoju/bus/cron/Configure.java index c9757bf8b7..719e349304 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Configure.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Configure.java @@ -31,7 +31,7 @@ * 定时任务配置类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Configure { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java b/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java index d8411aa5d6..ee552e8fcd 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/CronTimer.java @@ -34,7 +34,7 @@ * 计时器线程每隔一分钟检查一次任务列表,一旦匹配到执行对应的Task * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CronTimer extends Thread { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java b/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java index 11e6890792..ab4d7ae1e6 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Executor.java @@ -33,7 +33,7 @@ * 执行具体的作业,执行完毕销毁 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Executor implements Runnable { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java b/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java index 6fa82df1cd..6e5c8343b7 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Expression.java @@ -36,7 +36,7 @@ * Crontab表达式提供了指定复杂时间组合的能力 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Expression implements Serializable, Cloneable { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java index 0df0af627f..2918db42f1 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Launcher.java @@ -31,7 +31,7 @@ * 检查完毕后启动器结束 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Launcher implements Runnable { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java b/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java index f78cdfe45c..1ca2df2e2a 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Manager.java @@ -36,7 +36,7 @@ * 负责管理作业的启动、停止等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Manager { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java b/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java index 30a08abc6a..3c2b1ec14c 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Repertoire.java @@ -43,7 +43,7 @@ * 任务的添加、移除使用读写锁保证线程安全性 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Repertoire { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java b/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java index a8625d77e2..5cc999a3d3 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Scheduler.java @@ -75,7 +75,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Scheduler { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java b/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java index d3bf69de87..f53c4ae705 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Strategy.java @@ -29,7 +29,7 @@ * 任务执行规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Strategy { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java b/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java index ed1422f2ea..a6fabe5b5b 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/Supervisor.java @@ -32,7 +32,7 @@ * 作业启动管理器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Supervisor { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java b/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java index 79b8abfc26..fffb8a4b02 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/annotation/Crontab.java @@ -33,7 +33,7 @@ * annotation for cron handler * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.TYPE}) diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/CronTask.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/CronTask.java index a2b5d370b2..3eeb0ecb7c 100644 --- a/bus-cron/src/main/java/org/aoju/bus/cron/factory/CronTask.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/CronTask.java @@ -31,7 +31,7 @@ * 定时作业,除了定义了作业,也定义了作业的执行周期以及ID * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CronTask implements Task { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java index 44b59166f9..44f5efe898 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/InvokeTask.java @@ -39,7 +39,7 @@ * 如果是静态方法直接执行,如果是对象方法,需要类有默认的构造方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InvokeTask implements Task { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java index da990c51d0..50f20ad30d 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/RunnableTask.java @@ -29,7 +29,7 @@ * {@link Runnable} 的 {@link Task}包装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RunnableTask implements Task { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java b/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java index 97e936e0e3..a680ca4a44 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/factory/Task.java @@ -29,7 +29,7 @@ * 定时作业接口,通过实现execute方法执行具体的任务 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java b/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java index ad48dfb88a..fd0c53126c 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/listener/SimpleTaskListener.java @@ -32,7 +32,7 @@ * 继承此监听后实现需要的方法即可 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleTaskListener implements TaskListener { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java index f31ca77962..5d7edeb878 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListener.java @@ -32,7 +32,7 @@ * 通过实现此接口,实现对定时任务的各个环节做监听 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TaskListener { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java index a72892d8a0..6675b1f926 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/listener/TaskListenerManager.java @@ -35,7 +35,7 @@ * 监听调度器,统一管理监听 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TaskListenerManager { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java index cece8d14cd..91acc62579 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/CronPattern.java @@ -93,7 +93,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CronPattern { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java index f018243852..8c16ff2536 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/AlwaysTrueValueMatcher.java @@ -31,7 +31,7 @@ * 值匹配,始终返回true * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AlwaysTrueValueMatcher implements ValueMatcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java index 74f096a340..6299bf9538 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/BoolArrayValueMatcher.java @@ -34,7 +34,7 @@ * 将表达式中的数字值列表转换为Boolean数组,匹配时匹配相应数组位 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BoolArrayValueMatcher implements ValueMatcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java index cefe16bce9..36b9f05346 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/DayOfMonthValueMatcher.java @@ -34,7 +34,7 @@ * 考虑每月的天数不同,切存在闰年情况,日匹配单独使用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DayOfMonthValueMatcher extends BoolArrayValueMatcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java index 55c335af74..abc1b3503b 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcher.java @@ -32,7 +32,7 @@ * 用于匹配日期位中对应数字是否匹配 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ValueMatcher extends Matcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java index dadc522a76..fe5e3d4ac6 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/ValueMatcherBuilder.java @@ -41,7 +41,7 @@ * {@link ValueMatcher} 构建器,用于构建表达式中每一项的匹配器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ValueMatcherBuilder { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java index fdb8853012..83349f7414 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/matcher/YearValueMatcher.java @@ -32,7 +32,7 @@ * 考虑年数字太大,不适合boolean数组,单独使用列表遍历匹配 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class YearValueMatcher implements ValueMatcher { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java index e727347910..525e281a91 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfMonthValueParser.java @@ -33,7 +33,7 @@ * 每月最多31天,32和“L”都表示最后一天 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DayOfMonthValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java index 5f705271af..deea853820 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/DayOfWeekValueParser.java @@ -32,7 +32,7 @@ * 1表示星期一,2表示星期二,依次类推,0和7都可以表示星期日 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DayOfWeekValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java index f815b66871..47ef3cca35 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/HourValueParser.java @@ -29,7 +29,7 @@ * 小时值处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HourValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java index 7242353c2d..77367840c4 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MinuteValueParser.java @@ -29,7 +29,7 @@ * 分钟值处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MinuteValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java index 75f72b8b50..d3a173a012 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/MonthValueParser.java @@ -31,7 +31,7 @@ * 月份值处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MonthValueParser extends SimpleValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java index 73fb3f18eb..d43fb105f2 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SecondValueParser.java @@ -29,7 +29,7 @@ * 秒值处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SecondValueParser extends MinuteValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java index c2e53cde4e..2c6436106e 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/SimpleValueParser.java @@ -31,7 +31,7 @@ * 简易值转换器 将给定String值转为int * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleValueParser implements ValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java index f2a16361da..f11c448ddd 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/ValueParser.java @@ -30,7 +30,7 @@ * 值处理用于限定表达式中相应位置的值范围,并转换表达式值为int值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ValueParser { diff --git a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java index 818674225e..b75eb60b13 100755 --- a/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java +++ b/bus-cron/src/main/java/org/aoju/bus/cron/pattern/parser/YearValueParser.java @@ -29,7 +29,7 @@ * 年值处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class YearValueParser extends SimpleValueParser { diff --git a/bus-crypto/pom.xml b/bus-crypto/pom.xml index a56f7ff4b2..caf0b9920c 100755 --- a/bus-crypto/pom.xml +++ b/bus-crypto/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-crypto - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java index 51f12f223a..53ea1facbf 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Builder.java @@ -88,7 +88,7 @@ * 3、摘要加密(digest),例如:MD5、SHA-1、SHA-256、HMAC等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java index 3529502b0c..b93da4408e 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Holder.java @@ -31,7 +31,7 @@ * 全局单例的 org.bouncycastle.jce.provider.BouncyCastleProvider 对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Holder { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java index 6f4784a850..f635b3842a 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Mode.java @@ -31,7 +31,7 @@ * 在加密时对明文分组的模式,它代表了不同的分组方式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Mode { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java index bc6cd434e5..84a9e64f84 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Padding.java @@ -31,7 +31,7 @@ * 需要在最后一个分组中填充一些数据使其凑满一个分组的长度。 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Padding { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java index bfec564d05..fdccb424b5 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Provider.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java index 1af42e9449..fb40cfe0fa 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/Registry.java @@ -38,7 +38,7 @@ * 注解和实现之间映射 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Registry { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java index f2ea25eec8..7e73981e3d 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Asymmetric.java @@ -50,7 +50,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Asymmetric extends Safety { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java index 3fd247b965..60e27b02ec 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/KeyType.java @@ -29,7 +29,7 @@ * 密钥类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum KeyType { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java index a1c4c453e3..88cb7fa109 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Keys.java @@ -41,7 +41,7 @@ * 非对称基础,提供锁、私钥和公钥的持有 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Keys> { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java index e3aa2c0c2e..eaa9d4e619 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/RSA.java @@ -52,7 +52,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RSA extends Asymmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java index ad9d8c1c42..b02a0a2e42 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/SM2.java @@ -53,7 +53,7 @@ * SM2算法只支持公钥加密,私钥解密 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SM2 extends Safety { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java index c57c0aa1b2..9b1888e616 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Safety.java @@ -44,7 +44,7 @@ * * @param 返回自身类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Safety> extends Keys { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java index 9cd7e179c1..7ec231b443 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/asymmetric/Sign.java @@ -40,7 +40,7 @@ * 签名包装,{@link Signature} 包装类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Sign extends Keys { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java index 1db5316b49..ce76929977 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/BCrypt.java @@ -37,7 +37,7 @@ * 它的口令必须是8至56个字符,并将在内部被转化为448位的密钥 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BCrypt { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java index eec50ae496..93fd6c69f5 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/Digester.java @@ -43,7 +43,7 @@ * 注意:此对象实例化后为非线程安全! * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Digester implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java index 4efebb5f94..e632bf7c08 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/HMac.java @@ -51,7 +51,7 @@ * 注意:此对象实例化后为非线程安全! * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HMac implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java index 73d31f3ab6..4734431df1 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/MD5.java @@ -36,7 +36,7 @@ * MD5算法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MD5 extends Digester { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java index fa38f1a994..4b605f994d 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/SM3.java @@ -31,7 +31,7 @@ * SM3算法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SM3 extends Digester { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java index 9b107ae64f..782838fe98 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/BCHMacEngine.java @@ -41,7 +41,7 @@ * 当引入BouncyCastle库时自动使用其作为Provider * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BCHMacEngine implements MacEngine { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java index 85d63a27bd..49485bae5a 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/DefaultHMacEngine.java @@ -41,7 +41,7 @@ * 当引入BouncyCastle库时自动使用其作为Provider * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultHMacEngine implements MacEngine { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java index 26f095596d..3aaa92bf5c 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngine.java @@ -33,7 +33,7 @@ * MAC(Message Authentication Code)算法引擎 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface MacEngine { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java index 0cf32b58ec..21c274217d 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/digest/mac/MacEngineFactory.java @@ -34,7 +34,7 @@ * {@link MacEngine} 实现工厂类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MacEngineFactory { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java index 3ab4588017..f669c13d59 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/AESProvider.java @@ -39,7 +39,7 @@ * 达到十亿量级 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AESProvider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java index 451fbb9978..6d904d115b 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/DESProvider.java @@ -35,7 +35,7 @@ * 数据加密标准,速度较快,适用于加密大量数据的场合 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DESProvider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java index c7ca921931..17aa04981a 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RC4Provider.java @@ -39,7 +39,7 @@ * 达到十亿量级 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RC4Provider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java index 2416347112..68f83744e6 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/RSAProvider.java @@ -37,7 +37,7 @@ * RSA 加密解密算法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RSAProvider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java index 07259908fe..25edf37f09 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM2Provider.java @@ -38,7 +38,7 @@ * RSA 加密解密算法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SM2Provider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java index 7a13490961..44e46845fe 100755 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/provider/SM4Provider.java @@ -40,7 +40,7 @@ * 达到十亿量级 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SM4Provider implements Provider { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java index 9952bb30b6..4036ee1380 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/AES.java @@ -49,7 +49,7 @@ * 相关概念见:https://blog.csdn.net/OrangeJack/article/details/82913804 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AES extends Symmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java index 761bfe968f..503a135b7d 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DES.java @@ -40,7 +40,7 @@ * Java中默认实现为:DES/CBC/PKCS5Padding * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DES extends Symmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java index cac67a7087..02b4ed409b 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/DESede.java @@ -41,7 +41,7 @@ * Java中默认实现为:DESede/ECB/PKCS5Padding * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DESede extends Symmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java index 7c1b0f185e..e31172fda3 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/RC4.java @@ -40,7 +40,7 @@ * RC4加密解密算法实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RC4 implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java index 4ae0492240..f17442f784 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/SM4.java @@ -39,7 +39,7 @@ * SM4实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SM4 extends Symmetric { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java index 36ff536156..74493a8df3 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Symmetric.java @@ -50,7 +50,7 @@ * 在对称加密算法中,使用的密钥只有一个,发收信双方都使用这个密钥对数据进行加密和解密,这就要求解密方事先必须知道加密密钥。 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Symmetric implements Serializable { diff --git a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java index 35cb3578a3..1ef1d35908 100644 --- a/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java +++ b/bus-crypto/src/main/java/org/aoju/bus/crypto/symmetric/Vigenere.java @@ -31,7 +31,7 @@ * 算法实现来自:https://github.com/zhaorenjie110/SymmetricEncryptionAndDecryption * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Vigenere { diff --git a/bus-extra/pom.xml b/bus-extra/pom.xml index 1eff44aae2..a8ae9da04a 100755 --- a/bus-extra/pom.xml +++ b/bus-extra/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-extra - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java index a4e7513680..aac1382928 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaBuilder.java @@ -34,7 +34,7 @@ * 图形验证码工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CaptchaBuilder { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java index 6c64384ca8..b67fff1156 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/CaptchaProvider.java @@ -31,7 +31,7 @@ * 验证码接口,提供验证码对象接口定义 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CaptchaProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java index 9e61da1f9b..13b65b06b7 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/AbstractProvider.java @@ -47,7 +47,7 @@ * 实现类通过实现{@link #createImage(String)} 方法生成图片对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProvider implements CaptchaProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java index f2e69e80bd..e9a22c740c 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/CircleProvider.java @@ -37,7 +37,7 @@ * 圆圈干扰验证码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CircleProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java index 0142a9cd8c..de756db8de 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ClickWordProvider.java @@ -33,7 +33,7 @@ * 点选文字验证码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ClickWordProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/GifProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/GifProvider.java index 95bf3f8852..de6a913cea 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/GifProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/GifProvider.java @@ -37,7 +37,7 @@ * Git验证码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GifProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java index e025485f4c..b94738f74b 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/LineProvider.java @@ -37,7 +37,7 @@ * 普通干扰线验证码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LineProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java index b050f07221..00c69abb2b 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/PuzzleProvider.java @@ -33,7 +33,7 @@ * 滑动验证码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PuzzleProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java index b5165c0741..b73e873143 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/provider/ShearProvider.java @@ -36,7 +36,7 @@ * 扭曲干扰验证码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ShearProvider extends AbstractProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java index 0c49924d6b..ca4ea1ea9b 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/AbstractStrategy.java @@ -32,7 +32,7 @@ * 可以通过传入的基础集合和长度随机生成验证码字符 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractStrategy implements CodeStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java index 470a089220..22f0d553da 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/CodeStrategy.java @@ -29,7 +29,7 @@ * 验证码文字生成器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CodeStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java index 2b47ded69b..6ba06d0c04 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/MathStrategy.java @@ -34,7 +34,7 @@ * 数字计算验证码生成器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MathStrategy implements CodeStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java index a0cd6cffff..d7b20b7454 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/captcha/strategy/RandomStrategy.java @@ -33,7 +33,7 @@ * 可以通过传入的基础集合和长度随机生成验证码字符 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RandomStrategy extends AbstractStrategy { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java index f7fec49eab..56b436a407 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectFactory.java @@ -35,7 +35,7 @@ * 解压缩服务工厂 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum EffectFactory { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java index 3beec313d3..0568801ca3 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/EffectProvider.java @@ -31,7 +31,7 @@ * 数据压缩/解压缩 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java index 8e6ec435d3..113850b35a 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Bzip2Provider.java @@ -37,7 +37,7 @@ * 基于bzip2算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Bzip2Provider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java index cf5e331bc7..e9542c8b33 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/DeflaterProvider.java @@ -36,7 +36,7 @@ * 基于deflater算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeflaterProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java index 4aea7e5415..f5f1694c08 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/GzipProvider.java @@ -37,7 +37,7 @@ * 基于gzip算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GzipProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java index 0d7631a9bd..6e5bb22e68 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/Lz4Provider.java @@ -36,7 +36,7 @@ * 基于lz4算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Lz4Provider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java index 2d1a97aaae..7ce2f7a99d 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/LzoProvider.java @@ -36,7 +36,7 @@ * 基于lzo算法的数据解压缩 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LzoProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java index dd98eef832..c6782f1a76 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/effect/provider/SnappyProvider.java @@ -34,7 +34,7 @@ * 基于snappy的数据压缩 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SnappyProvider implements EffectProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java index 78c080bb2e..974cc1b80c 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/emoji/EmojiKit.java @@ -37,7 +37,7 @@ * 基于emoji-java的Emoji表情工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EmojiKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java index e892118657..9a6fbe71d9 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/AbstractFtp.java @@ -39,7 +39,7 @@ * 抽象FTP类,用于定义通用的FTP方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractFtp implements Closeable { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java index 7af5e91b04..4a21575c48 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/Ftp.java @@ -51,7 +51,7 @@ * 此客户端基于Apache-Commons-Net * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Ftp extends AbstractFtp { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java index 60d0843d3f..4ba7325040 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpConfig.java @@ -32,7 +32,7 @@ * FTP配置项参数信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FtpConfig implements Serializable { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java index f739896af8..b37fd64e7e 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpMode.java @@ -29,7 +29,7 @@ * FTP连接模式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum FtpMode { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpServer.java b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpServer.java index e844abddcd..e3fe946502 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpServer.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ftp/FtpServer.java @@ -49,7 +49,7 @@ * 基于 Apache FtpServer的服务端简单封装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FtpServer { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java index 06538d2cd4..ddc3ef6d49 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonFactory.java @@ -37,7 +37,7 @@ * 自动创建对应的json解析器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JsonFactory { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java index d4827e1640..b7a459ae9b 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonKit.java @@ -33,7 +33,7 @@ * json工具类,通过SPI自动识别 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JsonKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java index f883ccb97e..34bba19460 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/JsonProvider.java @@ -33,7 +33,7 @@ * JSON服务提供者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface JsonProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java index 7df38141c2..62d712fe36 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/AbstractJsonProvider.java @@ -31,7 +31,7 @@ * 默认解析器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractJsonProvider implements JsonProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java index b78181c517..0db27449aa 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/FastJsonProvider.java @@ -38,7 +38,7 @@ * FastJson 解析器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FastJsonProvider extends AbstractJsonProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java index 785ad90423..31f9e488a9 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/GsonProvider.java @@ -35,7 +35,7 @@ * Gson 解析器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GsonProvider extends AbstractJsonProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java index 3013998997..bd9f8cdd00 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/json/provider/JacksonProvider.java @@ -42,7 +42,7 @@ * Jackson 解析器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JacksonProvider extends AbstractJsonProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java index 6f147f55de..3e952113db 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinFactory.java @@ -36,7 +36,7 @@ * 自动创建对应的拼音引擎对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PinyinFactory { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java index 33a22556e4..9284f19b33 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinKit.java @@ -38,7 +38,7 @@ * 3. Pinyin4j * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PinyinKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java index ee7f0867d1..c01ac98400 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/PinyinProvider.java @@ -33,7 +33,7 @@ * 拼音服务提供者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface PinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java index 12c1d1693c..042a1589cd 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/AbstractPinyinProvider.java @@ -31,7 +31,7 @@ * 拼音默认实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractPinyinProvider implements PinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Bopomofo4jProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Bopomofo4jProvider.java index e97ca9f2e2..966c78e321 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Bopomofo4jProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Bopomofo4jProvider.java @@ -33,7 +33,7 @@ * 封装了Bopomofo4j的引擎 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Bopomofo4jProvider extends AbstractPinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java index 2952f2d4e7..78942922ea 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/JPinyinProvider.java @@ -35,7 +35,7 @@ * Jpinyin引擎 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JPinyinProvider extends AbstractPinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java index 96a134ca6e..a9e241f18e 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/Pinyin4JProvider.java @@ -40,7 +40,7 @@ * Pinyin4j引擎 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Pinyin4JProvider extends AbstractPinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java index 043cbe70c7..eebaa121d7 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/pinyin/provider/TinyPinyinProvider.java @@ -31,7 +31,7 @@ * TinyPinyin引擎 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TinyPinyinProvider extends AbstractPinyinProvider { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java index f2e5a50bd8..a5d0f788bb 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/LuminanceSource.java @@ -35,7 +35,7 @@ * 此类同样在zxing-j2se包中也有提供 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class LuminanceSource extends com.google.zxing.LuminanceSource { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java index 0e3a05427a..1e128919f6 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrCodeKit.java @@ -46,7 +46,7 @@ * 基于Zxing的二维码工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QrCodeKit { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java index 5d88f18218..b36033638c 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/qrcode/QrConfig.java @@ -40,7 +40,7 @@ * 二维码设置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QrConfig { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java index e08768f045..bace19b093 100644 --- a/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/servlet/ServletKit.java @@ -30,6 +30,7 @@ import org.aoju.bus.core.collection.ArrayIterator; import org.aoju.bus.core.lang.Charset; import org.aoju.bus.core.lang.Http; +import org.aoju.bus.core.lang.MediaType; import org.aoju.bus.core.lang.Symbol; import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.map.CaseInsensitiveMap; @@ -48,7 +49,7 @@ * Servlet 工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ServletKit { @@ -498,7 +499,7 @@ public static void write(HttpServletResponse response, String text, String conte */ public static void write(HttpServletResponse response, File file) { final String fileName = file.getName(); - final String contentType = ObjectKit.defaultIfNull(FileKit.getMimeType(fileName), "application/octet-stream"); + final String contentType = ObjectKit.defaultIfNull(FileKit.getMimeType(fileName), MediaType.APPLICATION_OCTET_STREAM); BufferedInputStream in = null; try { in = FileKit.getInputStream(file); diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java index 2d668bb140..a2d6144c51 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/ChannelType.java @@ -29,7 +29,7 @@ * Jsch支持的Channel类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum ChannelType { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java index 19fc59d3c9..a3516db82f 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Connector.java @@ -29,7 +29,7 @@ * 连接者对象,提供一些连接的基本信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Connector { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java index 8d518fd0a1..ddd1bdca81 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/JschSessionPool.java @@ -37,7 +37,7 @@ * Jsch会话池 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum JschSessionPool { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java index d1124ee647..0f126f2d48 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/Sftp.java @@ -56,7 +56,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Sftp extends AbstractFtp { diff --git a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java index 1a7e2beb4e..d398d3fbdc 100755 --- a/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java +++ b/bus-extra/src/main/java/org/aoju/bus/extra/ssh/SshKit.java @@ -43,7 +43,7 @@ * 它允许你连接到一个SSH服务器,并且可以使用端口转发,X11转发,文件传输等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SshKit { @@ -437,7 +437,7 @@ public static String exec(Session session, String cmd, java.nio.charset.Charset * @param cmd 命令 * @param charset 发送和读取内容的编码 * @param errStream 错误信息输出到的位置 - * @return {@link ChannelExec} + * @return 执行结果内容 */ public static String exec(Session session, String cmd, java.nio.charset.Charset charset, OutputStream errStream) { if (null == charset) { @@ -451,7 +451,7 @@ public static String exec(Session session, String cmd, java.nio.charset.Charset try { channel.start(); in = channel.getInputStream(); - return IoKit.read(in, Charset.UTF_8); + return IoKit.read(in, charset); } catch (IOException e) { throw new InstrumentException(e); } catch (JSchException e) { @@ -476,7 +476,6 @@ public static String execByShell(Session session, String cmd, java.nio.charset.C shell.setPty(true); OutputStream out = null; InputStream in = null; - final StringBuilder result = StringKit.builder(); try { out = shell.getOutputStream(); in = shell.getInputStream(); @@ -484,9 +483,7 @@ public static String execByShell(Session session, String cmd, java.nio.charset.C out.write(StringKit.bytes(cmd, charset)); out.flush(); - while (in.available() > 0) { - result.append(IoKit.read(in, charset)); - } + return IoKit.read(in, charset); } catch (IOException e) { throw new InstrumentException(e); } finally { @@ -494,7 +491,6 @@ public static String execByShell(Session session, String cmd, java.nio.charset.C IoKit.close(in); close(shell); } - return result.toString(); } /** diff --git a/bus-forest/pom.xml b/bus-forest/pom.xml index 77ba80e212..cff4f28c2e 100755 --- a/bus-forest/pom.xml +++ b/bus-forest/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-forest - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java b/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java index 0b9259927d..d5c1f79ddc 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Builder.java @@ -51,7 +51,7 @@ * Jar 工具类,包含I/O,密钥,过滤器的工具方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Builder { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java b/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java index 52718c5223..0f583b8156 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Complex.java @@ -29,7 +29,7 @@ * 记录加/解密规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java b/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java index e9d230070d..374828d85e 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Injector.java @@ -41,7 +41,7 @@ * 框架注入器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Injector { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java b/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java index d0c789e143..2569baf24f 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/Launcher.java @@ -49,7 +49,7 @@ * Spring-Boot 启动器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Launcher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java index 7898760e4e..a2bdbe53f9 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricKey.java @@ -29,7 +29,7 @@ * 非对称密钥 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface AsymmetricKey extends Key { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java index 95f249c5cd..41f5e8b777 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/AsymmetricSecureKey.java @@ -29,7 +29,7 @@ * 非对称密钥 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class AsymmetricSecureKey extends SecureKey implements AsymmetricKey { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java index 85e46f82e5..8ebb43c386 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/Key.java @@ -29,7 +29,7 @@ * 密钥 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Key { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java index 953e3933b8..d06dffa3bf 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureKey.java @@ -31,7 +31,7 @@ * 密钥 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class SecureKey implements Key, Serializable { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java index cd832c8ffd..db44c1389c 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SecureRandom.java @@ -32,7 +32,7 @@ * 安全随机数 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SecureRandom extends java.security.SecureRandom { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java index 99f0e4230b..3b2f89eb98 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricKey.java @@ -29,7 +29,7 @@ * 对称密钥 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SymmetricKey extends Key { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java index 181d50210e..b5fec48ce2 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/algorithm/SymmetricSecureKey.java @@ -29,7 +29,7 @@ * 对称密钥 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class SymmetricSecureKey extends SecureKey implements SymmetricKey { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java index ecfe86149f..b23213ce77 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirAntComplex.java @@ -34,7 +34,7 @@ * 文件记录Ant表达式规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DirAntComplex extends AntComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java index 06f7729bdd..f38d972989 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirDecryptorProvider.java @@ -37,7 +37,7 @@ * 文件夹解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DirDecryptorProvider extends EntryDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java index f91b30d7a0..b29a5c6483 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirEncryptorProvider.java @@ -37,7 +37,7 @@ * 文件夹加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DirEncryptorProvider extends EntryEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java index 8f56b6813c..4f1f535a17 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/DirRegexComplex.java @@ -35,7 +35,7 @@ * 文件记录正则表达式规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DirRegexComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java index bc544c43b9..e19184aaf6 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipAntComplex.java @@ -33,7 +33,7 @@ * Zip记录Ant表达式规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ZipAntComplex extends AntComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java index bee6c4b8c8..34fe1360e4 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipDecryptorProvider.java @@ -42,7 +42,7 @@ * ZIP压缩包解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ZipDecryptorProvider extends EntryDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java index 6215ca4549..407c22eabf 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipEncryptorProvider.java @@ -42,7 +42,7 @@ * ZIP压缩包加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ZipEncryptorProvider extends EntryEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java index e1f9e6f1a2..3e96aafab2 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/archive/ZipRegexComplex.java @@ -35,7 +35,7 @@ * Zip记录正则表达式规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ZipRegexComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java index d68d63a9c4..e5f8376818 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/Boot.java @@ -40,7 +40,7 @@ * Spring-Boot JAR包加解密工具类,在不提供过滤器的情况下会加密BOOT-INF/下的所有资源,及包括项目本身的资源和依赖jar资源 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Boot { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java index 166adbd72b..d08500bdbd 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootClassLoader.java @@ -43,7 +43,7 @@ * 类加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootClassLoader extends LaunchedURLClassLoader { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java index a60780ee29..cf69f6fddb 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootDecryptorProvider.java @@ -49,7 +49,7 @@ * Spring-Boot JAR包解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootDecryptorProvider extends EntryDecryptorProvider diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java index 5492720c2b..28e09086f6 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootEncryptorProvider.java @@ -54,7 +54,7 @@ * Spring-Boot JAR包加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootEncryptorProvider extends EntryEncryptorProvider diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java index 35a7d35713..6828692be1 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarArchiveEntry.java @@ -35,7 +35,7 @@ * 为了兼容Spring-Boot FatJar 和普通Jar 的包内资源URL一致 所以去掉路径前面的 BOOT-INF/classes/ * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootJarArchiveEntry extends JarArchiveEntry { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java index 80112d2129..88ba3b0c7a 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootJarLauncher.java @@ -34,7 +34,7 @@ * Spring-Boot Jar 启动器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootJarLauncher extends JarLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java index d1d915315f..1df67ffda8 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootPropertiesLauncher.java @@ -37,7 +37,7 @@ * Spring-Boot Properties 启动器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootPropertiesLauncher extends PropertiesLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java index 38068ce06b..069df94ad3 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLConnection.java @@ -48,7 +48,7 @@ * 加密的URL连接 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootURLConnection extends JarURLConnection { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java index 1816a42562..427e112323 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootURLHandler.java @@ -46,7 +46,7 @@ * 加密的URL处理器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootURLHandler extends Handler { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java index 9ab0abf76b..27c09702f1 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/BootWarLauncher.java @@ -34,7 +34,7 @@ * Spring-Boot Jar 启动器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BootWarLauncher extends WarLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java index e1273ec5e2..555f02ffbc 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/Jar.java @@ -40,7 +40,7 @@ * 普通JAR包加解密工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Jar { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java index 58cf57c0c9..4500bc54ed 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAllComplex.java @@ -32,7 +32,7 @@ * Spring-Boot 所有资源加密规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarAllComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java index b4c41c39e2..6268cdae52 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarAntComplex.java @@ -33,7 +33,7 @@ * Jar记录Ant表达式规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarAntComplex extends AntComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java index 66de75aa78..f1486dd5d2 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarClassLoader.java @@ -43,7 +43,7 @@ * JAR包类加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarClassLoader extends URLClassLoader { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java index c30f2a1c1c..f5ba9c9ea2 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarDecryptorProvider.java @@ -45,7 +45,7 @@ * 普通JAR包解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarDecryptorProvider extends EntryDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java index 79b945efaf..e74ba2d01c 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarEncryptorProvider.java @@ -48,7 +48,7 @@ * 普通JAR包加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarEncryptorProvider extends EntryEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java index 979896f355..0792250eba 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarLauncher.java @@ -43,7 +43,7 @@ * JAR包启动器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarLauncher { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java index 1d8eeff8aa..66325bc1ac 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarRegexComplex.java @@ -35,7 +35,7 @@ * Jar记录正则表达式规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarRegexComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java index 76195d03d7..39f6e5faad 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLConnection.java @@ -47,7 +47,7 @@ * 加密的URL连接 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarURLConnection extends java.net.JarURLConnection { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java index 6283a44868..0f349673a1 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/boot/jar/JarURLHandler.java @@ -45,7 +45,7 @@ * 加密的URL处理器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JarURLHandler extends URLStreamHandler { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java index e6c9c10fa9..e9ca0250b8 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AllComplex.java @@ -35,7 +35,7 @@ * 如果没有规则的时候则认为所有规则都满足 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AllComplex extends MixComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java index 8cbef85c7d..03c883eaac 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AntComplex.java @@ -33,7 +33,7 @@ * Ant表达式过规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AntComplex extends RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java index d5b40e2fa8..d6737cba2c 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/AnyComplex.java @@ -34,7 +34,7 @@ * 当没有规则的时候,就是不满足 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AnyComplex extends MixComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java index 0e7762937e..a73cfd4e5d 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/MixComplex.java @@ -35,7 +35,7 @@ * 混合过滤器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class MixComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java index d7f4a9e76b..9c14de714e 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/NotComplex.java @@ -31,7 +31,7 @@ * 非门逻辑规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java b/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java index 7233a668bb..dabbe8558b 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/complex/RegexComplex.java @@ -33,7 +33,7 @@ * 正则表达式规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class RegexComplex implements Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java index 7d676986a8..9a60f5c773 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/DecryptorProvider.java @@ -36,7 +36,7 @@ * 解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java index 6db1c027c5..a416ae1abb 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EncryptorProvider.java @@ -36,7 +36,7 @@ * 加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java index 61840212e5..86bad62a78 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryDecryptorProvider.java @@ -31,7 +31,7 @@ * 记录可过滤的解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class EntryDecryptorProvider extends WrappedDecryptorProvider implements DecryptorProvider, Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java index 408a3dcc1b..b8f324ee1d 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/EntryEncryptorProvider.java @@ -31,7 +31,7 @@ * 记录可过滤的加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class EntryEncryptorProvider extends WrappedEncryptorProvider implements EncryptorProvider, Complex { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java index 45eece7302..c2af272f70 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkDecryptorProvider.java @@ -38,7 +38,7 @@ * JDK内置解密算法的解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java index e0494790ce..c3fe36dcd4 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/JdkEncryptorProvider.java @@ -38,7 +38,7 @@ * JDK内置加密算法的加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java index beae09e3b7..1961be5124 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopDecryptorProvider.java @@ -34,7 +34,7 @@ * 无操作解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NopDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java index ce84e8ce91..1f7c3befde 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/NopEncryptorProvider.java @@ -34,7 +34,7 @@ * 无操作加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NopEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java index 580a042c23..be05a26bf9 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedDecryptorProvider.java @@ -36,7 +36,7 @@ * 包装的解密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class WrappedDecryptorProvider implements DecryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java index 0f4fdf3dbf..12bc4e9e7a 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/provider/WrappedEncryptorProvider.java @@ -36,7 +36,7 @@ * 包装的加密器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class WrappedEncryptorProvider implements EncryptorProvider { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java index 23bece26f5..8549ae7a23 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysInputStream.java @@ -32,7 +32,7 @@ * 不关闭的输入流 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AlwaysInputStream extends InputStream { diff --git a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java index 57a2dd06d0..62c6b8598b 100755 --- a/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java +++ b/bus-forest/src/main/java/org/aoju/bus/forest/streams/AlwaysOutputStream.java @@ -32,7 +32,7 @@ * 不关闭的输出流 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AlwaysOutputStream extends OutputStream { diff --git a/bus-gitlab/README.md b/bus-gitlab/README.md index 9e862b55ef..8af660bb5c 100755 --- a/bus-gitlab/README.md +++ b/bus-gitlab/README.md @@ -60,7 +60,7 @@ file:
``` dependencies { ... - compile group: 'org.aoju', name: 'bus-gitlab', version: '6.1.5' + compile group: 'org.aoju', name: 'bus-gitlab', version: '6.1.6' } ``` @@ -70,7 +70,7 @@ dependencies { org.aoju bus-gitlab - 6.1.5 + 6.1.6 ``` diff --git a/bus-gitlab/pom.xml b/bus-gitlab/pom.xml index cb2eb69eb2..5330c3dc2e 100755 --- a/bus-gitlab/pom.xml +++ b/bus-gitlab/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-gitlab - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java index fdd5eae661..0a22af44df 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AbstractApi.java @@ -44,7 +44,7 @@ * delete(), get(), post() and put() that are re-used by all the sub-classes. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractApi implements Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java index f5407a4298..b745c4945c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AccessToken.java @@ -52,7 +52,7 @@ * proper functionality. It may not work on earlier or later versions.

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class AccessToken { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java index b91b5d53ed..d9011276ee 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationSettingsApi.java @@ -37,7 +37,7 @@ * See Application Settings API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApplicationSettingsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java index 059c281304..94e02e7d54 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ApplicationsApi.java @@ -39,7 +39,7 @@ * See Applications API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApplicationsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java index a6e613538d..1a9cb59494 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/AwardEmojiApi.java @@ -35,9 +35,8 @@ * This class implements the client side API for the GitLab Award Emoji API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see GitLab Award Emoji API Documentaion - * @since v4.8.31 * @since JDK 1.8+ */ public class AwardEmojiApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java index 52b26640c8..7a2d02f9c6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/BoardsApi.java @@ -41,7 +41,7 @@ * a GET request on that group will result to a 404 status code. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see GitLab Issue Boards API Documentaion * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java index 0d86fab81f..f7c540213d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/CommitsApi.java @@ -42,7 +42,7 @@ * See Commits API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommitsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java index b0d937ce9e..6c89510b3e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Constants.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java index 2072ed97bf..8324bec8d1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ContainerRegistryApi.java @@ -40,7 +40,7 @@ * for more information.

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ContainerRegistryApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java index 0c6333f533..ee26308312 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployKeysApi.java @@ -38,7 +38,7 @@ * This class implements the client side API for the GitLab Deploy Keys API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeployKeysApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java index 6e602b5a3b..72c86006fd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DeployTokensApi.java @@ -37,7 +37,7 @@ * See https://docs.gitlab.com/ee/api/deploy_tokens.html * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeployTokensApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java index 6664e8b69e..02ef5dd10e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/DiscussionsApi.java @@ -41,7 +41,7 @@ * See Discussions API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DiscussionsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java index df41684e11..4cdb3cb63a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EnvironmentsApi.java @@ -36,7 +36,7 @@ * This class provides an entry point to all the GitLab API Environments API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Environments API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java index 57d5170568..df1d54c080 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EpicsApi.java @@ -44,7 +44,7 @@ * - Epics are available only in Ultimate. If epics feature is not available a 403 status code will be returned. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see GitLab Epics API Documentaion * @see GitLab Epic Issues API Documentation * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java index f61d7afa75..67017fb6cd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/EventsApi.java @@ -37,7 +37,7 @@ * This class implements the client side API for the GitLab events calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java index b57dbd4c20..323720fc9b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApi.java @@ -41,7 +41,7 @@ * a separate API class for each concern. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GitLabApi implements AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java index 4f8cdff155..007df66a7d 100755 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiClient.java @@ -57,7 +57,7 @@ * This class utilizes the Jersey client package to communicate with a GitLab API endpoint. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GitLabApiClient implements AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java index 980a3d20f3..7083ddca27 100755 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiException.java @@ -40,7 +40,7 @@ * with a GitLab API endpoint. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GitLabApiException extends Exception { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java index 9a848b5132..5a021901f8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GitLabApiForm.java @@ -39,7 +39,7 @@ * This class extends the standard JAX-RS Form class to make it fluent. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GitLabApiForm extends Form { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java index 5677f81123..ca41960eb4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/GroupApi.java @@ -41,7 +41,7 @@ * This class implements the client side API for the GitLab groups calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Groups API at GitLab * @see Group and project members API at GitLab * @see Group and project access requests API diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java index 54d8ac9872..98f2895158 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HealthCheckApi.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HealthCheckApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java index 1a8c60b1ba..4a5e89adea 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/HookManager.java @@ -31,7 +31,7 @@ * This interface provides a base class handler for processing GitLab Web Hook and System Hook callouts. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface HookManager { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java index 07ccc0b806..ca38d3f090 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ISO8601.java @@ -41,7 +41,7 @@ * This class provides utility methods for parsing and formatting org.aoju.bus.gitlab.ISO8601 formatted dates. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ISO8601 { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java index 6a9592a83c..d0a1dfe6b6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ImportExportApi.java @@ -45,7 +45,7 @@ * This class provides an entry point to all the GitLab API project import/export calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Project import/export API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java index 88f167e85b..1b4e20aab0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/IssuesApi.java @@ -40,7 +40,7 @@ * This class provides an entry point to all the GitLab API Issue calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Issues API at GitLab * @see Issue Links API at GitLab * @see Issues Statistics API at GitLab diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java index 4f40a20f22..d0f366ca3f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJson.java @@ -46,7 +46,7 @@ * Jackson JSON Configuration and utility class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Produces(MediaType.APPLICATION_JSON) diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java index 081990331a..c12cad102e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JacksonJsonEnumHelper.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JacksonJsonEnumHelper> { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java index 297bd9d69d..4c99761856 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/JobApi.java @@ -47,7 +47,7 @@ * This class provides an entry point to all the GitLab API job calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JobApi extends AbstractApi implements Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java index b188b8391c..60d2675880 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LabelsApi.java @@ -37,7 +37,7 @@ * This class provides an entry point to all the GitLab API project and group label calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Labels API at GitLab * @see Group Labels API at GitLab * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java index 29a9e27a07..f4802fde81 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseApi.java @@ -36,7 +36,7 @@ * This class provides an entry point to all the GitLab API license calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see License API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java index 5a31b618c2..ea19dc918d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/LicenseTemplatesApi.java @@ -36,7 +36,7 @@ * This class provides an entry point to all the GitLab API licenses calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Licenses API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java index 2400ab09b5..cdc3d37720 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MarkdownApi.java @@ -35,7 +35,7 @@ * This class provides an entry point to all the GitLab API markdown calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MarkdownApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java index 22a05b0fbe..73564a205c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MaskingLoggingFilter.java @@ -56,7 +56,7 @@ * such a way that it could be sub-classed and have its behavior modified. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Priority(Integer.MIN_VALUE) diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java index 184f9e93dc..91ef576146 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MergeRequestApi.java @@ -40,7 +40,7 @@ * This class implements the client side API for the GitLab merge request calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Merge requests API at GitLab * @see Merge request approvals API at GitLab * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java index 3bf8cdd609..04bd296dfe 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/MilestonesApi.java @@ -40,7 +40,7 @@ * This class implements the client side API for the GitLab milestones calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Project milestones API * @see Group milestones API * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java index f2f5706581..207c5c036b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NamespaceApi.java @@ -36,7 +36,7 @@ * This class implements the client side API for the GitLab namespace calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NamespaceApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java index e8b09ff832..ccbd8d9539 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotesApi.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotesApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java index e060459b3e..e5321bc815 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/NotificationSettingsApi.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotificationSettingsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java index 5c853fd971..7c496cbdc6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Oauth2LoginStreamingOutput.java @@ -37,7 +37,7 @@ * contained in a SecretString that is cleared when an instance of this class is finalized. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Oauth2LoginStreamingOutput implements StreamingOutput, AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java index 7a386decdf..1f2b8a1592 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PackagesApi.java @@ -40,7 +40,7 @@ * NOTE: This API is not available in the Community edition of GitLab. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PackagesApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java index 79a8a91fb5..f5bb81ac1c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/Pager.java @@ -61,7 +61,7 @@ * * @param the GitLab type contained in the List. * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Pager implements Iterator>, Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java index 401f832a58..e217c9a677 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PagerSpliterator.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ class PagerSpliterator implements Spliterator { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java index 777e60ca7b..e86abfa60c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/PipelineApi.java @@ -44,7 +44,7 @@ * Pipeline Triggers API * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PipelineApi extends AbstractApi implements Constants { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java index dc8b66958e..8b847a389f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectApi.java @@ -46,7 +46,7 @@ * This class provides an entry point to all the GitLab API project calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Projects API at GitLab * @see Project statistics API * @see Group and project members API at GitLab diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java index 3fc61c2685..ab337a1085 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProjectLicense.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectLicense { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java index 0e0480c23f..4c54bf9c62 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProtectedBranchesApi.java @@ -39,7 +39,7 @@ * This class provides an entry point to all the Protected Branches API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Protected branches API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java index be6f3c9d03..6413dacfd0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ProxyClientConfig.java @@ -39,7 +39,7 @@ * This class provides convenience methods to create ClientConfig properties so GitLabApi can use a proxy server. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProxyClientConfig { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java index 5f571bb0bf..e64fb008a2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ReleasesApi.java @@ -38,7 +38,7 @@ * This class provides an entry point to all the GitLab Releases API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Releases API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java index 440c44114e..29c6fab825 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryApi.java @@ -47,7 +47,7 @@ * Branches API * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RepositoryApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java index 7305ed5412..caedbf1152 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RepositoryFileApi.java @@ -46,7 +46,7 @@ * See Repository Files API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RepositoryFileApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java index 6220b22501..bf81b7acc0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ResourceLabelEventsApi.java @@ -37,7 +37,7 @@ * This class provides an entry point to all the GitLab Resource label events API * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Resource label events API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java index 2ba36938f1..0f60ee8180 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/RunnersApi.java @@ -39,7 +39,7 @@ * This class provides an entry point to all the GitLab API repository files calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RunnersApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java index 5bba3a2c44..4c3d9b4edf 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SearchApi.java @@ -34,7 +34,7 @@ * This class provides an entry point to all the GitLab API Search API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Search API * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java index 855ddf2564..5c8b25a7db 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SecretString.java @@ -32,7 +32,7 @@ * This class is utilized to pass around secrets (passwords) instead of a String instance. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SecretString implements CharSequence, AutoCloseable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java index 87a76d744f..d0af8c60b0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/ServicesApi.java @@ -36,7 +36,7 @@ * See GitLab documentation for more info. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ServicesApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java index b03af16e00..a379cf6851 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SnippetsApi.java @@ -38,7 +38,7 @@ * This class provides an entry point to all the GitLab Snippets API project calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SnippetsApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java index a2edfb5df0..1ad7b080f7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/SystemHooksApi.java @@ -37,7 +37,7 @@ * This class implements the client side API for the GitLab System Hooks Keys API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SystemHooksApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java index 403b9e49ca..d6ca0dc62a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TagsApi.java @@ -45,7 +45,7 @@ * This class provides an entry point to all the GitLab Tags and Protected Tags API calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Tags API at GitLab * @see Protected Tags API at GitLab * @since JDK 1.8+ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java index cae698e6de..bafeba55d3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/TodosApi.java @@ -35,7 +35,7 @@ * This class implements the client side API for the GitLab Todos API. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TodosApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java index 7b3e3589f4..0a3d3ea605 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/UserApi.java @@ -43,7 +43,7 @@ * This class provides an entry point to all the GitLab API users calls. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @see Users API at GitLab * @since JDK 1.8+ */ diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java index c2e88d0942..beff50a0f7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/WikisApi.java @@ -42,7 +42,7 @@ * See Wikis API at GitLab for more information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WikisApi extends AbstractApi { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java index 77f76a5354..e178cb3bdd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/AbstractSystemHookEvent.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSystemHookEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java index c8a025b486..1698cbefe4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupMemberSystemHookEvent.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GroupMemberSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java index 66296dfd6a..a07256ac75 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/GroupSystemHookEvent.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GroupSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java index da2e29a98b..7fc55580b0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/KeySystemHookEvent.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class KeySystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java index 783c0b02a4..b3927a42eb 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/MergeRequestSystemHookEvent.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeRequestSystemHookEvent extends MergeRequestEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java index 2d7782a3c2..c02fec83c3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/ProjectSystemHookEvent.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java index 6c7e1b00d5..17cb9e0997 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/PushSystemHookEvent.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java index a97230e33b..6315d10e9c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositoryChange.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RepositoryChange { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java index 6be3196e51..e6d0c02f6d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/RepositorySystemHookEvent.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RepositorySystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java index 1c2573398d..88cf11235d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookEvent.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java index d1be99f6bd..e145e9f2a8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookListener.java @@ -30,7 +30,7 @@ * a System Hook notification has been received from a GitLab server. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SystemHookListener extends java.util.EventListener { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java index 3b116d8077..f09ed7c2ba 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/SystemHookManager.java @@ -45,7 +45,7 @@ * This class provides a handler for processing GitLab System Hook callouts. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SystemHookManager implements HookManager { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java index 947d16dda9..6db74d8398 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TagPushSystemHookEvent.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TagPushSystemHookEvent extends AbstractPushEvent implements SystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java index 15c8a1acfb..ea9266345e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/TeamMemberSystemHookEvent.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java index c762258d03..3e6617c38c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/UserSystemHookEvent.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UserSystemHookEvent extends AbstractSystemHookEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java index 8ac2612240..fb13fc3d6a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractEvent.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractEvent implements Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java index a73249abda..d39a0514b1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/AbstractPushEvent.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractPushEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java index 223d336a66..9e29afcd9c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildCommit.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BuildCommit { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java index 43a8698089..2fb4beaec5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/BuildEvent.java @@ -35,7 +35,7 @@ * Job Events is incorrect, this class represents the actual content of the Job Hook event. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BuildEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java index 16616c4177..7134ec7d38 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/ChangeContainer.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ChangeContainer { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java index a1168ec63b..0988a7a277 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/Event.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java index ec77f3bbc5..3a5af79be5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventChanges.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class EventChanges { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java index 885df079c6..27fb849f2b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventCommit.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventCommit { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java index 97b1a633e5..2321290675 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventIssue.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventIssue { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java index f00f38d861..32c85cecee 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventLabel.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventLabel { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java index 1a954cce31..ce60c03e48 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventMergeRequest.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventMergeRequest { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java index d8cd528a3b..ff0eeaef00 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventProject.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventProject { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java index a6bf9c533b..715ef8387e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventRepository.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventRepository { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java index 72f96cfa0c..7d378d6c94 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/EventSnippet.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventSnippet { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java index ad21908f71..1bead6a15e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueChanges.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IssueChanges extends EventChanges { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java index 3a4eb3c4bf..443847d349 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/IssueEvent.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IssueEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java index b482b0c147..995bc6dcb3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/JobEvent.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JobEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java index 93cab03fc5..9008ada3ff 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestChanges.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeRequestChanges extends EventChanges { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java index a8d6e63c3b..b4ab106be1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/MergeRequestEvent.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeRequestEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java index 859faef05a..24e0f2582e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/NoteEvent.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NoteEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java index f1d7d58aad..38f10a110a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PipelineEvent.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PipelineEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java index 5b1217653a..48d1c59669 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/PushEvent.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PushEvent extends AbstractPushEvent implements Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java index 100092e915..cd6c30e457 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/TagPushEvent.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TagPushEvent extends AbstractPushEvent implements Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java index 935db8bf03..046785da96 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookListener.java @@ -30,7 +30,7 @@ * a WebHook notification has been received from a GitLab server. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface WebHookListener extends java.util.EventListener { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java index aeeddfc0dc..f5e9f78df5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WebHookManager.java @@ -43,7 +43,7 @@ * This class provides a handler for processing GitLab WebHook callouts. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WebHookManager implements HookManager { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java index 3b91b7ab99..9ec032f94d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/hooks/web/WikiPageEvent.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WikiPageEvent extends AbstractEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java index e5b27a1eeb..28d095ea42 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AbstractUser.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @JsonIgnoreProperties(ignoreUnknown = true) diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java index c291cfe41c..3f3704f02c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AcceptMergeRequestParams.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AcceptMergeRequestParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java index 2a132b6782..5f13c1a12b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessLevel.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum AccessLevel { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java index af24e660f5..7e86f9d399 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AccessRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AccessRequest extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java index d3dae78cdc..58f1b7d820 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AllowedTo.java @@ -32,7 +32,7 @@ * allowed_to_push, allowed_to_merge, and allowed_to_unprotect values. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AllowedTo { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java index 6a671e31d7..8aa154490a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Application.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Application { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java index f3680adf6f..49a197a174 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApplicationSettings.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApplicationSettings { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java index a1ea32ceb8..61e284b0e7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRule.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApprovalRule { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java index 15c398a775..0df28f2a89 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalRuleParams.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApprovalRuleParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java index dff9e7b8fe..6085f29f8d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovalState.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApprovalState { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java index 9f8589c8e3..8d6426dc82 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ApprovedBy.java @@ -32,7 +32,7 @@ * which can contain a User or Group instance. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApprovedBy { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java index 4cbf0e043c..50b6fc9016 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Artifact.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Artifact { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java index fee960253d..ad9e7a71d1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ArtifactsFile.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArtifactsFile { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java index cce663aa23..7493d36028 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assets.java @@ -34,7 +34,7 @@ * This class is part of the Release class model. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Assets { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java index 2af83ca58d..7aff6b39f1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Assignee.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Assignee extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java index 4904606725..e04c88e666 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Author.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Author extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java index 7ab370b6f5..a3b3de58da 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/AwardEmoji.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AwardEmoji { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java index 6267d9bba7..2db25118ab 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Badge.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Badge { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java index 3b60d8ff15..2f72a901f0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Blame.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Blame { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java index 58a85ba4b7..c049af345c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Board.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Board { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java index 6ceb1ecf4f..c04a8e5c14 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BoardList.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BoardList { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java index 94aab65d40..b0588f5887 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Branch.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Branch { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java index 60d97fc02e..6dc1b9ba5b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/BranchAccessLevel.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BranchAccessLevel { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java index 2d53b1034c..3dafcdb066 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Changes.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Changes { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java index d6e9d7cad2..e705a6cbf2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Comment.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Comment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java index bb3b27f31d..f52460232f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Commit.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Commit { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java index f147fb53f3..543aebc860 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitAction.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommitAction { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java index 20e0350a47..f8ce5b7490 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitPayload.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommitPayload { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java index 923a6284e1..cbaf878f93 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitRef.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommitRef { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java index c138272466..1675929dc4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStats.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommitStats { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java index 69b7280804..9c8daec884 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatus.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommitStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java index 716b1911ca..c2ec7c2eff 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CommitStatusFilter.java @@ -33,7 +33,7 @@ * This class is used to filter commit status when getting lists of them. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommitStatusFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java index 7f0fdc0596..e7969662f0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CompareResults.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompareResults { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java index e3984a96fd..ae7a0efdcf 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Contributor.java @@ -30,7 +30,7 @@ * See Contributors at GitLab. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Contributor extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java index da835bbd36..b39a9403a8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/CustomAttribute.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CustomAttribute { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java index 391a8fc1fa..f56df2ed6f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployKey.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeployKey { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java index 3888c4575e..2cb034f80a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DeployToken.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeployToken { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java index 0f628d3c2c..bea8941633 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployable.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Deployable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java index 505cabd842..003701f739 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Deployment.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Deployment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java index f71e876995..9aad0784c4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DetailedStatus.java @@ -31,7 +31,7 @@ * This class is part of the Pipeline message. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DetailedStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java index 0aa338ec4c..5c65110a80 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Diff.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Diff { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java index 1cf8bf21d3..2d89180306 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/DiffRef.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DiffRef { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java index ad2c4a6e2f..eead47e852 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Discussion.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Discussion { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java index 438f7a2211..a42aee9892 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Duration.java @@ -35,7 +35,7 @@ * This class represents a duration in time. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Duration { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java index 215d2dfa99..c73d765ab3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Email.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Email { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java index eee007bea7..7a3e1be4df 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Environment.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Environment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java index a8c95a1d05..a63efe60c4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Epic.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Epic { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java index 96082d63c0..17f9ed7178 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EpicIssue.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EpicIssue extends Issue { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java index 77de179cfd..2e85536c39 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Event.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Event { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java index 8b3406142b..7f9e1c0ddd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/EventData.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EventData { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java index 0cafff8483..cff194faa8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ExportStatus.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExportStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java index 9d35cdc020..b11b6d8866 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/FileUpload.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileUpload { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java index 735d2c2b19..ca1daee3b9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GpgSignature.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GpgSignature { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java index 14bb097ac9..82a988fa94 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Group.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Group { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java index 8b60df69ce..a930e73b1c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupFilter.java @@ -35,7 +35,7 @@ * This class is used to filter Projects when getting lists of projects for a specified group. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GroupFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java index adb7fda234..c0ce2d2439 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupParams.java @@ -34,7 +34,7 @@ * the parameters for the call to the GitLab API. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GroupParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java index ae94c45c94..34cef70a84 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/GroupProjectsFilter.java @@ -33,7 +33,7 @@ * This class is used to filter Projects when getting lists of projects for a specified group. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GroupProjectsFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java index 7d2c92c3bf..ee1b951868 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckInfo.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HealthCheckInfo { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java index e947161fe7..4792699e51 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckItem.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HealthCheckItem { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java index c94acc3c9b..81118772c2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/HealthCheckStatus.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum HealthCheckStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java index f3c4c2ce4e..185f0fb1ec 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Identity.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Identity { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java index dc9479bfb6..a6b78c3194 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImpersonationToken.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImpersonationToken { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java index 7a19aba4c4..2472f938b7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ImportStatus.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImportStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java index 2e27e6d416..5a6c1b9645 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Issue.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Issue { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java index 67807ed665..deaecf47d3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueFilter.java @@ -41,7 +41,7 @@ * This class is used to filter issues when getting lists of them. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IssueFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java index 7f6615efda..5301664ef4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssueLink.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IssueLink { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java index 79fc6dfbc5..b7506f5e82 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatistics.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IssuesStatistics { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java index 2589fe3c02..ab726aeb04 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/IssuesStatisticsFilter.java @@ -38,7 +38,7 @@ * This class is used to filter issues when getting issue statistics. of them. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IssuesStatisticsFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java index 3573421104..5f881e17fa 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Job.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Job { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java index 0a95b1e21d..0b854c379e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/JobStatus.java @@ -33,7 +33,7 @@ * Enum for the various Job status values. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum JobStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java index c73b8be86b..4de84f22f9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Key.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Key { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java index 0d6412a59c..8cd05d5460 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Label.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Label { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java index b2f5b8d0ff..d50753eeaf 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LabelEvent.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LabelEvent { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java index bffd15d4b4..3f27a0b076 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/License.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class License { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java index fa53391643..652829ca8b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/LicenseTemplate.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LicenseTemplate { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java index b30babf06e..c17c1acd6e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Markdown.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Markdown { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java index 94fa91f906..0a37d3e40e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Member.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Member extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java index 6f070b6ae4..e034f52853 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequest.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeRequest { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java index 2b8f3ae895..6998693e4b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestDiff.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeRequestDiff { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java index 366bf9d906..0f43934e1a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestFilter.java @@ -37,7 +37,7 @@ * This class is used to filter merge requests when getting lists of them. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeRequestFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java index 1ed97cd54a..fe4513db81 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/MergeRequestParams.java @@ -35,7 +35,7 @@ * This class provides the form parameters for creating and updating merge requests. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeRequestParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java index 62dd909cba..6313c69138 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Milestone.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Milestone { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java index e8f372061c..5fb98ccb40 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Namespace.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Namespace { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java index cae8ddeb40..a6d0769839 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Note.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Note { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java index 8c0ec43da1..62de19de68 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/NotificationSettings.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotificationSettings { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java index 7a2d134607..91c9371904 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/OauthTokenResponse.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OauthTokenResponse { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java index 6d6d909c85..3d4fe54324 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Owner.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Owner extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java index 1594ec25b3..7d3862d2e8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Package.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Package { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java index d7f4277193..6f3b9fd557 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageFile.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PackageFile { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java index 0a52a23dc5..d4336aff29 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PackageType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum PackageType { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java index 91e3530b9b..6157261106 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Participant.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Participant extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java index ea00ce904c..9bd68b9f3b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Permissions.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Permissions { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java index aec991db96..86e6beb5cb 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Pipeline.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Pipeline { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java index 083e941900..5fbe7fc28d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineFilter.java @@ -38,7 +38,7 @@ * This class is used to filter Pipelines when getting lists of them. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PipelineFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java index 638d93a33f..6da09b2fdd 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineSchedule.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PipelineSchedule { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java index 7675a43f55..bc1a609704 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PipelineStatus.java @@ -35,7 +35,7 @@ * Enum for the various Pipeline status values. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum PipelineStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java index c2fa4ac2f8..fbd2ca55c1 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Position.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Position { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java index 528205f572..a6a97b1fc9 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Project.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Project { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java index 09fa686acc..ba57e1d028 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectAccess.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectAccess { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java index 779e9d53db..d98be69700 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectApprovalsConfig.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectApprovalsConfig { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java index 5fd5102c60..9ddba85b9b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFetches.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectFetches { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java index 504698e29a..650c6148ad 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectFilter.java @@ -34,7 +34,7 @@ * This class is used to filter Projects when getting lists of projects for a specified user. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectFilter { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java index 751e893a2a..3a2a1d82f2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectHook.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectHook { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java index f65bb5ae9d..7f32e5aa83 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectSharedGroup.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectSharedGroup { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java index b4a937c7d6..885c0073d8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectStatistics.java @@ -34,7 +34,7 @@ * which is only allowed for GitLab admins. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectStatistics { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java index 603789b105..2054015271 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProjectUser.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProjectUser extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java index 97c747c5b2..4112036b3d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedBranch.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProtectedBranch { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java index 4c6b84cd6e..f79b691f80 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ProtectedTag.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProtectedTag { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java index c302c5994b..7229a1aa4c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushData.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PushData { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java index 8915adca85..ab2d09bd27 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/PushRules.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PushRules { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java index cdf090e522..1658a4475e 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/References.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class References { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java index 15d900639e..73c9166002 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepository.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RegistryRepository { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java index 517a3008cd..1b48482d5c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RegistryRepositoryTag.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RegistryRepositoryTag { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java index 868e659993..9043bce43f 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Release.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Release { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java index 71f6984e60..66b9fa6a46 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/ReleaseParams.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReleaseParams { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java index 8ce69abd8d..b7b514a2a6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Repository.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Repository { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java index 26fdb8bfc3..b3c5132490 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RepositoryFile.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RepositoryFile { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java index ea0413c831..dd1760eeac 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Runner.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Runner { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java index f3d3d07da7..f0c174bea0 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/RunnerDetail.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RunnerDetail extends Runner { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java index 4a05024c35..fb79d956c2 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SearchBlob.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SearchBlob { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java index f9b1eae039..a5c22a5ed4 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Setting.java @@ -37,7 +37,7 @@ * List of settings that can be accessed via API calls for more information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Setting { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java index 2898883002..f063466c24 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Snippet.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Snippet { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java index d4db89c75a..f2f03358f7 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SshKey.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SshKey { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java index 5b9f5d0dd0..6ab1512915 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/SystemHook.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SystemHook { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java index a834fdfb26..b0c67248a8 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Tag.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Tag { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java index 9e45982053..8f2ba1a786 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TaskCompletionStatus.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TaskCompletionStatus { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java index ec991c67e9..be171be8e3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TimeStats.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TimeStats { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java index 647b5a7fa0..1aa242cbc6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Todo.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Todo { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java index 41aa1559e4..342acee277 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/TreeItem.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TreeItem { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java index ceb28e0d84..45abd2dc3a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Trigger.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Trigger { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java index 396aa5eee3..f39b5969f6 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/User.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class User extends AbstractUser { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java index cd961f86d8..013e1ecc32 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Variable.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Variable { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java index 4e455926d6..fec2701a6d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Version.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Version { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java index 5ed71fa0cc..dd51208360 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/Visibility.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Visibility { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java index 958cbf4226..268c7d073a 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiAttachment.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WikiAttachment { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java index b8306ddc0b..6dd8ad5d6b 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/models/WikiPage.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WikiPage { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java index c648eebed1..e541fbdd25 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/BugzillaService.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BugzillaService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java index 4bb1e111ba..e3c795503c 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/CustomIssueTrackerService.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CustomIssueTrackerService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java index 43d7fe05be..a4bfcc47cf 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/ExternalWikiService.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExternalWikiService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java index 6bca106269..dded668ce5 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/HipChatService.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HipChatService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java index 853361213f..424ca6243d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/JiraService.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JiraService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java index f8750b11a9..67f15ca03d 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/MattermostService.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MattermostService extends NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java index b429434f63..6e0e60a1a3 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/NotificationService.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class NotificationService { diff --git a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java index 505581be32..115de33e08 100644 --- a/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java +++ b/bus-gitlab/src/main/java/org/aoju/bus/gitlab/service/SlackService.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SlackService extends NotificationService { diff --git a/bus-goalie/README.md b/bus-goalie/README.md index 5cf08d6dd5..0ea60cd51b 100644 --- a/bus-goalie/README.md +++ b/bus-goalie/README.md @@ -8,14 +8,13 @@ ## 功能特点 -- 开箱即用,写完业务代码直接启动服务即可使用,无需其它配置。 -- 参数自动校验,支持国际化参数校验(JSR-303)。 -- 校验功能和结果返回功能实现各自独立,方便自定义实现或扩展。 -- 采用注解来定义接口,维护简单方便。 -- 支持i18n国际化消息返回。 -- 自动生成文档页面,类似swagger。 -- 采用数字签名进行参数验证,签名算法见:签名算法.txt -- 采用appKey-secret形式接入平台,即需要给接入方提供一个appKey和secret。 +- 开箱即用,写完业务代码直接启动服务即可使用,无需其它配置 +- 参数自动校验,支持国际化参数校验(JSR-303) +- 校验功能和结果返回功能实现各自独立,方便自定义实现或扩展 +- 采用注解来定义接口,维护简单方便 +- 支持i18n国际化消息返回 +- 采用数字签名进行参数验证 +- 采用appKey、secret形式接入平台,即需要给接入方提供一个appKey和secret ## 技术点 @@ -28,51 +27,13 @@ - token(jwt、accessToken) - SDK(Java、C#、JavaScript) -## 示例 +#### 功能①按参数路由: -- 定义接口: - -```java -@Api(name = "goods.get") -public Goods getGoods(GoodsParam param) { - Goods goods = new Goods(); - goods.setId(1L); - goods.setGoods_name("iPhoneX"); - goods.setPrice(new BigDecimal(9000)); - return goods; -} -``` - -- 请求数据: - -```json -{ - "name": "goods.get", - "version": "", - "app_key": "test", - "data": "%7B%22goodsPrice%22%3A%22%22%2C%22goods_name%22%3A%22iphoneX%22%7D", - "timestamp": "2018-03-22 13:48:58", - "format": "json", - "sign": "C946ACA5AC95B1790511764A10E675B7" -} -``` - -- 返回结果: - -```json -{ - "code":"0", - "data":{ - "goods_name":"iPhoneX", - "id":1, - "price":9000 - } -} -``` +#### 功能②按版本路由: - **@ApiVersion** -> * 通过此注解,自动为requestmappinginfo合并一个以版本号开头的路径;建议:大版本在类上配置,小版本可以通过配置在方法上,此时将替换类上面的大版本配置 +> * 通过此注解,自动为requestMappinginfo合并一个以版本号开头的路径;建议:大版本在类上配置,小版本可以通过配置在方法上,此时将替换类上面的大版本配置 - **@ClientVersion** @@ -137,15 +98,4 @@ public class TController { } ``` - -### reactor server config - -- .e.g - -``` -extend: - server: - port: #start port - path: # router patten -``` \ No newline at end of file diff --git a/bus-goalie/pom.xml b/bus-goalie/pom.xml index 48752febd5..e93ab155e2 100644 --- a/bus-goalie/pom.xml +++ b/bus-goalie/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-goalie - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/Assets.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/Assets.java index 75e769fdc3..96c3c88c75 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/Assets.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/Assets.java @@ -34,7 +34,8 @@ * api definition * * @author Justubborn - * @since 2020/10/27 + * @version 6.1.6 + * @since JDK 1.8+ */ @Data public class Assets { @@ -52,6 +53,8 @@ public class Assets { private String version; private String description; + + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/Athlete.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/Athlete.java index 7c88c26925..9d8f2c185e 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/Athlete.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/Athlete.java @@ -38,7 +38,8 @@ * 服务端 * * @author Justubborn - * @since 2020/10/27 + * @version 6.1.6 + * @since JDK 1.8+ */ public class Athlete { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/Consts.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/Consts.java index 6ea96c2ea3..099debcf29 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/Consts.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/Consts.java @@ -29,7 +29,8 @@ * 常量 * * @author Justubborn - * @since 2020/11/6 + * @version 6.1.6 + * @since JDK 1.8+ */ public interface Consts { @@ -39,6 +40,8 @@ public interface Consts { String FORMAT = "format"; + String SIGN = "sign"; + String X_ACCESS_TOKEN = "X-Access-Token"; } diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/Context.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/Context.java index a22fb4640b..c8902f1fc0 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/Context.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/Context.java @@ -43,7 +43,8 @@ * 上下文传参 * * @author Justubborn - * @since 2020/10/30 + * @version 6.1.6 + * @since JDK 1.8+ */ @Data public class Context { @@ -64,6 +65,10 @@ public class Context { private Format format = Format.json; + private boolean needDecrypt = false; + + private long startTime; + public static Context get(ServerWebExchange exchange) { Context context = exchange.getAttribute(Context.$); diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/Handler.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/Handler.java index 658fcff8b6..8780e1b019 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/Handler.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/Handler.java @@ -32,7 +32,7 @@ * 拦截器,原理同spring拦截器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public interface Handler { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/Provider.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/Provider.java index edf3ec3037..85c9c37553 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/Provider.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/Provider.java @@ -29,7 +29,7 @@ * 数据序列化 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public interface Provider { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/Registry.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/Registry.java index 951e082c3f..b099ee3398 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/Registry.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/Registry.java @@ -31,7 +31,8 @@ * api registry * * @author Justubborn - * @since 2020/10/27 + * @version 6.1.6 + * @since JDK 1.8+ */ public interface Registry { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java index 7295e12757..8ca38c6212 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ApiVersion.java @@ -35,7 +35,7 @@ * 规则,自动放置于路径开始部分;不做method做版本,避免难以维护 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java index f91879dc8d..4f24ea049f 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/ClientVersion.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java index 649cd29d27..75ddc62e66 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/TerminalVersion.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java index 85732ad534..027709ace5 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/annotation/VersionMapping.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/AbstractApiHandler.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/AbstractApiHandler.java index 2b291f0b78..990ab8a3d5 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/AbstractApiHandler.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/AbstractApiHandler.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public class AbstractApiHandler implements Handler { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiPermissionHandler.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiPermissionHandler.java index 63e5a60715..307164452c 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiPermissionHandler.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiPermissionHandler.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public class ApiPermissionHandler extends AbstractApiHandler { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRequestMappingHandlerMapping.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRequestMappingHandlerMapping.java index a5fe5dc759..95a5eadbe6 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRequestMappingHandlerMapping.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRequestMappingHandlerMapping.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public class ApiRequestMappingHandlerMapping extends RequestMappingHandlerMapping { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRouterHandler.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRouterHandler.java index 18e884a00c..c67405a8db 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRouterHandler.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiRouterHandler.java @@ -50,7 +50,8 @@ * router handler * * @author Justubborn - * @since 2020/10/27 + * @version 6.1.6 + * @since JDK 1.8+ */ public class ApiRouterHandler { @@ -72,7 +73,6 @@ public Mono handle(ServerRequest request) { MultiValueMap multiValueMap = new LinkedMultiValueMap<>(); multiValueMap.setAll(params); if (HttpMethod.GET.equals(assets.getHttpMethod())) { - builder.queryParams(multiValueMap); } WebClient.RequestBodySpec bodySpec = webClient @@ -82,12 +82,13 @@ public Mono handle(ServerRequest request) { if (!HttpMethod.GET.equals(assets.getHttpMethod())) { if (request.headers().contentType().isPresent()) { MediaType mediaType = request.headers().contentType().get(); - String contentType = mediaType.toString().toLowerCase(); - // 文件 - if (contentType.contains(MediaType.MULTIPART_FORM_DATA_VALUE)) { + //文件 + if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(mediaType)) { MultiValueMap partMap = new LinkedMultiValueMap<>(); partMap.setAll(context.getFilePartMap()); - bodySpec.body(BodyInserters.fromMultipartData(partMap).with(new LinkedMultiValueMap(multiValueMap))); + BodyInserters.MultipartInserter multipartInserter = BodyInserters.fromMultipartData(partMap); + params.forEach(multipartInserter::with); + bodySpec.body(multipartInserter); } else { bodySpec.bodyValue(multiValueMap); } diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiVersionRequestCondition.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiVersionRequestCondition.java index 05ea08321f..6d68f2fe8b 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiVersionRequestCondition.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiVersionRequestCondition.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public class ApiVersionRequestCondition extends AbstractRequestCondition { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiWebMvcRegistrations.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiWebMvcRegistrations.java index 07952f89b9..e1b1ed634b 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiWebMvcRegistrations.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/ApiWebMvcRegistrations.java @@ -34,7 +34,7 @@ * spring boot专用,避免继承webconfigurationsupport对spring的自动配置侵入和破坏 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public class ApiWebMvcRegistrations implements WebMvcRegistrations { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/GlobalExceptionHandler.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/GlobalExceptionHandler.java index d3d2544892..20811644be 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/GlobalExceptionHandler.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/handler/GlobalExceptionHandler.java @@ -28,7 +28,6 @@ import org.aoju.bus.base.consts.ErrorCode; import org.aoju.bus.base.spring.Controller; import org.aoju.bus.core.lang.exception.BusinessException; -import org.aoju.bus.core.toolkit.RuntimeKit; import org.aoju.bus.core.toolkit.StringKit; import org.aoju.bus.goalie.Consts; import org.aoju.bus.goalie.Context; @@ -38,7 +37,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.server.reactive.ServerHttpResponse; -import org.springframework.web.reactive.function.client.WebClientRequestException; +import org.springframework.web.reactive.function.client.WebClientException; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; import reactor.util.annotation.NonNull; @@ -49,7 +48,8 @@ * 异常处理 * * @author Justubborn - * @since 2020/10/27 + * @version 6.1.6 + * @since JDK 1.8+ */ public class GlobalExceptionHandler extends Controller implements ErrorWebExceptionHandler { @@ -57,7 +57,7 @@ public class GlobalExceptionHandler extends Controller implements ErrorWebExcept @Override public Mono handle(ServerWebExchange exchange, Throwable ex) { ServerHttpResponse response = exchange.getResponse(); - response.setStatusCode(HttpStatus.BAD_REQUEST); + response.setStatusCode(HttpStatus.OK); response.getHeaders().setContentType(MediaType.APPLICATION_JSON); Context context = Context.get(exchange); Map map = context.getRequestMap(); @@ -65,9 +65,10 @@ public Mono handle(ServerWebExchange exchange, Throwable ex) { if (null != map) { method = map.get(Consts.METHOD); } - Logger.error("request: {},error:{}", method, RuntimeKit.getMessage(ex)); + Logger.error("traceId:{},request: {},error:{}", exchange.getLogPrefix(), method, ex.getMessage()); + Logger.error(ex); Object message; - if (ex instanceof WebClientRequestException) { + if (ex instanceof WebClientException) { message = Controller.write(ErrorCode.EM_FAILURE); } else if (ex instanceof BusinessException) { BusinessException e = (BusinessException) ex; @@ -81,7 +82,7 @@ public Mono handle(ServerWebExchange exchange, Throwable ex) { } String formatBody = context.getFormat().getProvider().serialize(message); DataBuffer db = response.bufferFactory().wrap(formatBody.getBytes()); - return response.writeWith(Mono.just(db)); + return response.writeWith(Mono.just(db)) + .doOnTerminate(() -> Logger.info("traceId:{},exec time :{}ms", exchange.getLogPrefix(), System.currentTimeMillis() - context.getStartTime())); } - } diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/metric/Delegate.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/metric/Delegate.java index 9bbb029c01..0ba2fd69f1 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/metric/Delegate.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/metric/Delegate.java @@ -34,7 +34,8 @@ * 认证及委托处理 * * @author Justubborn - * @since 2020/11/6 + * @version 6.1.6 + * @since JDK 1.8+ */ @Data public class Delegate { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/registry/InterceptorRegistry.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/registry/InterceptorRegistry.java index e99c27c541..17a572e3ac 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/registry/InterceptorRegistry.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/registry/InterceptorRegistry.java @@ -31,7 +31,7 @@ * 数据序列化 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public interface InterceptorRegistry extends Registry { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/support/JsonProvider.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/support/JsonProvider.java index 24520fc845..05b1c15697 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/support/JsonProvider.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/support/JsonProvider.java @@ -32,7 +32,7 @@ * Json序列化 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public class JsonProvider implements Provider { diff --git a/bus-goalie/src/main/java/org/aoju/bus/goalie/support/XmlProvider.java b/bus-goalie/src/main/java/org/aoju/bus/goalie/support/XmlProvider.java index 7f60660356..762695db22 100644 --- a/bus-goalie/src/main/java/org/aoju/bus/goalie/support/XmlProvider.java +++ b/bus-goalie/src/main/java/org/aoju/bus/goalie/support/XmlProvider.java @@ -36,7 +36,7 @@ * Xml序列化 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public class XmlProvider implements Provider { diff --git a/bus-health/pom.xml b/bus-health/pom.xml index aa12eb03ee..758903db01 100755 --- a/bus-health/pom.xml +++ b/bus-health/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-health - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-health/src/main/java/org/aoju/bus/health/Builder.java b/bus-health/src/main/java/org/aoju/bus/health/Builder.java index b8143bf7cb..e4638162f4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Builder.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Builder.java @@ -61,7 +61,7 @@ * String parsing utility. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -117,46 +117,51 @@ public final class Builder { private static final String GHZ = "GHz"; private static final String THZ = "THz"; private static final String PHZ = "PHz"; - private static final Map multipliers; - // PDH timestamps are 1601 epoch, local time - // Constants to convert to UTC millis + private static final Map MULTIPLIERS; + /** + * DH时间戳是1601时代,本地时间常量要转换为UTC + */ private static final long EPOCH_DIFF = 11_644_473_600_000L; + /** + * 此时区在指定日期与UTC的偏移量 + */ private static final int TZ_OFFSET = TimeZone.getDefault().getOffset(System.currentTimeMillis()); - // Fast decimal exponentiation: pow(10,y) --> POWERS_OF_10[y] + /** + * 快速十进制求幂:pow(10,y)——> POWERS_OF_10[y] + */ private static final long[] POWERS_OF_TEN = {1L, 10L, 100L, 1_000L, 10_000L, 100_000L, 1_000_000L, 10_000_000L, 100_000_000L, 1_000_000_000L, 10_000_000_000L, 100_000_000_000L, 1_000_000_000_000L, 10_000_000_000_000L, 100_000_000_000_000L, 1_000_000_000_000_000L, 10_000_000_000_000_000L, 100_000_000_000_000_000L, 1_000_000_000_000_000_000L}; - // Fast hex character lookup - private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray(); - // Format returned by WMI for DateTime + /** + * WMI返回的日期时间格式 + */ private static final DateTimeFormatter CIM_FORMAT = DateTimeFormatter.ofPattern(Fields.PURE_DATETIME_ICE_PATTERN, Locale.US); - - private static final String READING_LOG = "Reading file {}"; - private static final String READ_LOG = "Read {}"; - - private static final Platform platform; /** * 硬件信息 */ - private static final HardwareAbstractionLayer hardware; + private static final HardwareAbstractionLayer HARDWARE; /** * 系统信息 */ - private static final OperatingSystem os; + private static final OperatingSystem OS; + /** + * 操作系统信息 + */ + private static final Platform PLATFORM; static { - multipliers = new HashMap<>(); - multipliers.put(HZ, 1L); - multipliers.put(KHZ, 1_000L); - multipliers.put(MHZ, 1_000_000L); - multipliers.put(GHZ, 1_000_000_000L); - multipliers.put(THZ, 1_000_000_000_000L); - multipliers.put(PHZ, 1_000_000_000_000_000L); - platform = new Platform(); - hardware = platform.getHardware(); - os = platform.getOperatingSystem(); + MULTIPLIERS = new HashMap<>(); + MULTIPLIERS.put(HZ, 1L); + MULTIPLIERS.put(KHZ, 1_000L); + MULTIPLIERS.put(MHZ, 1_000_000L); + MULTIPLIERS.put(GHZ, 1_000_000_000L); + MULTIPLIERS.put(THZ, 1_000_000_000_000L); + MULTIPLIERS.put(PHZ, 1_000_000_000_000_000L); + PLATFORM = new Platform(); + HARDWARE = PLATFORM.getHardware(); + OS = PLATFORM.getOperatingSystem(); } private Builder() { @@ -168,7 +173,7 @@ private Builder() { * @return 操作系统相关信息 */ public static OperatingSystem getOs() { - return os; + return OS; } /** @@ -177,7 +182,7 @@ public static OperatingSystem getOs() { * @return 硬件相关信息 */ public static HardwareAbstractionLayer getHardware() { - return hardware; + return HARDWARE; } /** @@ -186,7 +191,7 @@ public static HardwareAbstractionLayer getHardware() { * @return 获取BIOS中计算机相关信息 */ public static ComputerSystem getSystem() { - return hardware.getComputerSystem(); + return HARDWARE.getComputerSystem(); } /** @@ -195,7 +200,7 @@ public static ComputerSystem getSystem() { * @return 内存相关信息 */ public static GlobalMemory getMemory() { - return hardware.getMemory(); + return HARDWARE.getMemory(); } /** @@ -204,7 +209,7 @@ public static GlobalMemory getMemory() { * @return CPU(处理器)相关信息 */ public static CentralProcessor getProcessor() { - return hardware.getProcessor(); + return HARDWARE.getProcessor(); } @@ -307,7 +312,7 @@ public static InetAddress getLocalAddress() { * @return 网络相关信息 */ public static List getNetworkIFs() { - return hardware.getNetworkIFs(); + return HARDWARE.getNetworkIFs(); } /** @@ -371,7 +376,7 @@ private static Cpu getCpuInfo(CentralProcessor processor, long waitingTime) { * @return 传感器相关信息 */ public static Sensors getSensors() { - return hardware.getSensors(); + return HARDWARE.getSensors(); } /** @@ -380,7 +385,7 @@ public static Sensors getSensors() { * @return 磁盘相关信息 */ public static List getDiskStores() { - return hardware.getDiskStores(); + return HARDWARE.getDiskStores(); } /** @@ -455,12 +460,12 @@ public static String getCwd(int pid) { */ public static long getLongFromFile(String filename) { if (Logger.get().isDebug()) { - Logger.debug(READING_LOG, filename); + Logger.debug("Reading file {}", filename); } List read = FileKit.readLines(filename); if (!read.isEmpty()) { if (Logger.get().isTrace()) { - Logger.trace(READ_LOG, read.get(0)); + Logger.trace("Read {}", read.get(0)); } return Builder.parseLongOrDefault(read.get(0), 0L); } @@ -486,13 +491,13 @@ public static long getUnsignedInt(int x) { */ public static int getIntFromFile(String filename) { if (Logger.get().isDebug()) { - Logger.debug(READING_LOG, filename); + Logger.debug("Reading file {}", filename); } try { List read = FileKit.readLines(filename); if (!read.isEmpty()) { if (Logger.get().isTrace()) { - Logger.trace(READ_LOG, read.get(0)); + Logger.trace("Read {}", read.get(0)); } return Integer.parseInt(read.get(0)); } @@ -511,12 +516,12 @@ public static int getIntFromFile(String filename) { */ public static String getStringFromFile(String filename) { if (Logger.get().isDebug()) { - Logger.debug(READING_LOG, filename); + Logger.debug("Reading file {}", filename); } List read = FileKit.readLines(filename); if (!read.isEmpty()) { if (Logger.get().isTrace()) { - Logger.trace(READ_LOG, read.get(0)); + Logger.trace("Read {}", read.get(0)); } return read.get(0); } @@ -535,7 +540,7 @@ public static String getStringFromFile(String filename) { public static Map getKeyValueMapFromFile(String filename, String separator) { Map map = new HashMap<>(); if (Logger.get().isDebug()) { - Logger.debug(READING_LOG, filename); + Logger.debug("Reading file {}", filename); } List lines = FileKit.readLines(filename); for (String line : lines) { @@ -793,7 +798,7 @@ public static long parseHertz(String hertz) { Matcher matcher = HERTZ_PATTERN.matcher(hertz.trim()); if (matcher.find() && matcher.groupCount() == 3) { // Regexp enforces #(.#) format so no test for NFE required - double value = Double.valueOf(matcher.group(1)) * multipliers.getOrDefault(matcher.group(3), -1L); + double value = Double.valueOf(matcher.group(1)) * MULTIPLIERS.getOrDefault(matcher.group(3), -1L); if (value >= 0d) { return (long) value; } @@ -883,8 +888,8 @@ public static String byteArrayToHexString(byte[] bytes) { char[] hexChars = new char[bytes.length * 2]; for (int j = 0; j < bytes.length; j++) { int v = bytes[j] & 0xFF; - hexChars[j * 2] = HEX_ARRAY[v >>> 4]; - hexChars[j * 2 + 1] = HEX_ARRAY[v & 0x0F]; + hexChars[j * 2] = Normal.DIGITS_16_UPPER[v >>> 4]; + hexChars[j * 2 + 1] = Normal.DIGITS_16_UPPER[v & 0x0F]; } return new String(hexChars); } diff --git a/bus-health/src/main/java/org/aoju/bus/health/Config.java b/bus-health/src/main/java/org/aoju/bus/health/Config.java index e2dd0713bd..5ebb6728e6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Config.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Config.java @@ -33,7 +33,7 @@ * The global configuration utility. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @NotThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/Executor.java b/bus-health/src/main/java/org/aoju/bus/health/Executor.java index cd4ae2aa1e..8e0dccca95 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Executor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Executor.java @@ -42,7 +42,7 @@ * execution. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/Formats.java b/bus-health/src/main/java/org/aoju/bus/health/Formats.java index d056bc08f3..421ddbeab1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Formats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Formats.java @@ -34,7 +34,7 @@ * 用于附加单元或在数字类型之间转换的格式化实用程序 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/Memoize.java b/bus-health/src/main/java/org/aoju/bus/health/Memoize.java index 16a66c9f16..09a572249c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Memoize.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Memoize.java @@ -36,7 +36,7 @@ * rather than recalculating it. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/Platform.java b/bus-health/src/main/java/org/aoju/bus/health/Platform.java index 81cc9445a8..578489692b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/Platform.java +++ b/bus-health/src/main/java/org/aoju/bus/health/Platform.java @@ -53,7 +53,7 @@ * 操作系统信息支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Platform { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java index e667fccac7..c848e99408 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/Cpu.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Cpu { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java index e1af4bc552..b0b4d2b71e 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/Java.java @@ -35,7 +35,7 @@ * 代表Java Implementation的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Java implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java index de4d5734cf..83077944fd 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaRuntime.java @@ -35,7 +35,7 @@ * 代表当前运行的JRE的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JavaRuntime implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java index 416bc5f529..97243ad8a3 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JavaSpec.java @@ -34,7 +34,7 @@ * 代表Java Specification的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JavaSpec implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java index 3e219573e7..b4719e1337 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/Jvm.java @@ -34,7 +34,7 @@ * 代表Java Virtual Machine Implementation的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Jvm implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java index d62c99e656..835cf42f3c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmRuntime.java @@ -34,7 +34,7 @@ * 运行时信息,包括内存总大小、已用大小、可用大小等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JvmRuntime implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java index 39507bfba8..1945886b5b 100755 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/JvmSpec.java @@ -34,7 +34,7 @@ * 代表Java Virutal Machine Specification的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JvmSpec implements Serializable { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java index 4c1a41d850..a80f1afb61 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/User.java @@ -32,7 +32,7 @@ * OSUser class * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class User { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java index 06cac463cd..7e3254f414 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractBaseboard.java @@ -31,7 +31,7 @@ * 主板数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java index 7dc3a1effb..4b016f91ee 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractCentralProcessor.java @@ -41,7 +41,7 @@ * A CPU. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java index f3065c0516..2305fbf508 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractComputerSystem.java @@ -34,7 +34,7 @@ * 计算机系统数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java index 6adf1ef678..3b9ffe6251 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractDisplay.java @@ -34,7 +34,7 @@ * 显示器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java index 32e3a20cc1..4eac281c61 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractFirmware.java @@ -32,7 +32,7 @@ * 固件数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java index 7c7d41cc59..8e6aac1ffc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGlobalMemory.java @@ -39,7 +39,7 @@ * 内存信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java index bd4c31d277..327cfae3a1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractGraphicsCard.java @@ -31,7 +31,7 @@ * 抽象声卡 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java index ce20adaf02..d2e502647e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHWDiskStore.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java index 99775c36a6..22d79aafaf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractHardwareAbstractionLayer.java @@ -35,7 +35,7 @@ * 硬件信息特定于平台的实现所使用的公共字段或方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java index d6836fe075..ac72a57679 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractNetworkIF.java @@ -45,7 +45,7 @@ * 网络接口信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java index 24054ac24d..72d2120205 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractPowerSource.java @@ -43,7 +43,7 @@ * 电源支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java index 0a2ba1139c..d15f2635d1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSensors.java @@ -35,7 +35,7 @@ * 来自WMI或Open Hardware Monitor的传感器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java index 38176a8ec9..9e7012e38f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractSoundCard.java @@ -31,7 +31,7 @@ * 抽象声卡 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java index fd5bfb6a7b..a10ef4368e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractUsbDevice.java @@ -36,7 +36,7 @@ * USB设备 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java index f2c34ccc98..50f05214f2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/AbstractVirtualMemory.java @@ -33,7 +33,7 @@ * 虚拟内存信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java index 530ca8e36a..2f1110655e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Baseboard.java @@ -31,7 +31,7 @@ * 主板信息数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java index a27c6bcd37..d5d64ceed1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/CentralProcessor.java @@ -45,7 +45,7 @@ * 多个逻辑处理器(操作系统看到的内容,可能包括超线程内核) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java index 604a8067db..4ca875735d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/ComputerSystem.java @@ -33,7 +33,7 @@ * etc. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java index bfb7c1cfdf..d7ee897543 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Display.java @@ -32,7 +32,7 @@ * identified by the EDID standard. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java index 8af8a9bc6c..891759c4b6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Firmware.java @@ -31,7 +31,7 @@ * The Firmware represents the low level BIOS or equivalent. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java index bd1e926a47..14fc480b76 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GlobalMemory.java @@ -34,7 +34,7 @@ * physical memory (RAM) as well as any available virtual memory. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java index 92a1e89e44..7a68575550 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/GraphicsCard.java @@ -31,7 +31,7 @@ * GraphicsCard interface. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java index 5dc0c43c7b..5055fd3aaa 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWDiskStore.java @@ -35,7 +35,7 @@ * 方式,磁盘存储代表文件系统用于文件存储的硬件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java index cab9964137..17713efce1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HWPartition.java @@ -37,7 +37,7 @@ * actual disk. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java index 1d0141b1eb..a1e883f7f6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/HardwareAbstractionLayer.java @@ -34,7 +34,7 @@ * processors, memory, battery, and disks. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java index 4b6e5adc8d..1b1343393c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/NetworkIF.java @@ -38,7 +38,7 @@ * usage to ensure consistent calculations. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java index ca32ef1ee5..241fde9e4e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PhysicalMemory.java @@ -33,7 +33,7 @@ * computer system and available to the operating system. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java index 9f00257505..2084607721 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/PowerSource.java @@ -34,7 +34,7 @@ * of charge/discharge * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java index cb827c8d86..12191ea7d6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/Sensors.java @@ -32,7 +32,7 @@ * information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java index 0d88d125c1..542b6534ec 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/SoundCard.java @@ -31,7 +31,7 @@ * SoundCard interface. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java index 9eeb2737e7..03883bbd19 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/UsbDevice.java @@ -35,7 +35,7 @@ * in a recursive fashion. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java index f450522070..047ea37bf2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/hardware/VirtualMemory.java @@ -33,7 +33,7 @@ * information to a disk or other storage device. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java index bf9f63107d..1f3cbac0d5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractFileSystem.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java index f6da128e55..00fc300678 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractNetworkParams.java @@ -42,7 +42,7 @@ * Common NetworkParams implementation. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java index 5610b86349..f2a2f20a4d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSFileStore.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java index a44389b2d4..3bcc2d3fe3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSProcess.java @@ -37,7 +37,7 @@ * execution that execute instructions concurrently. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java index 787a8e2518..0028baabb4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOSThread.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractOSThread implements OSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java index bcc782a1c2..4f55395131 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/AbstractOperatingSystem.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractOperatingSystem implements OperatingSystem { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java index ac89b3bce4..5d969dea9f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/FileSystem.java @@ -35,7 +35,7 @@ * more file stores. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java index 2e0cca2a0a..34cb5ce7d1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/InternetProtocolStats.java @@ -31,7 +31,7 @@ * Includes key statistics of TCP and UDP protocols * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java index 89d5b3ce06..c45d88b7b4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/NetworkParams.java @@ -32,7 +32,7 @@ * name etc. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java index b09c3d742b..24833588eb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSFileStore.java @@ -34,7 +34,7 @@ * {@link java.nio.file.FileStore} class, with additional information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java index 866bb03ac7..878aed221c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSProcess.java @@ -35,7 +35,7 @@ * threads. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java index d3b5df4350..f0b52ed1f4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSService.java @@ -33,7 +33,7 @@ * generally shield applications from the implementation details of the machine. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java index 3a97a15ef5..8296bd4674 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSSession.java @@ -37,7 +37,7 @@ * to an operating system. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java index cf92c4e868..201c8f5150 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OSThread.java @@ -29,7 +29,7 @@ * Represents a Thread/Task on the operating system. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java index 73e8aaff85..cf56cce31a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/builtin/software/OperatingSystem.java @@ -41,7 +41,7 @@ * controls the computer. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java b/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java index e6b07246dc..ef61236d32 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/LinuxLibc.java @@ -36,7 +36,7 @@ * 因为如果/当它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface LinuxLibc extends LibC, CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java b/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java index f2d2a2aa95..323a4da7bd 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/ProcPath.java @@ -36,7 +36,7 @@ * 提供对Linux上某些/proc文件系统信息的访问 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java index e640512df6..fddc9b2bcf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuInfo.java @@ -39,7 +39,7 @@ * Utility to read CPU info from {@code /proc/cpuinfo} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java index 2ed59f6062..12c3710ce8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/CpuStat.java @@ -38,7 +38,7 @@ * Utility to read CPU statistics from {@code /proc/stat} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java index 914945c5c7..0de791c88b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Devicetree.java @@ -33,7 +33,7 @@ * Utility to read info from the devicetree * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java index 1e43af3f91..c20fb7bbc8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/DiskStats.java @@ -40,7 +40,7 @@ * Utility to read disk statistics from {@code /proc/diskstats} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java index 0b75190a9d..d072b921b4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Dmidecode.java @@ -35,7 +35,7 @@ * Utility to read info from {@code dmidecode} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java index 79ac6256aa..9f7a0bfe46 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshal.java @@ -33,7 +33,7 @@ * Utility to read info from {@code lshal} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java index 33d575c4e5..a745e72c01 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Lshw.java @@ -33,7 +33,7 @@ * Utility to read info from {@code lshw} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java index 51418e8fac..55ad6c20d4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/ProcessStat.java @@ -41,7 +41,7 @@ * Utility to read process statistics from {@code /proc/[pid]/stat} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java index e502bf1ca6..7174d6eae8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Sysfs.java @@ -34,7 +34,7 @@ * Utility to read info from {@code sysfs} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java index 3fe6404b71..ee27d92dab 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UpTime.java @@ -34,7 +34,7 @@ * Utility to read system uptime from {@code /proc/uptime} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java index 8c9a66068d..a01a585b1c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/UserGroup.java @@ -42,7 +42,7 @@ * parsing process ownership. Cache expires after one minute. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java index c51bb11e6f..885d094241 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/drivers/Who.java @@ -41,7 +41,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java index 475c190777..dff6368dfc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxBaseboard.java @@ -39,7 +39,7 @@ * Baseboard data obtained by sysfs * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java index b1d4de077d..3b4ec07bd8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxCentralProcessor.java @@ -49,7 +49,7 @@ * A CPU as defined in Linux /proc. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java index 84fe156816..22da3109b2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxComputerSystem.java @@ -39,7 +39,7 @@ * Hardware data obtained from sysfs. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java index 4b7245fada..b60dcd2f71 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxDisplay.java @@ -40,7 +40,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java index 660135e848..647dce2ef8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxFirmware.java @@ -45,7 +45,7 @@ * Firmware data obtained by sysfs. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java index c0e534049e..2554a6daf6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGlobalMemory.java @@ -43,7 +43,7 @@ * Memory obtained by /proc/meminfo and sysinfo.totalram * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java index a0cf2afa4f..4dae631345 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxGraphicsCard.java @@ -43,7 +43,7 @@ * Graphics card info obtained by lshw * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java index 08b204ad00..4073d6e44e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHWDiskStore.java @@ -48,7 +48,7 @@ * Linux hard disk implementation. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java index c25670cfba..95decdf707 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxHardwareAbstractionLayer.java @@ -34,7 +34,7 @@ * LinuxHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java index f7fbc8fb9e..7d8fe4e3d7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxNetworkIF.java @@ -32,15 +32,15 @@ import java.io.File; import java.net.NetworkInterface; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; /** * LinuxNetworks class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -72,8 +72,11 @@ public LinuxNetworkIF(NetworkInterface netint) { * the interfaces */ public static List getNetworks(boolean includeLocalInterfaces) { - return Collections.unmodifiableList(getNetworkInterfaces(includeLocalInterfaces).stream() - .map(LinuxNetworkIF::new).collect(Collectors.toList())); + List ifList = new ArrayList<>(); + for (NetworkInterface ni : getNetworkInterfaces(includeLocalInterfaces)) { + ifList.add(new LinuxNetworkIF(ni)); + } + return Collections.unmodifiableList(ifList); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java index c8d44f6ced..a95df330cc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxPowerSource.java @@ -41,7 +41,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java index 98736b7434..5122d1ae46 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSensors.java @@ -44,7 +44,7 @@ * Sensors from WMI or Open Hardware Monitor * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java index 8fb7f25dda..b39549b77e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxSoundCard.java @@ -45,7 +45,7 @@ * Sound card data obtained via /proc/asound directory * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java index f131a1eff6..623b363ea8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxUsbDevice.java @@ -39,7 +39,7 @@ * Linux Usb Device * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java index 374baac3a9..336ea9b428 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/hardware/LinuxVirtualMemory.java @@ -42,7 +42,7 @@ * Memory obtained by /proc/meminfo and /proc/vmstat * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java index 8ec788a784..71bd62ba9f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxFileSystem.java @@ -50,7 +50,7 @@ * the /proc/mount filesystem, excluding temporary and kernel mounts. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java index f249982e63..ecede19c05 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxInternetProtocolStats.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java index 8de2ba4e2a..a60599861a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxNetworkParams.java @@ -47,7 +47,7 @@ * LinuxNetworkParams class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java index e0f318fd17..6067064cab 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSFileStore.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java index ab1a24e001..696615f23f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSProcess.java @@ -55,7 +55,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java index 7f0f173a92..229ff9555a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOSThread.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LinuxOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java index cc8c3ad623..2854a19aff 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/linux/software/LinuxOperatingSystem.java @@ -55,7 +55,7 @@ * 1991, by Linus Torvalds. Linux is typically packaged in a Linux distribution. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java index 8cc2d180ec..80c6a08643 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/IOKit.java @@ -34,7 +34,7 @@ * I/O Kit框架通过设备接口机制实现对I/O Kit对象(驱动程序和nub)的非内核访问 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IOKit extends com.sun.jna.platform.mac.IOKit { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java index 6afc3dbe07..e19dd04bcf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/SmcKit.java @@ -47,7 +47,7 @@ * 提供对Mac OS上SMC调用的访问 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java index 4982ab3df8..a628b736fa 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/SysctlKit.java @@ -38,7 +38,7 @@ * 提供对Mac OS上的sysctl调用的访问 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java b/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java index 616f7e98fb..132d5e8d16 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/SystemB.java @@ -35,7 +35,7 @@ * 它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SystemB extends com.sun.jna.platform.mac.SystemB, CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java b/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java index 99b4396341..24854df2a5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/ThreadInfo.java @@ -40,6 +40,10 @@ /** * Utility to query threads for a process + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @ThreadSafe public final class ThreadInfo { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java index f9b21b6a98..b197f60d03 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/DiskKit.java @@ -38,7 +38,7 @@ * Utility to query diskutil * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java index ef9203749e..96b338ba4f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Fsstat.java @@ -39,7 +39,7 @@ * Utility to query fsstat * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java index 78b86376c3..988bf5412e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/NetStat.java @@ -42,7 +42,7 @@ * Utility to query NetStat. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java index 82f409d3c9..81cb7d23e6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/drivers/Who.java @@ -40,7 +40,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java index fa39065275..b0cf8ea7c7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacBaseboard.java @@ -42,7 +42,7 @@ * Baseboard data obtained from ioreg * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java index 4561ea092f..4b51f07629 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacCentralProcessor.java @@ -46,6 +46,10 @@ /** * A CPU. + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @ThreadSafe final class MacCentralProcessor extends AbstractCentralProcessor { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java index 8cf207ffad..97fd0c8175 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacComputerSystem.java @@ -44,7 +44,7 @@ * Hardware data obtained from ioreg. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java index d9c33fbf05..7d58d11fa8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacDisplay.java @@ -45,7 +45,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java index c91b3a3848..30328e342f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacFirmware.java @@ -43,7 +43,7 @@ * Firmware data obtained from ioreg. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java index 9095b21f1e..087e9ddc98 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGlobalMemory.java @@ -50,7 +50,7 @@ * Memory obtained by host_statistics (vm_stat) and sysctl. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java index 24609e7834..74d07e0138 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacGraphicsCard.java @@ -42,7 +42,7 @@ * Graphics card info obtained by system_profiler SPDisplaysDataType. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java index a8104b2136..072155c1b8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHWDiskStore.java @@ -51,7 +51,7 @@ * Mac hard disk implementation. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java index a2e3cd7bee..ae874cb187 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacHardwareAbstractionLayer.java @@ -34,7 +34,7 @@ * MacHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java index 0b2a4409dd..47758c155a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacNetworkIF.java @@ -31,16 +31,16 @@ import org.aoju.bus.health.mac.drivers.NetStat; import java.net.NetworkInterface; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** * MacNetworks class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -73,8 +73,11 @@ public MacNetworkIF(NetworkInterface netint, Map data) public static List getNetworks(boolean includeLocalInterfaces) { // One time fetch of stats final Map data = NetStat.queryIFdata(-1); - return Collections.unmodifiableList(getNetworkInterfaces(includeLocalInterfaces).stream() - .map(ni -> new MacNetworkIF(ni, data)).collect(Collectors.toList())); + List ifList = new ArrayList<>(); + for (NetworkInterface ni : getNetworkInterfaces(includeLocalInterfaces)) { + ifList.add(new MacNetworkIF(ni, data)); + } + return Collections.unmodifiableList(ifList); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java index 4e5478415e..4328a02600 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacPowerSource.java @@ -45,7 +45,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java index 7d36902437..8b3fe34a4f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSensors.java @@ -34,7 +34,7 @@ * Sensors from SMC * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java index fa95c70c3f..6c8ebac133 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacSoundCard.java @@ -40,7 +40,7 @@ * Sound card data obtained via AppleHDA kext * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java index 7f7d795e96..02111664b1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacUsbDevice.java @@ -45,7 +45,7 @@ * Mac Usb Device * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java index 6544481b36..045ed2b25e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/hardware/MacVirtualMemory.java @@ -44,7 +44,7 @@ * Memory obtained by host_statistics (vm_stat) and sysctl. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java index ad35a3d8c2..9a5c758371 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacFileSystem.java @@ -63,7 +63,7 @@ * in the /Volumes directory. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java index 9dea0677b0..29d6d05b01 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacInternetProtocolStats.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java index e494f3deb7..2a9f2b0c0b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacNetworkParams.java @@ -46,7 +46,7 @@ * MacNetworkParams class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java index b82aa612b7..48e2374971 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSFileStore.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java index d545717542..31196d1a99 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSProcess.java @@ -50,7 +50,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java index b78a653a46..1b9abd6bdb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOSThread.java @@ -29,6 +29,11 @@ import org.aoju.bus.health.builtin.software.AbstractOSThread; import org.aoju.bus.health.builtin.software.OSProcess; +/** + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ + */ @Immutable public class MacOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java index c80545c3d2..2ee5e4d8ab 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/mac/software/MacOperatingSystem.java @@ -48,7 +48,7 @@ * It is the primary operating system for Apple's Mac computers. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -160,7 +160,7 @@ private String parseCodeName() { } } Logger.warn("Unable to parse version {}.{} to a codename.", this.major, this.minor); - return Normal.EMPTY; + return "Big Sur"; } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java b/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java index 40c292dfe1..10de370d4d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/CLibrary.java @@ -37,7 +37,7 @@ * 因为如果/当它的代码被合并到JNA项目中时,它可能会被删除。 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CLibrary extends LibCAPI, Library { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java b/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java index 0673917d22..70ea91f647 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/NetStatTcp.java @@ -35,7 +35,7 @@ * Utility to query TCP connections * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java index 74cc312b54..3ac1c3c087 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/Who.java @@ -48,7 +48,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java b/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java index 504302854b..a2c4f9f737 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/Xrandr.java @@ -37,7 +37,7 @@ * Utility to query xrandr * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java index 25fc7b0b08..960a2462d3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/AixLibc.java @@ -33,7 +33,7 @@ * if/when its code is incorporated into the JNA project. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface AixLibc extends CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java index b810180c41..c24b879977 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/Perfstat.java @@ -42,7 +42,7 @@ * The perfstat API is thread–safe, and does not require root authority. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Perfstat extends Library { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java index 7738b98286..cd016806d9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Ls.java @@ -37,7 +37,7 @@ * Utility to query ls * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java index 34bad98252..e337fb93e2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lscfg.java @@ -37,7 +37,7 @@ * Utility to query lscfg * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java index 94a0fb1415..0132665390 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lspv.java @@ -39,7 +39,7 @@ * Utility to query lspv * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java index f69b43fa08..93239c2c0a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Lssrad.java @@ -39,7 +39,7 @@ * Utility to query lssrad * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Uptime.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Uptime.java new file mode 100644 index 0000000000..7a46a4a2b9 --- /dev/null +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Uptime.java @@ -0,0 +1,78 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org OSHI and other contributors. * + * * + * 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. * + * * + ********************************************************************************/ +package org.aoju.bus.health.unix.aix.drivers; + +import org.aoju.bus.core.annotation.ThreadSafe; +import org.aoju.bus.health.Builder; +import org.aoju.bus.health.Executor; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Utility to query up time. + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ + */ +@ThreadSafe +public final class Uptime { + + private static final long MINUTE_MS = 60L * 1000L; + private static final long HOUR_MS = 60L * MINUTE_MS; + private static final long DAY_MS = 24L * HOUR_MS; + + // sample format: + // 18:36pm up 10 days 8:11, 2 users, load average: 3.14, 2.74, 2.41 + private static final Pattern UPTIME_FORMAT_AIX = Pattern + .compile(".*\\sup\\s+((\\d+)\\s+days?,?\\s+)?\\b((\\d+):)?(\\d+)(\\s+min(utes?)?)?,\\s+\\d+\\s+user.+"); + + private Uptime() { + } + + /** + * Query {@code uptime} to get up time + * + * @return Up time in milliseconds + */ + public static long queryUpTime() { + long uptime = 0L; + String s = Executor.getFirstAnswer("/usr/bin/uptime"); + Matcher m = UPTIME_FORMAT_AIX.matcher(s); + if (m.matches()) { + if (m.group(2) != null) { + uptime += Builder.parseLongOrDefault(m.group(2), 0L) * DAY_MS; + } + if (m.group(4) != null) { + uptime += Builder.parseLongOrDefault(m.group(4), 0L) * HOUR_MS; + } + uptime += Builder.parseLongOrDefault(m.group(5), 0L) * MINUTE_MS; + } + return uptime; + } + +} diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java index 3ae19d46cf..c4e6f2c173 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/Who.java @@ -40,7 +40,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -60,7 +60,7 @@ private Who() { * @return Boot time in milliseconds since the epoch */ public static long queryBootTime() { - String s = Executor.getFirstAnswer("who -b"); + String s = Executor.getFirstAnswer("/usr/bin/who -b"); Matcher m = BOOT_FORMAT_AIX.matcher(s); if (m.matches()) { try { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java index fe068de19e..9b2e48611f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatConfig.java @@ -32,7 +32,7 @@ * Utility to query partition config * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java index b1ddedb14b..0430d7f824 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatCpu.java @@ -32,7 +32,7 @@ * Utility to query performance stats for cpu * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java index 6c80ecfd03..dfb9f2a3c8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatDisk.java @@ -33,7 +33,7 @@ * Utility to query performance stats for disk_stats * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java index bd3d8bbc35..8a55c5cc08 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatMemory.java @@ -32,7 +32,7 @@ * Utility to query performance stats for memory * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java index 11310253ae..faf7e7fc85 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatNetInterface.java @@ -32,7 +32,7 @@ * Utility to query performance stats for network interfaces * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java index 302254c77c..e7746183c2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProcess.java @@ -35,7 +35,7 @@ * Utility to query performance stats for processes * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java index 301813264d..0932bd7f6b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/drivers/perfstat/PerfstatProtocol.java @@ -32,7 +32,7 @@ * Utility to query performance stats for network interfaces * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java index 986d1c5684..ab92d0378b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixBaseboard.java @@ -40,7 +40,7 @@ * Baseboard data obtained by lscfg * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java index 3eabe6a37d..6aa352ef23 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixCentralProcessor.java @@ -49,7 +49,7 @@ * A CPU * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java index bdbdda49df..a43951e3e3 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixComputerSystem.java @@ -43,7 +43,7 @@ * Hardware data obtained from lsattr * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java index a705a96f88..10c16010d5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixDisplay.java @@ -38,7 +38,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java index d6c9ecaad5..97d510039c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixFirmware.java @@ -32,7 +32,7 @@ * Firmware data. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java index 3a6476012e..e62f2308ba 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGlobalMemory.java @@ -44,7 +44,7 @@ * Memory obtained by perfstat_memory_total_t * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java index c09822642c..8d72919d41 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixGraphicsCard.java @@ -42,7 +42,7 @@ * Graphics Card info obtained from lscfg * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java index 6adc2e7d42..58434cd63c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHWDiskStore.java @@ -45,7 +45,7 @@ * AIX hard disk implementation. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java index 9f3625f999..1b301c6d38 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixHardwareAbstractionLayer.java @@ -40,7 +40,7 @@ * AIXHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java index f1e08d8814..a4a243f76f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixNetworkIF.java @@ -34,16 +34,16 @@ import org.aoju.bus.health.unix.aix.drivers.perfstat.PerfstatNetInterface; import java.net.NetworkInterface; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.function.Supplier; -import java.util.stream.Collectors; /** * AIXNetworks class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -78,8 +78,11 @@ public AixNetworkIF(NetworkInterface netint, Supplier getNetworks(boolean includeLocalInterfaces) { Supplier netstats = Memoize.memoize(PerfstatNetInterface::queryNetInterfaces, Memoize.defaultExpiration()); - return Collections.unmodifiableList(getNetworkInterfaces(includeLocalInterfaces).stream() - .map(n -> new AixNetworkIF(n, netstats)).collect(Collectors.toList())); + List ifList = new ArrayList<>(); + for (NetworkInterface ni : getNetworkInterfaces(includeLocalInterfaces)) { + ifList.add(new AixNetworkIF(ni, netstats)); + } + return Collections.unmodifiableList(ifList); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java index 14a9c7bb74..d0d32bd8bf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixPowerSource.java @@ -38,7 +38,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java index 23f2a847ed..9b22db4659 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSensors.java @@ -35,7 +35,7 @@ * Sensors not available except counting fans from lscfg * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java index 210e48730a..ed4b8b39da 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixSoundCard.java @@ -40,7 +40,7 @@ * AIX Sound Card. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java index 841d575f9b..51b1b7e33a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixUsbDevice.java @@ -40,7 +40,7 @@ * AIX Usb Device * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java index 8c386d3bd2..dc7ab53741 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/hardware/AixVirtualMemory.java @@ -35,7 +35,7 @@ * Memory obtained by perfstat_memory_total_t * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java index bb6d7ed9a5..754cde6988 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixFileSystem.java @@ -43,7 +43,7 @@ * implementation specific means of file storage. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java index 20e4b654ef..793760d1e6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixInternetProtocolStats.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java index 29f250d0f0..94d2276ebe 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixNetworkParams.java @@ -38,7 +38,7 @@ * AixNetworkParams class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java index 7da2944ed2..a87aa22813 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSFileStore.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java index 169163ad99..1c973476ca 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSProcess.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java index f45bb5933d..78c09ddad4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOSThread.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AixOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java index e20a448c18..cbfa6b88dd 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/aix/software/AixOperatingSystem.java @@ -37,6 +37,7 @@ import org.aoju.bus.health.builtin.software.*; import org.aoju.bus.health.unix.aix.AixLibc; import org.aoju.bus.health.unix.aix.Perfstat; +import org.aoju.bus.health.unix.aix.drivers.Uptime; import org.aoju.bus.health.unix.aix.drivers.Who; import org.aoju.bus.health.unix.aix.drivers.perfstat.PerfstatConfig; import org.aoju.bus.health.unix.aix.drivers.perfstat.PerfstatProcess; @@ -52,18 +53,22 @@ * platforms. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe public class AixOperatingSystem extends AbstractOperatingSystem { - private static final long BOOTTIME = querySystemBootTime(); + private static final long BOOTTIME = querySystemBootTimeMillis() / 1000L; private final Supplier config = Memoize.memoize(PerfstatConfig::queryConfig); Supplier procCpu = Memoize.memoize(PerfstatProcess::queryProcesses, Memoize.defaultExpiration()); - private static long querySystemBootTime() { - return Who.queryBootTime() / 1000L; + private static long querySystemBootTimeMillis() { + long bootTime = Who.queryBootTime(); + if (bootTime >= 1000L) { + return bootTime; + } + return System.currentTimeMillis() - Uptime.queryUpTime(); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java index 222b491173..1462970864 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/BsdSysctlKit.java @@ -37,7 +37,7 @@ * 提供对FreeBSD上的sysctl调用的访问 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java index c43e480824..2534e77ebe 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/FreeBsdLibc.java @@ -37,7 +37,7 @@ * 它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface FreeBsdLibc extends CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/ProcstatKit.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/ProcstatKit.java index 7b3065f51e..123c1d20c8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/ProcstatKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/ProcstatKit.java @@ -38,7 +38,7 @@ * Reads from procstat into a map * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java index 74b49e97b4..495075c43c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomDiskList.java @@ -41,7 +41,7 @@ * Utility to query geom part list * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java index 7b4d2c98d8..d741397101 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/GeomPartList.java @@ -40,7 +40,7 @@ * Utility to query geom part list * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java index 6ad63bfd19..b21d4a3783 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Mount.java @@ -37,7 +37,7 @@ * Utility to query mount * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java index 6429d82411..6563adb8fa 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/drivers/Who.java @@ -40,7 +40,7 @@ * Utility to query logged in users. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java index 90e291130b..8a3c355a0d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdBaseboard.java @@ -32,7 +32,7 @@ * Baseboard data obtained by dmidecode * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java index ff78504dea..26150781fa 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdCentralProcessor.java @@ -53,7 +53,7 @@ * A CPU * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java index dcb1433d2f..2d2a7d9c49 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdComputerSystem.java @@ -42,7 +42,7 @@ * Hardware data obtained from dmidecode. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java index 9d5ae106ba..38763c9ff4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdDisplay.java @@ -39,7 +39,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java index 06d58776e3..f9e2f8b36d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdFirmware.java @@ -40,7 +40,7 @@ * Firmware information from dmidecode * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java index 46a15267e8..e6e1594517 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGlobalMemory.java @@ -39,7 +39,7 @@ * Memory obtained by sysctl vm.stats * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java index 5bd209ee61..41206ab001 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdGraphicsCard.java @@ -41,6 +41,10 @@ /** * Graphics Card info obtained from pciconf + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @Immutable final class FreeBsdGraphicsCard extends AbstractGraphicsCard { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java index d15244cab6..2e73ebaef0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHWDiskStore.java @@ -43,6 +43,10 @@ /** * FreeBSD hard disk implementation. + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @ThreadSafe public final class FreeBsdHWDiskStore extends AbstractHWDiskStore { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java index 2feab32072..c4a774db40 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdHardwareAbstractionLayer.java @@ -34,7 +34,7 @@ * FreeBsdHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java index 1662a05ff4..6d0cf494fc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdNetworkIF.java @@ -33,15 +33,15 @@ import org.aoju.bus.health.builtin.hardware.NetworkIF; import java.net.NetworkInterface; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; /** * FreeBsdNetworks class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -70,8 +70,11 @@ public FreeBsdNetworkIF(NetworkInterface netint) { * the interfaces */ public static List getNetworks(boolean includeLocalInterfaces) { - return Collections.unmodifiableList(getNetworkInterfaces(includeLocalInterfaces).stream() - .map(FreeBsdNetworkIF::new).collect(Collectors.toList())); + List ifList = new ArrayList<>(); + for (NetworkInterface ni : getNetworkInterfaces(includeLocalInterfaces)) { + ifList.add(new FreeBsdNetworkIF(ni)); + } + return Collections.unmodifiableList(ifList); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java index 088b56edf8..19ed351770 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdPowerSource.java @@ -41,7 +41,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java index 44702fc71f..8fcb37880c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSensors.java @@ -36,7 +36,7 @@ * Sensors from coretemp * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java index f3e4eed136..9670e6e386 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdSoundCard.java @@ -39,7 +39,7 @@ * FreeBSD soundcard. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java index d5b34ba85c..37c40ed92b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdUsbDevice.java @@ -38,7 +38,7 @@ * FreeBsd Usb Device * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java index 80c35161c5..bb44edf9d5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/hardware/FreeBsdVirtualMemory.java @@ -39,7 +39,7 @@ * Memory obtained by swapinfo * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java index e18a02994c..156af9f71c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdFileSystem.java @@ -46,7 +46,7 @@ * the /proc/mount filesystem, excluding temporary and kernel mounts. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java index a550ec3c76..2b79dc9f9e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdInternetProtocolStats.java @@ -37,6 +37,11 @@ import java.util.function.Supplier; +/** + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ + */ @ThreadSafe public class FreeBsdInternetProtocolStats implements InternetProtocolStats { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java index ac8bc4634a..7dc6652ee1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdNetworkParams.java @@ -40,7 +40,7 @@ * FreeBsdNetworkParams class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java index 1b23a6af1f..eda3aa6df7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSFileStore.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java index 210db70541..ff43621233 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSProcess.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java index 9895be0b5c..a45986718e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOSThread.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FreeBsdOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java index 0ee92eb45e..97f75c0b8b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/freebsd/software/FreeBsdOperatingSystem.java @@ -46,6 +46,10 @@ * The first version of FreeBSD was released in 1993. In 2005, FreeBSD was the * most popular open-source BSD operating system, accounting for more than * three-quarters of all installed simply, permissively licensed BSD systems. + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @ThreadSafe public class FreeBsdOperatingSystem extends AbstractOperatingSystem { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java index 1f47ed6a7d..04ed0626cb 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/KstatKit.java @@ -44,7 +44,7 @@ * Provides access to kstat information on Solaris * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java index f56db47ff8..9998a57eae 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/SolarisLibc.java @@ -36,7 +36,7 @@ * 它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SolarisLibc extends CLibrary { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java index dd812dd77b..8255f3e3f1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Iostat.java @@ -42,7 +42,7 @@ * Utility to query iostat * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java index 6e1cd34ebd..301030f8f4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Lshal.java @@ -38,7 +38,7 @@ * Utility to query lshal * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java index 9ccc27ca70..f2492759bf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Prtvtoc.java @@ -40,7 +40,7 @@ * Utility to query iostat * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java index 4271a6a4aa..9bc27bd82b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/SystemPages.java @@ -33,6 +33,10 @@ /** * Utility to query geom part list + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @ThreadSafe public final class SystemPages { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java index f8b8d05dbd..5dcb068a6e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/drivers/Who.java @@ -38,6 +38,10 @@ /** * Utility to query logged in users. + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @ThreadSafe public final class Who { diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java index 33e02dd88a..71b63134b8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisBaseboard.java @@ -32,7 +32,7 @@ * Baseboard data obtained by smbios * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java index 060ef13009..f3d7ba6b88 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisCentralProcessor.java @@ -44,7 +44,7 @@ * A CPU * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java index 9f9345b037..78f1539eb0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisComputerSystem.java @@ -41,7 +41,7 @@ * Hardware data obtained from smbios. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java index 6c6d240a66..991853aacc 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisDisplay.java @@ -39,7 +39,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java index 6a4ae08ce2..9c37a209f8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisFirmware.java @@ -32,7 +32,7 @@ * Firmware data. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java index 01e4fa0170..2ec7787438 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGlobalMemory.java @@ -40,7 +40,7 @@ * Memory obtained by kstat * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java index 0ee5871edf..981b5e1d0e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisGraphicsCard.java @@ -42,7 +42,7 @@ * Graphics Card info obtained from prtconf * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java index ea27edf030..d3656c422b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHWDiskStore.java @@ -48,7 +48,7 @@ * Solaris hard disk implementation. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java index 15586a9b2e..f0916d5712 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisHardwareAbstractionLayer.java @@ -34,7 +34,7 @@ * SolarisHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java index 806133b039..1319542c58 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisNetworkIF.java @@ -33,15 +33,15 @@ import org.aoju.bus.health.unix.solaris.KstatKit.KstatChain; import java.net.NetworkInterface; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; /** * SolarisNetworks class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -71,8 +71,11 @@ public SolarisNetworkIF(NetworkInterface netint) { * the interfaces */ public static List getNetworks(boolean includeLocalInterfaces) { - return Collections.unmodifiableList(getNetworkInterfaces(includeLocalInterfaces).stream() - .map(SolarisNetworkIF::new).collect(Collectors.toList())); + List ifList = new ArrayList<>(); + for (NetworkInterface ni : getNetworkInterfaces(includeLocalInterfaces)) { + ifList.add(new SolarisNetworkIF(ni)); + } + return Collections.unmodifiableList(ifList); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java index 0f213a74da..bacac33ccd 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisPowerSource.java @@ -41,7 +41,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java index da9c78aeaa..feb955aa91 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSensors.java @@ -38,7 +38,7 @@ * Sensors from prtpicl * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java index a506737447..35e2a83f40 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisSoundCard.java @@ -39,7 +39,7 @@ * Solaris Sound Card. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java index d258d32b0b..1e07574353 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisUsbDevice.java @@ -39,7 +39,7 @@ * Solaris Usb Device * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java index a25a4d2d0e..b2c72fc303 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/hardware/SolarisVirtualMemory.java @@ -41,7 +41,7 @@ * Memory obtained by kstat and swap * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java index 3f8307e8ba..bd158f6832 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisFileSystem.java @@ -47,7 +47,7 @@ * the /proc/mount filesystem, excluding temporary and kernel mounts. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java index a0d04243df..e9e3ff2cc9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisInternetProtocolStats.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java index 4cf2482284..a48bb44f47 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisNetworkParams.java @@ -36,7 +36,7 @@ * SolarisNetworkParams class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java index 44fcab3bb2..9b3e464115 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSFileStore.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java index b21d962418..751afde062 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSProcess.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -319,9 +319,8 @@ public long getAffinityMask() { @Override public List getThreadDetails() { - List threadListInfo1 = Executor - .runNative("ps -o lwp,s,etime,stime,time,addr,pri -p " + getProcessID()); - List threadListInfo2 = Executor.runNative("prstat -L -v -p " + getProcessID()); + List threadListInfo1 = Executor.runNative("ps -o lwp,s,etime,stime,time,addr,pri -p " + getProcessID()); + List threadListInfo2 = Executor.runNative("prstat -L -v -p " + getProcessID() + " 1 1"); Map threadMap = parseAndMergeThreadInfo(threadListInfo1, threadListInfo2); if (threadMap.keySet().size() > 1) { return threadMap.entrySet().stream().map(entry -> new SolarisOSThread(getProcessID(), entry.getValue())) diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java index fbfde33461..b903ad04ce 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOSThread.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SolarisOSThread extends AbstractOSThread { @@ -103,9 +103,8 @@ public int getPriority() { @Override public boolean updateAttributes() { - List threadListInfo1 = Executor - .runNative("ps -o lwp,s,etime,stime,time,addr,pri -p " + getOwningProcessId()); - List threadListInfo2 = Executor.runNative("prstat -L -v -p " + getOwningProcessId()); + List threadListInfo1 = Executor.runNative("ps -o lwp,s,etime,stime,time,addr,pri -p " + getOwningProcessId()); + List threadListInfo2 = Executor.runNative("prstat -L -v -p " + getOwningProcessId() + " 1 1"); Map threadMap = SolarisOSProcess.parseAndMergeThreadInfo(threadListInfo1, threadListInfo2); if (threadMap.keySet().size() > 1) { Optional split = threadMap.entrySet().stream() diff --git a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java index dba16333b2..5777a46a16 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/unix/solaris/software/SolarisOperatingSystem.java @@ -49,7 +49,7 @@ * after the Sun acquisition by Oracle, it was renamed Oracle Solaris. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java index 5c9483dc7d..6c66510fda 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQuery.java @@ -46,7 +46,7 @@ * 封装性能计数器查询的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java index fc756d19c8..57ecb7f537 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterQueryHandler.java @@ -38,7 +38,7 @@ * 处理性能计数器查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @NotThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java index 24da8c3fd6..453c62e7df 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfCounterWildcardQuery.java @@ -44,7 +44,7 @@ * 封装性能计数器查询的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java index 9456065d30..02a7bb29f5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PerfDataKit.java @@ -43,7 +43,7 @@ * 帮助类来集中PDH计数器设置的样板部分,并允许应用程序轻松地添加、查询和删除计数器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java b/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java index 3130cb81f8..3345302e0c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/PowrProf.java @@ -35,7 +35,7 @@ * 果/当它的代码被合并到JNA项目中时,它可能会被删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface PowrProf extends com.sun.jna.platform.win32.PowrProf { diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java index b15fa77632..3e54b7b552 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/ThreadInformation.java @@ -35,7 +35,7 @@ * Utility to query Thread Information performance counter * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java index 98a60c1b0c..1651fd8f8c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiKit.java @@ -39,7 +39,7 @@ * Helper class for WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java index 0ff655c510..1c22505eaa 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/WmiQueryHandler.java @@ -45,7 +45,7 @@ * 处理WMI查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java index 180bb61637..47d73c8a66 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyPerformance.java @@ -41,7 +41,7 @@ * Utility to read HKEY_PERFORMANCE_DATA information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java index a4f029c6aa..fb5df604db 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/HkeyUserData.java @@ -44,7 +44,7 @@ * Utility to read session data from HKEY_USERS * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java index 183f1287ad..aacea7811a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/LogicalProcessorInformation.java @@ -38,7 +38,7 @@ * Utility to query Logical Processor Information pre-Win7 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java index f5111b5be1..bf46393825 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MSAcpiThermalZoneTemperature.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code MSAcpi_ThermalZoneTemperature} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java index e553055bae..7d051d9a07 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/MemoryInformation.java @@ -35,7 +35,7 @@ * Utility to query Memory performance counter * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java index 959f3c45ef..6c654aee12 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/NetSessionData.java @@ -41,7 +41,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java index 3948efddf0..edc1ce6c00 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmHardware.java @@ -35,7 +35,7 @@ * Utility to query Open Hardware Monitor WMI data for Hardware * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java index c75efdd077..d68c76cb25 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/OhmSensor.java @@ -35,7 +35,7 @@ * Utility to query Open Hardware Monitor WMI data for Sensors * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java index 09f3be03e5..6364b2a26f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PagingFile.java @@ -35,7 +35,7 @@ * Utility to query Paging File performance counter * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java index 04bf2b3710..bde49087f5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/PhysicalDisk.java @@ -38,7 +38,7 @@ * Utility to query PhysicalDisk performance counter * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java index dd8ddf2018..52d108824e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessInformation.java @@ -38,7 +38,7 @@ * Utility to query Process Information performance counter * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java index 3938c42b8f..941c362f1e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessPerformanceData.java @@ -42,7 +42,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java index 9395610a18..f4bc61a47b 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessWtsData.java @@ -48,7 +48,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java index 2b2b801b0a..151c8be9c4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ProcessorInformation.java @@ -40,7 +40,7 @@ * Utility to query Processor performance counter * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java index 9e23576a2e..ddc12f15a6 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SessionWtsData.java @@ -50,7 +50,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java index dbee73c7ea..99246c5e9d 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/SystemInformation.java @@ -35,7 +35,7 @@ * Utility to query System performance counter * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java index b4da7b5605..d4cf721170 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/ThreadPerformanceData.java @@ -43,7 +43,7 @@ * backup from Performance Counters or WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java index c3b4d1a433..951f6e41be 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32BaseBoard.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_BaseBoard} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java index fc40a3d61e..10b3efb1cd 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Bios.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_BIOS} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java index d1cb1ea438..725b63790f 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystem.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_ComputerSystem} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java index 638617f4cd..a141353b27 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ComputerSystemProduct.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_ComputerSystemProduct} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java index 12d13fa565..d746b48ca1 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDrive.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_DiskDrive} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java index 04b0eefc66..a3b48d5a41 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskDriveToDiskPartition.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_DiskDriveToDiskPartition} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java index f01e755c42..0a548426fe 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32DiskPartition.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_DiskPartition} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java index 4d3934d611..6fcc20bb6a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Fan.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_Fan} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java index d3517d2035..ecd910742c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDisk.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_LogicalDisk} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java index a9d5979762..d5f36a8d49 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32LogicalDiskToPartition.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_LogicalDiskToPartition} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java index c8035ab6ff..071f70b7d9 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32OperatingSystem.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_OperatingSystem} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java index d035248fa2..40a7ba194c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PhysicalMemory.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_PhysicalMemory} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java index dc31ef3af0..fc7180b688 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32PnPEntity.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_PnPEntity} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java index 9071d42ae7..66a0418618 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Process.java @@ -37,7 +37,7 @@ * Utility to query WMI class {@code Win32_Process} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java index 97bde78ff8..0a8a68f603 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32ProcessCached.java @@ -42,7 +42,7 @@ * Utility to query WMI class {@code Win32_Process} using cache * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java index c3e267ca5f..665bf8484a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32Processor.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_Processor} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java index 928d5e8a70..b5af89f8e4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32USBController.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_USBController} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java index 4e01cb0f91..2d7e2e2f81 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/drivers/Win32VideoController.java @@ -34,7 +34,7 @@ * Utility to query WMI class {@code Win32_VideoController} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java index 087ca6abd5..02fa2ba32a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsBaseboard.java @@ -39,6 +39,10 @@ /** * Baseboard data obtained from WMI + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ */ @Immutable final class WindowsBaseboard extends AbstractBaseboard { diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java index 95046fd126..f44b2c1b49 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsCentralProcessor.java @@ -54,7 +54,7 @@ * individual Physical and Logical processors. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java index 49bf5fcf71..9ad9314f33 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsComputerSystem.java @@ -45,7 +45,7 @@ * Hardware data obtained from WMI. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java index 675b8fabd3..0e5c5248d8 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsDisplay.java @@ -43,7 +43,7 @@ * A Display * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java index 83c759c6ce..8bcfb9f011 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsFirmware.java @@ -41,7 +41,7 @@ * Firmware data obtained from WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java index 74ad9eaea8..f4566afe2c 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGlobalMemory.java @@ -48,7 +48,7 @@ * Memory obtained by Performance Info. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java index 72b9ce3eb7..fd27c176bf 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsGraphicsCard.java @@ -46,7 +46,7 @@ * Graphics Card obtained from WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java index 29d3378949..c1e3055d5a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHWDiskStore.java @@ -46,7 +46,7 @@ * Windows hard disk implementation. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java index 777060ffbb..9f676366b0 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsHardwareAbstractionLayer.java @@ -34,7 +34,7 @@ * WindowsHardwareAbstractionLayer class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java index bd6894f0d6..1f46cb5c51 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsNetworkIF.java @@ -36,15 +36,15 @@ import org.aoju.bus.logger.Logger; import java.net.NetworkInterface; +import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; /** * WindowsNetworks class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe @@ -80,8 +80,11 @@ public WindowsNetworkIF(NetworkInterface netint) { * the interfaces */ public static List getNetworks(boolean includeLocalInterfaces) { - return Collections.unmodifiableList(getNetworkInterfaces(includeLocalInterfaces).stream() - .map(WindowsNetworkIF::new).collect(Collectors.toList())); + List ifList = new ArrayList<>(); + for (NetworkInterface ni : getNetworkInterfaces(includeLocalInterfaces)) { + ifList.add(new WindowsNetworkIF(ni)); + } + return Collections.unmodifiableList(ifList); } @Override diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java index 5dba7e31c7..04330eacd7 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsPowerSource.java @@ -55,7 +55,7 @@ * A Power Source * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java index e5131e17d9..25cd2aa8d5 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSensors.java @@ -37,7 +37,7 @@ * Sensors from WMI or Open Hardware Monitor * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java index 5935415882..ed855cbc84 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsSoundCard.java @@ -42,7 +42,7 @@ * Sound Card data obtained from registry * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java index 7056885317..5bbd2a954a 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsUsbDevice.java @@ -49,7 +49,7 @@ * Windows Usb Device * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Immutable diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java index db4124d20d..23f506b619 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/hardware/WindowsVirtualMemory.java @@ -44,7 +44,7 @@ * Memory obtained from WMI * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java index 7ac1392cd8..13bd45bd17 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsFileSystem.java @@ -56,7 +56,7 @@ * represented by a drive letter, e.g., "A:\" and "C:\" * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java index 81a53c04ad..eed0ee9e91 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsInternetProtocolStats.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java index edc9f4d05d..c7b2ca9406 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsNetworkParams.java @@ -49,7 +49,7 @@ * WindowsNetworkParams class. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java index dbb9cf24cd..a06fb97630 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSFileStore.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java index b3ff92b960..5d917fe09e 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSProcess.java @@ -54,7 +54,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java index 9e546a1677..92e236f3b2 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSSystemInfo.java @@ -36,7 +36,7 @@ * Windows OS native system information. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WindowsOSSystemInfo { diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java index 98987861c3..84c97209a4 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOSThread.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WindowsOSThread extends AbstractOSThread { diff --git a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java index 7c22d703f4..d12c09eaab 100644 --- a/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java +++ b/bus-health/src/main/java/org/aoju/bus/health/windows/software/WindowsOperatingSystem.java @@ -60,7 +60,7 @@ * and marketed by Microsoft. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ThreadSafe diff --git a/bus-http/README.md b/bus-http/README.md index 29d8d60401..22d8444919 100644 --- a/bus-http/README.md +++ b/bus-http/README.md @@ -441,7 +441,7 @@ Websocket 方法: * `webSocket(String url)` 开始一个 WebSocket 连接 * `cancel(String tag)` 按标签取消(同步 | 异步 | WebSocket)连接 * `cancelAll()` 取消所有(同步 | 异步 | WebSocket)连接 -* `request(Request request)` OkHttp 原生 HTTP 请求 +* `request(Request request)` 原生 HTTP 请求 * `webSocket(Request request, WebSocketListener listener)` Httpv 原生 WebSocket 连接 ```java diff --git a/bus-http/pom.xml b/bus-http/pom.xml index 108ef14a97..e097f25e4f 100755 --- a/bus-http/pom.xml +++ b/bus-http/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-http - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-http/src/main/java/org/aoju/bus/http/Address.java b/bus-http/src/main/java/org/aoju/bus/http/Address.java index d5d01747b2..a4ac0ccaeb 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Address.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Address.java @@ -47,7 +47,7 @@ * 共享相同的{@code Address}的HTTP请求也可能共享相同的{@link Connection} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Address { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Builder.java b/bus-http/src/main/java/org/aoju/bus/http/Builder.java index 882c35a0e6..800e1a0686 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Builder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Builder.java @@ -59,7 +59,7 @@ * 实用方法工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Builder { @@ -115,6 +115,17 @@ public abstract class Builder { * 快速和正则模式区分IP地址从主机名,这是Android私有的InetAddress#isNumeric API的近似值 */ public static final Pattern VERIFY_AS_IP_ADDRESS = Pattern.compile("([0-9a-fA-F]*:[0-9a-fA-F:.]*)|([\\d.]+)"); + + public static final String CONNECT = "CONNECT"; + public static final String CONNECTED = "CONNECTED"; + public static final String SEND = "SEND"; + public static final String MESSAGE = "MESSAGE"; + public static final String SUBSCRIBE = "SUBSCRIBE"; + public static final String UNSUBSCRIBE = "UNSUBSCRIBE"; + public static final String ACK = "ACK"; + public static final String UNKNOWN = "UNKNOWN"; + public static final String ERROR = "ERROR"; + public static final String FORM = "form"; public static final String JSON = "json"; public static final String XML = "xml"; diff --git a/bus-http/src/main/java/org/aoju/bus/http/Callback.java b/bus-http/src/main/java/org/aoju/bus/http/Callback.java index 24f5622136..b23a4a9673 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Callback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Callback.java @@ -33,7 +33,7 @@ * 异步回调信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Callback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Cookie.java b/bus-http/src/main/java/org/aoju/bus/http/Cookie.java index 320bbf57ff..e6f698814f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Cookie.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Cookie.java @@ -38,7 +38,7 @@ * 这个类不支持cookies上的附加属性,比如Chromium的Priority=HIGH extension * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Cookie { diff --git a/bus-http/src/main/java/org/aoju/bus/http/DnsX.java b/bus-http/src/main/java/org/aoju/bus/http/DnsX.java index 6d54adf5df..fcd3fd78c3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/DnsX.java +++ b/bus-http/src/main/java/org/aoju/bus/http/DnsX.java @@ -37,7 +37,7 @@ * 选择IPv6地址、选择IPv4地址或强制使用特定的已知IP地址 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DnsX { diff --git a/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java b/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java index becb17a9b8..b04054fd12 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/GiveCall.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface GiveCall extends Cancelable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Headers.java b/bus-http/src/main/java/org/aoju/bus/http/Headers.java index 6b8b8b27bf..79a379809a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Headers.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Headers.java @@ -38,7 +38,7 @@ * 这个类从值中删除空白。它从不返回带开头或结尾空白的值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Headers { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpd.java b/bus-http/src/main/java/org/aoju/bus/http/Httpd.java index 48ab51c7bb..7129fc6639 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpd.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpd.java @@ -67,7 +67,7 @@ * Httpd还为HTTP/2连接使用守护进程线程。如果它们保持空闲,就会自动退出 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Httpd implements Cloneable, NewCall.Factory, WebSocket.Factory { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpv.java b/bus-http/src/main/java/org/aoju/bus/http/Httpv.java index a240a8bd57..920234fca7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpv.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpv.java @@ -33,8 +33,8 @@ import org.aoju.bus.http.metric.http.AsyncHttp; import org.aoju.bus.http.metric.http.CoverHttp; import org.aoju.bus.http.metric.http.SyncHttp; +import org.aoju.bus.http.socket.CoverWebSocket; import org.aoju.bus.http.socket.WebSocket; -import org.aoju.bus.http.socket.WebSocketCover; import org.aoju.bus.http.socket.WebSocketListener; import java.io.IOException; @@ -47,7 +47,7 @@ * Httpv 客户端接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Httpv { @@ -107,8 +107,8 @@ public SyncHttp sync(String url) { return new SyncHttp(this, urlPath(url, false)); } - public WebSocketCover webSocket(String url) { - return new WebSocketCover(this, urlPath(url, true)); + public CoverWebSocket.Client webSocket(String url) { + return new CoverWebSocket.Client(this, urlPath(url, true)); } public int cancel(String tag) { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpx.java b/bus-http/src/main/java/org/aoju/bus/http/Httpx.java index 4137b1540d..4126063e6f 100755 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpx.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpx.java @@ -54,7 +54,7 @@ * 发送HTTP请求辅助类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Httpx { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Httpz.java b/bus-http/src/main/java/org/aoju/bus/http/Httpz.java index 6949654a36..746af7e2e3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Httpz.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Httpz.java @@ -36,7 +36,7 @@ * 发送HTTP请求辅助类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Httpz { diff --git a/bus-http/src/main/java/org/aoju/bus/http/NewCall.java b/bus-http/src/main/java/org/aoju/bus/http/NewCall.java index 199ed8feec..0f9ecc0266 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/NewCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/NewCall.java @@ -35,7 +35,7 @@ * 由于此对象表示单个请求/响应对(流),因此不能执行两次. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface NewCall extends Cloneable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/OnBack.java b/bus-http/src/main/java/org/aoju/bus/http/OnBack.java index 8e536572e9..87f7ab9bea 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/OnBack.java +++ b/bus-http/src/main/java/org/aoju/bus/http/OnBack.java @@ -29,7 +29,7 @@ * 数据回调接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OnBack { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Process.java b/bus-http/src/main/java/org/aoju/bus/http/Process.java index 057970cf31..3e83a24be8 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Process.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Process.java @@ -29,7 +29,7 @@ * 进度(上传或下载) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Process { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Protocol.java b/bus-http/src/main/java/org/aoju/bus/http/Protocol.java index 0f5ef01be6..7cc52a9870 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Protocol.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Protocol.java @@ -34,7 +34,7 @@ * Httpd使用协议这个词来标识HTTP消息是如何构造的 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Protocol { diff --git a/bus-http/src/main/java/org/aoju/bus/http/RealCall.java b/bus-http/src/main/java/org/aoju/bus/http/RealCall.java index c1e58a4da0..096251ef5b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/RealCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/RealCall.java @@ -54,7 +54,7 @@ * 实际调用准备执行的请求 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RealCall implements NewCall { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Request.java b/bus-http/src/main/java/org/aoju/bus/http/Request.java index c15f852bc1..7853ea7e2e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Request.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Request.java @@ -43,7 +43,7 @@ * 一个HTTP请求。如果该类的{@link #body}为空或自身为不可变,则该类的实例是不可变的. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Request { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Response.java b/bus-http/src/main/java/org/aoju/bus/http/Response.java index fb046b18d0..44a0a4b574 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Response.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Response.java @@ -46,7 +46,7 @@ * 响应体是一次性的值,可能只使用一次,然后关闭。所有其他属性都是不可变的. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Response implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Results.java b/bus-http/src/main/java/org/aoju/bus/http/Results.java index dbc064406f..eb3ed341fa 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Results.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Results.java @@ -38,7 +38,7 @@ * 执行结果 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Results { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Route.java b/bus-http/src/main/java/org/aoju/bus/http/Route.java index 61a32c5b67..49dcf1cf2c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Route.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Route.java @@ -34,7 +34,7 @@ * 每个路由都是这些选项的特定选择 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Route { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Settings.java b/bus-http/src/main/java/org/aoju/bus/http/Settings.java index f713393e15..a1ee7dbed8 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Settings.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Settings.java @@ -35,7 +35,7 @@ * 设置的作用域是{@link Http2Connection connection} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Settings { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Stomp.java b/bus-http/src/main/java/org/aoju/bus/http/Stomp.java new file mode 100644 index 0000000000..a67b73907f --- /dev/null +++ b/bus-http/src/main/java/org/aoju/bus/http/Stomp.java @@ -0,0 +1,525 @@ +/********************************************************************************* + * * + * The MIT License (MIT) * + * * + * Copyright (c) 2015-2020 aoju.org and other contributors. * + * * + * 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. * + * * + ********************************************************************************/ +package org.aoju.bus.http; + +import org.aoju.bus.http.socket.CoverWebSocket; +import org.aoju.bus.logger.Logger; + +import java.util.*; + +/** + * Websockt 的 Stomp 客户端 + * + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ + */ +public class Stomp { + + public static final String SUPPORTED_VERSIONS = "1.1,1.2"; + public static final String AUTO_ACK = "auto"; + public static final String CLIENT_ACK = "client"; + private static final String TOPIC = "/topic"; + private static final String QUEUE = "/queue"; + private final boolean autoAck; + private final CoverWebSocket.Client cover; + private final Map subscribers; + private boolean connected; + private CoverWebSocket websocket; + private boolean legacyWhitespace = false; + private OnBack onConnected; + private OnBack onDisconnected; + private OnBack onError; + + private Stomp(CoverWebSocket.Client cover, boolean autoAck) { + this.cover = cover; + this.autoAck = autoAck; + this.subscribers = new HashMap<>(); + } + + /** + * 构建 Stomp 客户端(自动确定消息) + * + * @param task 底层的 WebSocket 连接 + * @return Stomp + */ + public static Stomp over(CoverWebSocket.Client task) { + return over(task, true); + } + + /** + * 构建 Stomp 客户端 + * + * @param task 底层的 WebSocket 连接 + * @param autoAck 是否自动确定消息 + * @return Stomp + */ + public static Stomp over(CoverWebSocket.Client task, boolean autoAck) { + return new Stomp(task, autoAck); + } + + /** + * 连接 Stomp 服务器 + * + * @return Stomp + */ + public Stomp connect() { + return connect(null); + } + + /** + * 连接 Stomp 服务器 + * + * @param headers Stomp 头信息 + * @return Stomp + */ + public Stomp connect(List
headers) { + if (connected) { + return this; + } + cover.setOnOpen((ws, res) -> { + List
cHeaders = new ArrayList<>(); + cHeaders.add(new Header(Header.VERSION, SUPPORTED_VERSIONS)); + cHeaders.add(new Header(Header.HEART_BEAT, + cover.pingSeconds() * 1000 + "," + cover.pongSeconds() * 1000)); + if (headers != null) { + cHeaders.addAll(headers); + } + send(new Message(Builder.CONNECT, cHeaders, null)); + }); + cover.setOnMessage((ws, msg) -> { + Message message = Message.from(msg.toString()); + if (message != null) { + receive(message); + } + }); + cover.setOnClosed((ws, close) -> { + if (onDisconnected != null) { + onDisconnected.on(close); + } + }); + websocket = cover.listen(); + return this; + } + + public void disconnect() { + if (websocket != null) { + websocket.close(1000, "disconnect by user"); + } + } + + /** + * 连接成功回调 + * + * @param onConnected 连接成功回调 + * @return Stomp + */ + public Stomp setOnConnected(OnBack onConnected) { + this.onConnected = onConnected; + return this; + } + + /** + * 连接断开回调 + * + * @param onDisconnected 断开连接回调 + * @return Stomp + */ + public Stomp setOnDisconnected(OnBack onDisconnected) { + this.onDisconnected = onDisconnected; + return this; + } + + /** + * 错误回调(服务器返回的错误信息) + * + * @param onError 错误回调 + * @return Stomp + */ + public Stomp setOnError(OnBack onError) { + this.onError = onError; + return this; + } + + /** + * 发送消息到指定目的地 + * + * @param destination 目的地 + * @param data 消息 + */ + public void sendTo(String destination, String data) { + send(new Message(Builder.SEND, + Collections.singletonList(new Header(Header.DESTINATION, destination)), + data)); + } + + /** + * 发送消息给服务器 + * + * @param message 消息 + */ + public void send(Message message) { + if (websocket == null) { + throw new IllegalArgumentException("You must call connect before send"); + } + websocket.send(message.compile(legacyWhitespace)); + } + + /** + * 监听主题消息 + * + * @param destination 监听地址 + * @param callback 消息回调 + * @return Stomp + */ + public Stomp topic(String destination, OnBack callback) { + return topic(destination, null, callback); + } + + /** + * 监听主题消息 + * + * @param destination 监听地址 + * @param headers 附加头信息 + * @param callback 消息回调 + * @return Stomp + */ + public Stomp topic(String destination, List
headers, OnBack callback) { + return subscribe(TOPIC + destination, headers, callback); + } + + /** + * 监听队列消息 + * + * @param destination 监听地址 + * @param callback 消息回调 + * @return Stomp + */ + public Stomp queue(String destination, OnBack callback) { + return queue(destination, null, callback); + } + + /** + * 监听队列消息 + * + * @param destination 监听地址 + * @param headers 附加头信息 + * @param callback 消息回调 + * @return Stomp + */ + public Stomp queue(String destination, List
headers, OnBack callback) { + return subscribe(QUEUE + destination, headers, callback); + } + + /** + * 订阅消息 + * + * @param destination 订阅地址 + * @param headers 附加头信息 + * @param callback 消息回调 + * @return Stomp + */ + public synchronized Stomp subscribe(String destination, List
headers, OnBack callback) { + if (subscribers.containsKey(destination)) { + Logger.error("Attempted to subscribe to already-subscribed path!"); + return this; + } + Subscriber subscriber = new Subscriber(UUID.randomUUID().toString(), + destination, callback, headers); + subscribers.put(destination, subscriber); + subscriber.subscribe(); + return this; + } + + /** + * 确认收到某条消息 + * + * @param message 服务器发过来的消息 + */ + public void ack(Message message) { + Header subscription = message.header(Header.SUBSCRIPTION); + Header msgId = message.header(Header.MESSAGE_ID); + if (subscription != null || msgId != null) { + List
headers = new ArrayList<>(); + headers.add(subscription); + headers.add(msgId); + send(new Message(Builder.ACK, headers, null)); + } else { + Logger.error("subscription and message-id not found in " + message.toString() + ", so it can not be ack!"); + } + } + + /** + * 取消主题监听 + * + * @param destination 监听地址 + */ + public void untopic(String destination) { + unsubscribe(TOPIC + destination); + } + + /** + * 取消队列监听 + * + * @param destination 监听地址 + */ + public void unqueue(String destination) { + unsubscribe(QUEUE + destination); + } + + /** + * 取消订阅 + * + * @param destination 订阅地址 + */ + public synchronized void unsubscribe(String destination) { + Subscriber subscriber = subscribers.remove(destination); + if (subscriber != null) { + subscriber.unsubscribe(); + } + } + + private void receive(Message msg) { + String command = msg.getCommand(); + if (Builder.CONNECTED.equals(command)) { + String hbHeader = msg.headerValue(Header.HEART_BEAT); + if (hbHeader != null) { + String[] heartbeats = hbHeader.split(","); + int pingSeconds = Integer.parseInt(heartbeats[1]) / 1000; + int pongSeconds = Integer.parseInt(heartbeats[0]) / 1000; + cover.heatbeat(Math.max(pingSeconds, cover.pingSeconds()), + Math.max(pongSeconds, cover.pongSeconds())); + + } + synchronized (this) { + connected = true; + for (Subscriber s : subscribers.values()) { + s.subscribe(); + } + } + if (onConnected != null) { + onConnected.on(this); + } + } else if (Builder.MESSAGE.equals(command)) { + String id = msg.headerValue(Header.SUBSCRIPTION); + String destination = msg.headerValue(Header.DESTINATION); + if (id == null || destination == null) { + return; + } + Subscriber subscriber = subscribers.get(destination); + if (subscriber != null && id.equals(subscriber.id)) { + subscriber.callback.on(msg); + } + } else if (Builder.ERROR.equals(command)) { + if (onError != null) { + onError.on(msg); + } + } + } + + public void setLegacyWhitespace(boolean legacyWhitespace) { + this.legacyWhitespace = legacyWhitespace; + } + + public static class Header { + + public static final String VERSION = "accept-version"; + public static final String HEART_BEAT = "heart-beat"; + public static final String DESTINATION = "destination"; + public static final String CONTENT_TYPE = "content-type"; + public static final String MESSAGE_ID = "message-id"; + public static final String ID = "id"; + public static final String SUBSCRIPTION = "subscription"; + public static final String ACK = "ack"; + + private final String key; + private final String value; + + public Header(String key, String value) { + this.key = key; + this.value = value; + } + + public String getKey() { + return key; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return key + ':' + value; + } + + } + + public static class Message { + + private final String command; + private final List
headers; + private final String payload; + + public Message(String command, List
headers, String payload) { + this.command = command; + this.headers = headers; + this.payload = payload; + } + + public static Message from(String data) { + if (data == null || data.trim().isEmpty()) { + return new Message(Builder.UNKNOWN, null, data); + } + + int cmdIndex = data.indexOf("\n"); + int mhIndex = data.indexOf("\n\n"); + + if (cmdIndex >= mhIndex) { + Logger.error("非法的 STOMP 消息:" + data); + return null; + } + String command = data.substring(0, cmdIndex); + String[] headers = data.substring(cmdIndex + 1, mhIndex).split("\n"); + + List
headerList = new ArrayList<>(headers.length); + for (String header : headers) { + String[] hv = header.split(":"); + if (hv.length == 2) { + headerList.add(new Header(hv[0], hv[1])); + } + } + String payload = null; + if (data.length() > mhIndex + 2) { + if (data.endsWith("\u0000\n") && data.length() > mhIndex + 4) { + payload = data.substring(mhIndex + 2, data.length() - 2); + } else if (data.endsWith("\u0000") && data.length() > mhIndex + 3) { + payload = data.substring(mhIndex + 2, data.length() - 1); + } + } + return new Message(command, headerList, payload); + } + + public List
getHeaders() { + return headers; + } + + public String getPayload() { + return payload; + } + + public String getCommand() { + return command; + } + + public String headerValue(String key) { + Header header = header(key); + if (header != null) { + return header.getValue(); + } + return null; + } + + public Header header(String key) { + if (headers != null) { + for (Header header : headers) { + if (header.getKey().equals(key)) return header; + } + } + return null; + } + + public String compile(boolean legacyWhitespace) { + StringBuilder builder = new StringBuilder(); + builder.append(command).append('\n'); + for (Header header : headers) { + builder.append(header.getKey()).append(':').append(header.getValue()).append('\n'); + } + builder.append('\n'); + if (payload != null) { + builder.append(payload); + if (legacyWhitespace) builder.append("\n\n"); + } + builder.append("\u0000"); + return builder.toString(); + } + + @Override + public String toString() { + return "Message {command='" + command + "', headers=" + headers + ", payload='" + payload + "'}"; + } + + } + + class Subscriber { + + private final String id; + private final String destination; + private final OnBack callback; + private final List
headers; + private boolean subscribed; + + Subscriber(String id, String destination, OnBack callback, List
headers) { + this.id = id; + this.destination = destination; + this.callback = callback; + this.headers = headers; + } + + void subscribe() { + if (connected && !subscribed) { + List
headers = new ArrayList<>(); + headers.add(new Header(Header.ID, id)); + headers.add(new Header(Header.DESTINATION, destination)); + boolean ackNotAdded = true; + if (this.headers != null) { + for (Header header : this.headers) { + if (Header.ACK.equals(header.getKey())) { + ackNotAdded = false; + } + String key = header.getKey(); + if (!Header.ID.equals(key) && !Header.DESTINATION.equals(key)) { + headers.add(header); + } + } + } + if (ackNotAdded) { + headers.add(new Header(Header.ACK, autoAck ? AUTO_ACK : CLIENT_ACK)); + } + send(new Message(Builder.SUBSCRIBE, headers, null)); + subscribed = true; + } + } + + void unsubscribe() { + List
headers = Collections.singletonList(new Header(Header.ID, id)); + send(new Message(Builder.UNSUBSCRIBE, headers, null)); + subscribed = false; + } + + } + +} diff --git a/bus-http/src/main/java/org/aoju/bus/http/Toable.java b/bus-http/src/main/java/org/aoju/bus/http/Toable.java index a66c763ebc..75680069cc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Toable.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Toable.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Toable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java b/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java index 9a775edf46..d648db22f7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java +++ b/bus-http/src/main/java/org/aoju/bus/http/UnoUrl.java @@ -44,7 +44,7 @@ * 或者{@link #parse parse()}如果输入是无效的URL,则返回null。您甚至可以明确每个组件是否已经编码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class UnoUrl { diff --git a/bus-http/src/main/java/org/aoju/bus/http/Wapper.java b/bus-http/src/main/java/org/aoju/bus/http/Wapper.java index 31f1425345..267b8b502b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/Wapper.java +++ b/bus-http/src/main/java/org/aoju/bus/http/Wapper.java @@ -33,7 +33,7 @@ * 可以是 xml、yml、protobuf 等任何一种格式的数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Wapper { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java index ebe710c2a0..1a2b725fd6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectInterceptor.java @@ -39,7 +39,7 @@ * 打开到目标服务器的连接并继续到下一个拦截器. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ConnectInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java b/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java index 23a45e386d..99ece68b1b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/Connection.java @@ -55,7 +55,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Connection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java index 183dc7ab9f..ce23b520a2 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionPool.java @@ -45,7 +45,7 @@ * 该类实现了哪些连接保持开放以供将来使用的策略 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ConnectionPool { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java index e30426b347..57bfce39be 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSelector.java @@ -41,7 +41,7 @@ * 可能会使用不同的协议重试连接。实例是有状态的,应该创建并用于单个连接尝试 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ConnectionSelector { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java index 0a88ebad2a..5a4cadbb10 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ConnectionSuite.java @@ -41,7 +41,7 @@ * 将所有特性选择延迟到底层SSL套接字 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ConnectionSuite { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java b/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java index 6d0d4fb9d1..6775c99d6f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/ProcessStream.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProcessStream extends InputStream { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java index 298fc0b237..e6a868eac6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RealConnection.java @@ -62,7 +62,7 @@ * 连接提供 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RealConnection extends Http2Connection.Listener implements Connection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java index a09d4c4a54..dc8f23fd80 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteDatabase.java @@ -36,7 +36,7 @@ * 则会记住该故障并首选备用路由 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RouteDatabase { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java index ea02f4e27a..f042685a32 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteException.java @@ -35,7 +35,7 @@ * 可能已经用替代协议进行了多次尝试,但没有一次成功 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RouteException extends HttpUncheckException { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java index 88654c9c1b..a9dfc1bb4a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/RouteSelector.java @@ -41,7 +41,7 @@ * 服务器、IP地址和TLS模式。连接也可以循环使用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RouteSelector { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java b/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java index 99cc82b35e..dfe1f66ddc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/StreamAllocation.java @@ -47,7 +47,7 @@ * 仍然在进行中,那么取消可能会中断整个连接 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class StreamAllocation { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java index 8ce1707467..1413eda105 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/AndroidPlatform.java @@ -54,7 +54,7 @@ * 安卓2.3或更高. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AndroidPlatform extends Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java index ceab1fa7c0..c5b1c0f94d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Jdk9Platform.java @@ -41,7 +41,7 @@ * OpenJDK 9+. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Jdk9Platform extends Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java index d5ec77300f..551526d621 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/JdkWithJettyBootPlatform.java @@ -41,7 +41,7 @@ * OpenJDK 7 or OpenJDK 8 with {@code org.mortbay.jetty.alpn/alpn-boot} 在引导类路径中. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkWithJettyBootPlatform extends Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java index 09be4f4d7a..9515a2c80d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/OptionalMethod.java @@ -34,7 +34,7 @@ * * @param 方法所在的对象类型,通常是接口或基类 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OptionalMethod { diff --git a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java index 8878c752e0..641fc0ba0c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java +++ b/bus-http/src/main/java/org/aoju/bus/http/accord/platform/Platform.java @@ -61,7 +61,7 @@ * 支持Android 6.0+ {@code NetworkSecurityPolicy} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Platform { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java index ace61f97a5..ca5ff41cb3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/AbstractBody.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractBody implements Toable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java index 72e6f99a74..e76d265a7c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/BufferedBody.java @@ -36,7 +36,7 @@ * 只有完成之后,字节才会被复制到网络中 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class BufferedBody extends OutputStreamBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java index c1d7184402..59c2d9ae00 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/FormBody.java @@ -39,7 +39,7 @@ * Form请求体内容 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class FormBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java index 71ebdecda9..01b65af37d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/MultipartBody.java @@ -43,7 +43,7 @@ * 用于复合对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class MultipartBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java index 9e7b07e8e4..e0c5f19c55 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/OutputStreamBody.java @@ -42,7 +42,7 @@ * 正文的字节才会被知道 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class OutputStreamBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java index 53ed487a77..d8a4fa8dbc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/ProcessRequestBody.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProcessRequestBody extends RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java index 054ef71cf6..da8c0b2ba5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/RealResponseBody.java @@ -32,7 +32,7 @@ * 响应体只能使用一次 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RealResponseBody extends ResponseBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java index ff7145f5be..8ca92f367c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/RequestBody.java @@ -40,7 +40,7 @@ * 内容对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class RequestBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java index 3ede9a9b1c..bd4dcc3191 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResponseBody.java @@ -61,7 +61,7 @@ * 或{@link #charStream()}来处理响应 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class ResponseBody implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java index 0191fb1c46..6e3e40f558 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/ResultBody.java @@ -47,12 +47,12 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ResultBody extends AbstractBody implements Body { - private Response response; + private final Response response; private boolean onIO = false; private OnBack onProcess; private long stepBytes = 0; @@ -264,8 +264,10 @@ public Body close() { } private byte[] cacheBytes() { - if (data == null) { - data = bodyToBytes(); + synchronized (response) { + if (data == null) { + data = bodyToBytes(); + } } return data; } diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java index 92befd1958..b46c6495e9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/StreamedBody.java @@ -37,7 +37,7 @@ * 因为数据不是缓冲的,所以只能传输一次 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class StreamedBody extends OutputStreamBody implements UnrepeatableBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java b/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java index 9b9de5b0b7..5d9f35a573 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java +++ b/bus-http/src/main/java/org/aoju/bus/http/bodys/UnrepeatableBody.java @@ -29,7 +29,7 @@ * 不可重复的请求体 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UnrepeatableBody { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java index 39be32066a..f839d780f8 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/Cache.java @@ -56,7 +56,7 @@ * 缓存HTTP和HTTPS对文件系统的响应,以便可以重用它们,从而节省时间和带宽. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Cache implements Closeable, Flushable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java index 027b36b847..fecc04398c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheAdapter.java @@ -43,7 +43,7 @@ * 适配 {@link ResponseCache} 到 {@link InternalCache}. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CacheAdapter implements InternalCache { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java index 6baf55ba13..1b791fe64b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheContainer.java @@ -29,7 +29,7 @@ * 允许Httpd检测(@link java.net.ResponseCache)的接口(@link Cache) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CacheContainer { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java index 1914fca6db..dc1be66ee3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheControl.java @@ -38,7 +38,7 @@ * 这些指令设置了哪些响应可以存储,以及哪些请求可以由存储的响应来满足的策略 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CacheControl { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java index ca46599e38..4a350ba825 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheInterceptor.java @@ -47,7 +47,7 @@ * 服务来自缓存的请求并将响应写入缓存。 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CacheInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java index e7292199d4..25574bdfce 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheRequest.java @@ -33,7 +33,7 @@ * 缓存请求信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CacheRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java index 50d23b34e3..711ab26724 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/CacheStrategy.java @@ -42,7 +42,7 @@ * 或向缓存的响应添加警告(如果缓存的数据可能过时) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CacheStrategy { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java index f8ae9c25c3..207926c5be 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/DiskLruCache.java @@ -48,7 +48,7 @@ * 每个值必须在{@code 0}和{@code Integer之间。MAX_VALUE}字节的长度 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class DiskLruCache implements Closeable, Flushable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java index 097c177c75..8c458b5a40 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/InternalCache.java @@ -35,7 +35,7 @@ * 应用程序不应该实现这个:而是使用{@link Cache} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface InternalCache { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java b/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java index dcb8a60da9..471587b33c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/NetApiConvert.java @@ -65,7 +65,7 @@ * 在Java和Httpd表示之间进行转换的方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class NetApiConvert { diff --git a/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java b/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java index 46eaa0aab4..b5a2d982db 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java +++ b/bus-http/src/main/java/org/aoju/bus/http/cache/ResponseCache.java @@ -41,7 +41,7 @@ * 统计信息的{@link java.net.ResponseCache} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ResponseCache extends java.net.ResponseCache { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java b/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java index caad812e1e..54e0f1939b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/AbsCallback.java @@ -31,7 +31,7 @@ * 回调处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbsCallback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java b/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java index 45b278c5e8..f81df2f68f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/FileCallback.java @@ -35,7 +35,7 @@ * 文件-异步回调 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class FileCallback extends AbsCallback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java index 49a9d26294..b76a73c45a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/FileInterceptor.java @@ -41,7 +41,7 @@ * 请求参数-文件处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class FileInterceptor implements Interceptor, ProgressListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java index 19ce6f96e1..7cef525d90 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/GetBuilder.java @@ -34,7 +34,7 @@ * GET参数构造器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GetBuilder extends RequestBuilder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java index 537448efbd..69764f9858 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/GetRequest.java @@ -34,7 +34,7 @@ * GET请求处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GetRequest extends HttpRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java index 74e2ecf883..581ac710b3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpBuilder.java @@ -53,7 +53,7 @@ * 请求参数构造器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HttpBuilder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java index 3eba80640c..71cc613dcb 100755 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpProxy.java @@ -34,7 +34,7 @@ * HTTP代理配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HttpProxy { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java index ccf88f7856..b24c181c2c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpRequest.java @@ -44,7 +44,7 @@ * HTTP请求处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class HttpRequest { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java index 6551f383a5..4baa563fec 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpResponse.java @@ -40,7 +40,7 @@ * HTTP响应处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HttpResponse { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java index cf798cca26..3100691386 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/HttpxStat.java @@ -37,7 +37,7 @@ * HTTP状态 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HttpxStat { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java index 11be0285f1..8cc282e412 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/PostBuilder.java @@ -39,7 +39,7 @@ * POST参数构造器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PostBuilder extends RequestBuilder { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java index 01251108c8..815633d5a0 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/PostRequest.java @@ -25,23 +25,19 @@ ********************************************************************************/ package org.aoju.bus.http.magic; -import org.aoju.bus.core.lang.Charset; import org.aoju.bus.core.lang.Header; import org.aoju.bus.core.lang.MediaType; import org.aoju.bus.core.lang.Symbol; +import org.aoju.bus.core.toolkit.FileKit; +import org.aoju.bus.core.toolkit.ObjectKit; import org.aoju.bus.http.Headers; import org.aoju.bus.http.Request; import org.aoju.bus.http.bodys.FormBody; import org.aoju.bus.http.bodys.MultipartBody; import org.aoju.bus.http.bodys.RequestBody; -import org.aoju.bus.logger.Logger; import java.io.File; import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.FileNameMap; -import java.net.URLConnection; -import java.net.URLEncoder; import java.util.List; import java.util.Map; @@ -49,7 +45,7 @@ * POST请求处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PostRequest extends HttpRequest { @@ -65,20 +61,6 @@ public PostRequest(String url, Object tag, Map params, Map { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java b/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java index 014da669f1..23e583ceb7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/PutRequest.java @@ -25,21 +25,16 @@ ********************************************************************************/ package org.aoju.bus.http.magic; -import org.aoju.bus.core.lang.Charset; import org.aoju.bus.core.lang.Header; import org.aoju.bus.core.lang.MediaType; import org.aoju.bus.core.lang.Symbol; +import org.aoju.bus.core.toolkit.FileKit; import org.aoju.bus.http.Headers; import org.aoju.bus.http.Request; import org.aoju.bus.http.bodys.FormBody; import org.aoju.bus.http.bodys.MultipartBody; import org.aoju.bus.http.bodys.RequestBody; -import org.aoju.bus.logger.Logger; -import java.io.UnsupportedEncodingException; -import java.net.FileNameMap; -import java.net.URLConnection; -import java.net.URLEncoder; import java.util.List; import java.util.Map; @@ -47,7 +42,7 @@ * PUT请求处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PutRequest extends HttpRequest { @@ -62,20 +57,6 @@ public PutRequest(String url, super(url, tag, params, headers, fileInfos, body, multipartBody, id); } - public static String getMimeType(String path) { - FileNameMap fileNameMap = URLConnection.getFileNameMap(); - String contentTypeFor = null; - try { - contentTypeFor = fileNameMap.getContentTypeFor(URLEncoder.encode(path, Charset.DEFAULT_UTF_8)); - } catch (UnsupportedEncodingException e) { - Logger.error(e.getMessage(), e); - } - if (contentTypeFor == null) { - contentTypeFor = MediaType.APPLICATION_OCTET_STREAM; - } - return contentTypeFor; - } - @Override protected RequestBody buildRequestBody() { if (multipartBody != null) { @@ -90,7 +71,7 @@ protected RequestBody buildRequestBody() { } else if (fileInfo.fileInputStream != null) { fileBody = createRequestBody(MediaType.APPLICATION_OCTET_STREAM_TYPE, fileInfo.fileInputStream); } else { - fileBody = RequestBody.create(MediaType.valueOf(getMimeType(fileInfo.fileName)), + fileBody = RequestBody.create(MediaType.valueOf(FileKit.getMimeType(fileInfo.fileName)), fileInfo.fileContent); } builder.addFormDataPart(fileInfo.partName, fileInfo.fileName, fileBody); diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java b/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java index e6fafac033..9af8aec697 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/RealResult.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RealResult implements Results { @@ -138,7 +138,7 @@ public long getContentLength() { } @Override - public Body getBody() { + public synchronized Body getBody() { if (body == null && response != null) { body = new ResultBody(coverHttp, response, taskExecutor); } diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java index 8009f7fb94..72686a7bcd 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestBuilder.java @@ -35,7 +35,7 @@ * 请求参数构造器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java index d9b59e156b..e1316e7913 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/RequestCall.java @@ -35,7 +35,7 @@ * 请求调用者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RequestCall { diff --git a/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java b/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java index d51f540023..8de9fb6185 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java +++ b/bus-http/src/main/java/org/aoju/bus/http/magic/StringCallback.java @@ -33,7 +33,7 @@ * 回调处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class StringCallback extends AbsCallback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java index 4b996010a0..28f096dea1 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Array.java @@ -31,7 +31,7 @@ * 可以是 xml、yml、protobuf 等任何一种格式的数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Array { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java b/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java index 470d548f33..5bb3b72176 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/BootstrapDns.java @@ -36,7 +36,7 @@ * 返回已知主机的硬编码结果 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class BootstrapDns implements DnsX { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java index 6f3230fa93..8ca465ceff 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Cancelable.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Cancelable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java index adeb2321f8..9e86303b36 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Config.java @@ -33,7 +33,7 @@ * 配置器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Config { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java b/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java index c8a44b6898..26477da23a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/ConvertProvider.java @@ -33,7 +33,7 @@ * ConvertProvider 提供者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ConvertProvider { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java index cbcb29c42e..60682a0870 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Convertor.java @@ -37,7 +37,7 @@ * 消息转换器接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Convertor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java b/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java index a9a915fc09..f5485e6d91 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/CookieJar.java @@ -37,7 +37,7 @@ * 尽管这可能会干扰需要cookie的基于会话的身份验证方案 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CookieJar { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java index e33f8eaa66..b891052df7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Dispatcher.java @@ -42,7 +42,7 @@ * 如果您提供自己的执行程序,它应该能够并发地运行{@linkplain #getMaxRequests 配置的最大调用数} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Dispatcher { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java b/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java index 90bac6edbe..58232ee2fa 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/DnsOverHttps.java @@ -50,7 +50,7 @@ * DNS over HTTPS实施 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DnsOverHttps implements DnsX { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java b/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java index 183aaf4da3..ac045f3592 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/DownListener.java @@ -31,7 +31,7 @@ * 下载监听接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DownListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java index fc90ab2780..f834d71f8c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Download.java @@ -36,7 +36,7 @@ * 文件下载 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Download { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java b/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java index f9827d1a4a..6377c370bd 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/EventListener.java @@ -41,7 +41,7 @@ * 也不能重入客户机。任何对文件或网络的IO写入都应该异步进行 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class EventListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java index b1f10b08aa..819110ee8d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Handshake.java @@ -44,7 +44,7 @@ * 此值对象描述完成的握手。使用{@link ConnectionSuite}设置新的握手策略 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Handshake { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java index 82fa2ba2c3..83d9f54c09 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Interceptor.java @@ -38,7 +38,7 @@ * 通常,拦截器在请求或响应上添加、删除或转换标头 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java b/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java index b3edbc3014..09dd302b89 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/NamedRunnable.java @@ -31,7 +31,7 @@ * 可运行的实现,它总是设置它的线程名. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class NamedRunnable implements Runnable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java index 0a9d1cee99..ccb2134236 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/Preprocessor.java @@ -33,7 +33,7 @@ * 在HTTP请求任务正式开始之前执行 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Preprocessor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java index 3c1f53d1ea..62141484ec 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskExecutor.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TaskExecutor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java index eb07236c0f..4a7dd0a923 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/TaskListener.java @@ -31,7 +31,7 @@ * 任务监听接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TaskListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java index c18e35eeea..09286246e7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Browser.java @@ -36,7 +36,7 @@ * 浏览器对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Browser extends UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java index 1cce6abf60..94a7156054 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Divice.java @@ -35,7 +35,7 @@ * 设备信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Divice extends UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java index adcec5707a..e2eb601921 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/Engine.java @@ -34,7 +34,7 @@ * 浏览器解析引擎 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Engine extends UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java index 5717df9f03..9c75c5af75 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/NOS.java @@ -34,7 +34,7 @@ * 网络操作系统 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NOS extends UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java index 8b30272419..ef5964aaf3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/anget/UserAgent.java @@ -34,7 +34,7 @@ * User-Agent信息对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UserAgent { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java index 98e9737a37..ad1dafa8c9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/AsyncHttp.java @@ -39,7 +39,7 @@ * 异步 Http 请求任务 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AsyncHttp extends CoverHttp { @@ -160,7 +160,7 @@ public GiveCall request(String method) { } PreGiveCall call = new PreGiveCall(); registeTagTask(call); - httpClient.preprocess(this, () -> { + httpv.preprocess(this, () -> { synchronized (call) { if (call.canceled) { removeTagTask(); @@ -180,7 +180,7 @@ public void onFailure(NewCall call, IOException error) { State state = toState(error); Results result = new RealResult(AsyncHttp.this, state, error); onCallback(httpCall, result, () -> { - TaskExecutor executor = httpClient.executor(); + TaskExecutor executor = httpv.executor(); executor.executeOnComplete(AsyncHttp.this, onComplete, state, cOnIO); if (!executor.executeOnException(AsyncHttp.this, onException, error, eOnIO) && !nothrow) { @@ -191,7 +191,7 @@ public void onFailure(NewCall call, IOException error) { @Override public void onResponse(NewCall call, Response response) { - TaskExecutor executor = httpClient.executor(); + TaskExecutor executor = httpv.executor(); Results result = new RealResult(AsyncHttp.this, response, executor); onCallback(httpCall, result, () -> { executor.executeOnComplete(AsyncHttp.this, onComplete, State.RESPONSED, cOnIO); diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java index 6373bc6888..bdf40b63df 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/BridgeInterceptor.java @@ -45,7 +45,7 @@ * 然后它继续调用网络。最后,它从网络响应构建用户响应 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class BridgeInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java index aef86e180b..2614a7f771 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CallServerInterceptor.java @@ -47,7 +47,7 @@ * 它对服务器进行网络调用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CallServerInterceptor implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java index 269fc7ae9d..789491f150 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/CoverHttp.java @@ -51,18 +51,18 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CoverHttp> implements Cancelable { private static final String PATH_PARAM_REGEX = "[A-Za-z0-9_\\-/]*\\{[A-Za-z0-9_\\-]+\\}[A-Za-z0-9_\\-/]*"; - protected Httpv httpClient; - protected boolean nothrow; - protected boolean nextOnIO = false; - protected boolean skipPreproc = false; - protected boolean skipSerialPreproc = false; + public Httpv httpv; + public boolean nothrow; + public boolean nextOnIO = false; + public boolean skipPreproc = false; + public boolean skipSerialPreproc = false; private String urlPath; private String tag; private Map headers; @@ -82,12 +82,11 @@ public abstract class CoverHttp> implements Cancelable { private Cancelable canceler; private Charset charset; - - public CoverHttp(Httpv httpClient, String url) { + public CoverHttp(Httpv httpv, String url) { this.urlPath = url; - this.httpClient = httpClient; - this.charset = httpClient.charset(); - this.bodyType = httpClient.bodyType(); + this.httpv = httpv; + this.charset = httpv.charset(); + this.bodyType = httpv.bodyType(); } /** @@ -516,7 +515,7 @@ public boolean cancel() { protected void registeTagTask(Cancelable canceler) { if (tag != null && tagTask == null) { - tagTask = httpClient.addTagTask(tag, canceler, this); + tagTask = httpv.addTagTask(tag, canceler, this); } this.canceler = canceler; } @@ -531,13 +530,13 @@ private void updateTagTask() { protected void removeTagTask() { if (tag != null) { - httpClient.removeTagTask(this); + httpv.removeTagTask(this); } } protected NewCall prepareCall(String method) { Request request = prepareRequest(method); - return httpClient.request(request); + return httpv.request(request); } protected Request prepareRequest(String method) { @@ -557,7 +556,7 @@ protected Request prepareRequest(String method) { stepBytes = Process.DEFAULT_STEP_BYTES; } reqBody = new ProcessRequestBody(reqBody, onProcess, - httpClient.executor().getExecutor(processOnIO), + httpv.executor().getExecutor(processOnIO), contentLength, stepBytes); } builder.method(method, reqBody); @@ -589,7 +588,7 @@ private void buildHeaders(Request.Builder builder) { } } - protected State toState(IOException e) { + public State toState(IOException e) { if (e instanceof SocketTimeoutException) { return State.TIMEOUT; } else if (e instanceof UnknownHostException || e instanceof ConnectException) { @@ -615,7 +614,7 @@ private RequestBody buildRequestBody() { } for (String name : files.keySet()) { FilePara file = files.get(name); - MediaType type = httpClient.mediaType(file.type); + MediaType type = httpv.mediaType(file.type); RequestBody bodyPart; if (file.file != null) { bodyPart = RequestBody.create(type, file.file); @@ -645,11 +644,11 @@ private RequestBody buildRequestBody() { private RequestBody toRequestBody(Object object) { if (object instanceof byte[] || object instanceof String) { - String mediaType = httpClient.executor().doMsgConvert(bodyType, null).mediaType; + String mediaType = httpv.executor().doMsgConvert(bodyType, null).mediaType; byte[] body = object instanceof byte[] ? (byte[]) object : ((String) object).getBytes(charset); return RequestBody.create(MediaType.valueOf(mediaType + "; charset=" + charset.name()), body); } - TaskExecutor.Data data = httpClient.executor() + TaskExecutor.Data data = httpv.executor() .doMsgConvert(bodyType, (Convertor c) -> c.serialize(object, dateFormat, charset)); return RequestBody.create(MediaType.valueOf(data.mediaType + "; charset=" + charset.name()), data.data); } @@ -727,7 +726,7 @@ protected void assertNotConflict(boolean bodyCantUsed) { */ protected boolean timeoutAwait(CountDownLatch latch) { try { - return latch.await(httpClient.preprocTimeoutMillis(), + return latch.await(httpv.preprocTimeoutMillis(), TimeUnit.MILLISECONDS); } catch (InterruptedException e) { throw new InstrumentException("TimeOut " + State.TIMEOUT); diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java index ab35c3e8ad..4f7f84e5ec 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/DelegatingConnection.java @@ -46,7 +46,7 @@ * 实现HTTPS连接的方法是,除了特定于HTTP的内容外,所有内容都委托给HTTP连接 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class DelegatingConnection extends HttpsURLConnection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java index f9bc1f7f47..35191ce81c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/ErrorCode.java @@ -29,7 +29,7 @@ * 错误码信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum ErrorCode { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java index bbc32dd72b..cf71fa13b6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Hpack.java @@ -46,7 +46,7 @@ * 动态条目被添加到数组中,从最后一个位置开始向前移动。当数组填满时,它被加倍. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ final class Hpack { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java index 34ba7b145e..f34b9533ab 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http1Codec.java @@ -48,7 +48,7 @@ * 并可以跳过读取和关闭该源 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Http1Codec implements HttpCodec { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java index bd6d4f1055..b7dad24e05 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Http2 { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java index e5db531e26..3b8cb9e8bd 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Codec.java @@ -46,7 +46,7 @@ * 使用HTTP/2帧对请求和响应进行编码. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Http2Codec implements HttpCodec { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java index f63e141e6d..3ee28a0a2a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Connection.java @@ -53,7 +53,7 @@ * 到远程对等点的套接字连接。连接主机可以发送和接收数据流. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Http2Connection implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java index 5012148d2e..f2b4e6fe6e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Reader.java @@ -41,7 +41,7 @@ * 因此,我们希望所有帧的最大长度为{@link Http2#INITIAL_MAX_FRAME_SIZE}。 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Http2Reader implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java index bedc8900f0..57361684fc 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Stream.java @@ -42,7 +42,7 @@ * 逻辑双向流. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Http2Stream { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java index bbb6af2a2a..e1c8c7f33c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Http2Writer.java @@ -40,7 +40,7 @@ * 编写HTTP/2传输帧. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ final class Http2Writer implements Closeable { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java index 657e65e7cd..874ad2bb2e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpCodec.java @@ -36,7 +36,7 @@ * Encode HTTP请求和decode HTTP响应 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface HttpCodec { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java index 1fe9bb7254..1a3bbb09a2 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpHeaders.java @@ -42,7 +42,7 @@ * Header实用工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class HttpHeaders { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java index 4bdab2bcd6..f17be7e96c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpMethod.java @@ -31,7 +31,7 @@ * Http请求方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class HttpMethod { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java index f7bfee47b8..075e28d96f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpURLConnection.java @@ -49,7 +49,7 @@ * 此实现使用{@linkplain NewCall}发送请求和接收响应 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class HttpURLConnection extends java.net.HttpURLConnection implements Callback { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java index a6b8bfe23b..59610e2aa4 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/HttpsURLConnection.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class HttpsURLConnection extends DelegatingConnection { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java index e8034a864a..fb8497564d 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/Huffman.java @@ -56,7 +56,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Huffman { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java index c922eedfba..9b0c4f9e2f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/NetCookieJar.java @@ -45,7 +45,7 @@ * 委托cookie 给{@link java.net.CookieHandler} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class NetCookieJar implements CookieJar { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java index 202e492149..fb315f3f3e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/PushObserver.java @@ -38,7 +38,7 @@ * 注意,这并不保证将来的帧不会到达流ID * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface PushObserver { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java index 08f8edc473..d5e392a7a3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RealInterceptorChain.java @@ -44,7 +44,7 @@ * 所有应用程序拦截器、Httpd核心、所有网络拦截器,最后是网络调用者. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RealInterceptorChain implements Interceptor.Chain { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java index 56622df944..5dfb1192fb 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RequestLine.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RequestLine { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java index ac98cd13ce..2bab629fd6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/RetryAndFollowUp.java @@ -55,7 +55,7 @@ * 如果调用被取消,它可能会抛出{@link IOException} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RetryAndFollowUp implements Interceptor { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java index 79d6880ecb..4a0eb8be33 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StatusLine.java @@ -37,7 +37,7 @@ * HTTP响应“HTTP/ 1.1200 OK”这样的在线状态. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class StatusLine { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java index 6ebbba9cfd..04212f451c 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/StreamException.java @@ -31,7 +31,7 @@ * 当取消HTTP/2流而不损坏承载它的套接字时抛出 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class StreamException extends RevisedException { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java b/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java index 0090644717..f37e351344 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/http/SyncHttp.java @@ -41,7 +41,7 @@ * 同步 Http 请求任务 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SyncHttp extends CoverHttp { @@ -114,12 +114,12 @@ public Results request(String method) { if (method == null || method.isEmpty()) { throw new IllegalArgumentException("Request method method cannot be empty!"); } - RealResult result = new RealResult(this, httpClient.executor()); + RealResult result = new RealResult(this, httpv.executor()); SyncHttpCall httpCall = new SyncHttpCall(); // 注册标签任务 registeTagTask(httpCall); CountDownLatch latch = new CountDownLatch(1); - httpClient.preprocess(this, () -> { + httpv.preprocess(this, () -> { synchronized (httpCall) { if (httpCall.canceled) { result.exception(State.CANCELED, null); diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java b/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java index 7e960845fb..dfdbf127c7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/proxy/NullProxySelector.java @@ -37,7 +37,7 @@ * 代理选择器,总是返回{@link Proxy#NO_PROXY} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NullProxySelector extends ProxySelector { diff --git a/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java b/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java index 0a3e605e5a..4f341112f5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java +++ b/bus-http/src/main/java/org/aoju/bus/http/metric/suffix/SuffixDatabase.java @@ -45,7 +45,7 @@ * publicsuffix.org. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class SuffixDatabase { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java b/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java index 5eda4c9d01..a30c1d240f 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/Authenticator.java @@ -38,7 +38,7 @@ * 应用程序可以为源服务器或代理服务器配置Httpd的身份验证器,或者两者都配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Authenticator { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java index 8ea9e7f989..33349c6250 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicCertificateChainCleaner.java @@ -37,7 +37,7 @@ * 存在的其他机制,比如{@code AndroidCertificateChainCleaner} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class BasicCertificateChainCleaner extends CertificateChainCleaner { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java index 0e36dc50c0..177ceabfb3 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/BasicTrustRootIndex.java @@ -37,7 +37,7 @@ * 一个简单的索引,包含已加载到内存中的受信任根证书 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class BasicTrustRootIndex implements TrustRootIndex { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java index b2eb357a92..4b7b6ac946 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificateChainCleaner.java @@ -41,7 +41,7 @@ * 并提取受信任的CA证书,以便进行证书固定 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CertificateChainCleaner { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java index 1314f73f92..022c85e8a1 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/CertificatePinner.java @@ -46,7 +46,7 @@ * 则{@link CertificatePinner}不能用于pin自签名证书 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CertificatePinner { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java b/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java index caeb5330e6..e2c6021c0a 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/Challenge.java @@ -37,7 +37,7 @@ * RFC 7235兼容的认证 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Challenge { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java b/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java index 7fec20cb6a..26c4ed491e 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/CipherSuite.java @@ -34,7 +34,7 @@ * 或Java(通过JDK 9)上不可用的密码套件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class CipherSuite { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java b/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java index 87384dfa17..7015092eca 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/Credentials.java @@ -33,7 +33,7 @@ * HTTP授权工厂 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Credentials { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java b/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java index e2ca9a0bec..0c27abf8bf 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/DistinguishedNameParser.java @@ -35,7 +35,7 @@ * 它不支持十六进制字符串样式的值. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class DistinguishedNameParser { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java b/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java index 3c694b32bd..cbcea605cf 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/HostnameVerifier.java @@ -39,7 +39,7 @@ * 一个与RFC 2818一致的HostnameVerifier * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class HostnameVerifier implements javax.net.ssl.HostnameVerifier { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java b/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java index 3c3fdb8318..31a03846b5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/NetAuthenticator.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class NetAuthenticator implements Authenticator { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java b/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java index b42be36454..1eac9200f5 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/SSLSocketFactory.java @@ -35,7 +35,7 @@ * Https SSL证书 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SSLSocketFactory { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java b/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java index 6c9337d239..6f183725e6 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/TlsVersion.java @@ -34,7 +34,7 @@ * 查看{@link javax.net.ssl.SSLSocket # setEnabledProtocols} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum TlsVersion { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java b/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java index 650cd319cc..d829c5be72 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/TrustRootIndex.java @@ -31,7 +31,7 @@ * 签名证书索引 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TrustRootIndex { diff --git a/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java b/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java index e3468c60a5..80a0c01cd9 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java +++ b/bus-http/src/main/java/org/aoju/bus/http/secure/X509TrustManager.java @@ -38,7 +38,7 @@ * 证书管理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class X509TrustManager implements javax.net.ssl.X509TrustManager { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/CoverWebSocket.java b/bus-http/src/main/java/org/aoju/bus/http/socket/CoverWebSocket.java new file mode 100644 index 0000000000..0342f56adf --- /dev/null +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/CoverWebSocket.java @@ -0,0 +1,511 @@ +package org.aoju.bus.http.socket; + +import org.aoju.bus.core.io.ByteString; +import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.http.*; +import org.aoju.bus.http.bodys.AbstractBody; +import org.aoju.bus.http.magic.RealResult; +import org.aoju.bus.http.metric.Cancelable; +import org.aoju.bus.http.metric.Convertor; +import org.aoju.bus.http.metric.TaskExecutor; +import org.aoju.bus.http.metric.TaskListener; +import org.aoju.bus.http.metric.http.CoverHttp; + +import java.io.*; +import java.nio.ByteBuffer; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +public class CoverWebSocket implements Cancelable { + + private final List queues = new ArrayList<>(); + private final TaskExecutor taskExecutor; + private boolean cancelOrClosed; + private WebSocket webSocket; + private Charset charset; + + private String msgType; + + public CoverWebSocket(TaskExecutor taskExecutor, String msgType) { + this.taskExecutor = taskExecutor; + this.msgType = msgType; + } + + public void setCharset(Charset charset) { + this.charset = charset; + } + + @Override + public synchronized boolean cancel() { + if (webSocket != null) { + webSocket.cancel(); + } + cancelOrClosed = true; + return true; + } + + public synchronized boolean close(int code, String reason) { + if (webSocket != null) { + webSocket.close(code, reason); + } + cancelOrClosed = true; + return true; + } + + public void msgType(String type) { + if (type == null || type.equalsIgnoreCase(Builder.FORM)) { + throw new IllegalArgumentException("msgType 不可为空 或 form"); + } + this.msgType = type; + } + + public long queueSize() { + if (webSocket != null) { + return webSocket.queueSize(); + } + return queues.size(); + } + + public boolean send(Object msg) { + if (msg == null) { + return false; + } + synchronized (queues) { + if (webSocket != null) { + return send(webSocket, msg); + } else { + queues.add(msg); + } + } + return true; + } + + void setWebSocket(WebSocket webSocket) { + synchronized (queues) { + for (Object msg : queues) { + send(webSocket, msg); + } + this.webSocket = webSocket; + queues.clear(); + } + } + + boolean send(WebSocket webSocket, Object msg) { + if (msg == null) { + return false; + } + if (msg instanceof String) { + return webSocket.send((String) msg); + } + if (msg instanceof ByteString) { + return webSocket.send((ByteString) msg); + } + if (msg instanceof byte[]) { + return webSocket.send(ByteString.of((byte[]) msg)); + } + byte[] bytes = taskExecutor.doMsgConvert(msgType, (Convertor c) -> c.serialize(msg, charset)).data; + return webSocket.send(new String(bytes, charset)); + } + + public interface Register { + + void on(CoverWebSocket ws, T data); + + } + + public static class Close { + + public static int CANCELED = 0; + public static int EXCEPTION = -1; + public static int NETWORK_ERROR = -2; + public static int TIMEOUT = -3; + + private final int code; + private final String reason; + + public Close(int code, String reason) { + this.code = code; + this.reason = reason; + } + + /** + * @return 关闭状态码 + */ + public int getCode() { + return code; + } + + /** + * @return 关闭原因 + */ + public String getReason() { + return reason; + } + + /** + * @return 是否因 WebSocket 连接被取消而关闭 + */ + public boolean isCanceled() { + return code == CANCELED; + } + + /** + * @return 是否因 WebSocket 连接发生异常而关闭 + */ + public boolean isException() { + return code == EXCEPTION; + } + + /** + * @return 是否因 网络错误 而关闭 + */ + public boolean isNetworkError() { + return code == NETWORK_ERROR; + } + + /** + * @return 是否因 网络超时 而关闭 + */ + public boolean isTimeout() { + return code == TIMEOUT; + } + + @Override + public String toString() { + return "Close [code=" + code + ", reason=" + reason + "]"; + } + } + + public static class Listener extends WebSocketListener { + + private final Client client; + CoverWebSocket webSocket; + + Charset charset; + + public Listener(Client client, CoverWebSocket webSocket) { + this.client = client; + this.webSocket = webSocket; + } + + @Override + public void onOpen(WebSocket webSocket, Response response) { + this.charset = client.charset(response); + this.webSocket.setCharset(charset); + this.webSocket.setWebSocket(webSocket); + TaskListener listener = client.httpv.executor().getResponseListener(); + Results result = new RealResult(client, response, client.httpv.executor()); + if (listener != null) { + if (listener.listen(client, result) && client.onOpen != null) { + client.execute(() -> client.onOpen.on(this.webSocket, result), client.openOnIO); + } + } else if (client.onOpen != null) { + client.execute(() -> client.onOpen.on(this.webSocket, result), client.openOnIO); + } + } + + @Override + public void onMessage(WebSocket webSocket, String text) { + if (client.onMessage != null) { + client.execute(() -> client.onMessage.on(this.webSocket, new Message(text, client.httpv.executor(), charset)), client.messageOnIO); + } + } + + @Override + public void onMessage(WebSocket webSocket, ByteString bytes) { + if (client.onMessage != null) { + client.execute(() -> client.onMessage.on(this.webSocket, new Message(bytes, client.httpv.executor(), charset)), client.messageOnIO); + } + } + + @Override + public void onClosing(WebSocket webSocket, int code, String reason) { + if (client.onClosing != null) { + client.execute(() -> client.onClosing.on(this.webSocket, new Close(code, reason)), client.closingOnIO); + } + } + + @Override + public void onClosed(WebSocket webSocket, int code, String reason) { + doOnClose(Results.State.RESPONSED, code, reason); + } + + private void doOnClose(Results.State state, int code, String reason) { + TaskListener listener = client.httpv.executor().getCompleteListener(); + if (listener != null) { + if (listener.listen(client, state) && client.onClosed != null) { + client.execute(() -> client.onClosed.on(this.webSocket, toClose(state, code, reason)), client.closedOnIO); + } + } else if (client.onClosed != null) { + client.execute(() -> client.onClosed.on(this.webSocket, toClose(state, code, reason)), client.closedOnIO); + } + } + + private Close toClose(Results.State state, int code, String reason) { + if (state == Results.State.CANCELED) { + return new Close(Close.CANCELED, "Canceled"); + } + if (state == Results.State.EXCEPTION) { + return new Close(Close.CANCELED, reason); + } + if (state == Results.State.NETWORK_ERROR) { + return new Close(Close.NETWORK_ERROR, reason); + } + if (state == Results.State.TIMEOUT) { + return new Close(Close.TIMEOUT, reason); + } + return new Close(code, reason); + } + + @Override + public void onFailure(WebSocket webSocket, Throwable t, Response response) { + IOException e = t instanceof IOException ? (IOException) t : new IOException(t.getMessage(), t); + doOnClose(client.toState(e), 0, t.getMessage()); + TaskListener listener = client.httpv.executor().getExceptionListener(); + if (listener != null) { + if (listener.listen(client, e) && client.onException != null) { + client.execute(() -> client.onException.on(this.webSocket, t), client.exceptionOnIO); + } + } else if (client.onException != null) { + client.execute(() -> client.onException.on(this.webSocket, t), client.exceptionOnIO); + } else if (!client.nothrow) { + throw new InstrumentException("WebSocket exception", t); + } + } + + } + + /** + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ + */ + public static class Client extends CoverHttp { + + private Register onOpen; + private Register onException; + private Register onMessage; + private Register onClosing; + private Register onClosed; + + private boolean openOnIO; + private boolean exceptionOnIO; + private boolean messageOnIO; + private boolean closingOnIO; + private boolean closedOnIO; + + private int pingSeconds = -1; + private int pongSeconds = -1; + + public Client(Httpv httpClient, String url) { + super(httpClient, url); + } + + /** + * 设置心跳间隔 + * 覆盖原有的心跳模式,主要区别如下: + *

+ * 1、客户端发送的任何消息都具有一次心跳作用 + * 2、服务器发送的任何消息都具有一次心跳作用 + * 3、若服务器超过 3 * pongSeconds 秒没有回复心跳,才判断心跳超时 + * 4、可指定心跳的具体内容(默认为空) + * + * @param pingSeconds 客户端心跳间隔秒数(0 表示不需要心跳) + * @param pongSeconds 服务器心跳间隔秒数(0 表示不需要心跳) + * @return this + */ + public Client heatbeat(int pingSeconds, int pongSeconds) { + if (pingSeconds < 0 || pongSeconds < 0) { + throw new IllegalArgumentException("pingSeconds and pongSeconds must greater equal than 0!"); + } + this.pingSeconds = pingSeconds; + this.pongSeconds = pongSeconds; + return this; + } + + /** + * 启动 WebSocket 监听 + * + * @return WebSocket + */ + public CoverWebSocket listen() { + String bodyType = getBodyType(); + String msgType = Builder.FORM.equalsIgnoreCase(bodyType) ? Builder.JSON : bodyType; + CoverWebSocket socket = new CoverWebSocket(httpv.executor(), msgType); + registeTagTask(socket); + httpv.preprocess(this, () -> { + synchronized (socket) { + if (socket.cancelOrClosed) { + removeTagTask(); + } else { + Request request = prepareRequest("GET"); + httpv.webSocket(request, new Listener(this, socket)); + } + } + }, skipPreproc, skipSerialPreproc); + return socket; + } + + private void execute(Runnable command, boolean onIo) { + httpv.executor().execute(command, onIo); + } + + /** + * 连接打开监听 + * + * @param onOpen 监听器 + * @return WebSocketCover + */ + public Client setOnOpen(Register onOpen) { + this.onOpen = onOpen; + openOnIO = nextOnIO; + nextOnIO = false; + return this; + } + + /** + * 连接异常监听 + * + * @param onException 监听器 + * @return WebSocketCover + */ + public Client setOnException(Register onException) { + this.onException = onException; + exceptionOnIO = nextOnIO; + nextOnIO = false; + return this; + } + + /** + * 消息监听 + * + * @param onMessage 监听器 + * @return WebSocketCover + */ + public Client setOnMessage(Register onMessage) { + this.onMessage = onMessage; + messageOnIO = nextOnIO; + nextOnIO = false; + return this; + } + + /** + * 正在关闭监听 + * + * @param onClosing 监听器 + * @return WebSocketCover + */ + public Client setOnClosing(Register onClosing) { + this.onClosing = onClosing; + closingOnIO = nextOnIO; + nextOnIO = false; + return this; + } + + /** + * 已关闭监听(当连接被取消或发生异常时,也会走该回调) + * + * @param onClosed 监听器 + * @return WebSocketCover + */ + public Client setOnClosed(Register onClosed) { + this.onClosed = onClosed; + closedOnIO = nextOnIO; + nextOnIO = false; + return this; + } + + public int pingSeconds() { + return pingSeconds; + } + + public int pongSeconds() { + return pongSeconds; + } + + } + + /** + * @author Kimi Liu + * @version 6.1.6 + * @since JDK 1.8+ + */ + public static class Message extends AbstractBody { + + private String text; + private ByteString bytes; + + public Message(String text, TaskExecutor taskExecutor, Charset charset) { + super(taskExecutor, charset); + this.text = text; + } + + public Message(ByteString bytes, TaskExecutor taskExecutor, Charset charset) { + super(taskExecutor, charset); + this.bytes = bytes; + } + + public boolean isText() { + return text != null; + } + + @Override + public byte[] toBytes() { + if (text != null) { + return text.getBytes(org.aoju.bus.core.lang.Charset.UTF_8); + } + if (bytes != null) { + return bytes.toByteArray(); + } + return null; + } + + @Override + public String toString() { + if (text != null) { + return text; + } + if (bytes != null) { + return bytes.utf8(); + } + return null; + } + + @Override + public ByteString toByteString() { + if (text != null) { + return ByteString.encodeUtf8(text); + } + return bytes; + } + + @Override + public Reader toCharStream() { + return new InputStreamReader(toByteStream()); + } + + @Override + public InputStream toByteStream() { + if (text != null) { + return new ByteArrayInputStream(text.getBytes(org.aoju.bus.core.lang.Charset.UTF_8)); + } + if (bytes != null) { + ByteBuffer buffer = bytes.asByteBuffer(); + return new InputStream() { + + @Override + public int read() throws IOException { + if (buffer.hasRemaining()) { + return buffer.get(); + } + return -1; + } + }; + } + return null; + } + + } + +} diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java b/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java index 58502a722b..661a2d6895 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/RealWebSocket.java @@ -51,7 +51,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RealWebSocket implements WebSocket, WebSocketReader.FrameCallback { @@ -522,11 +522,9 @@ boolean writeOneFrame() throws IOException { if (streamsToClose != null) { listener.onClosed(this, receivedCloseCode, receivedCloseReason); } - } else { throw new AssertionError(); } - return true; } finally { IoKit.close(streamsToClose); diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java index 4cae6e31e2..ce67b60279 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocket.java @@ -34,7 +34,7 @@ * 通常是{@link Httpd} 在正常操作时,每个web套接字将通过一系列状态进行处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface WebSocket { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketCover.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketCover.java deleted file mode 100644 index be4cc45740..0000000000 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketCover.java +++ /dev/null @@ -1,471 +0,0 @@ -/********************************************************************************* - * * - * The MIT License (MIT) * - * * - * Copyright (c) 2015-2020 aoju.org and other contributors. * - * * - * 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. * - * * - ********************************************************************************/ -package org.aoju.bus.http.socket; - -import org.aoju.bus.core.io.ByteString; -import org.aoju.bus.core.lang.exception.InstrumentException; -import org.aoju.bus.http.*; -import org.aoju.bus.http.magic.RealResult; -import org.aoju.bus.http.metric.Cancelable; -import org.aoju.bus.http.metric.Convertor; -import org.aoju.bus.http.metric.TaskExecutor; -import org.aoju.bus.http.metric.TaskListener; -import org.aoju.bus.http.metric.http.CoverHttp; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.ArrayList; -import java.util.List; - -/** - * @author Kimi Liu - * @version 6.1.5 - * @since JDK 1.8+ - */ -public class WebSocketCover extends CoverHttp { - - private Sockets.Listener onOpen; - private Sockets.Listener onException; - private Sockets.Listener onMessage; - private Sockets.Listener onClosing; - private Sockets.Listener onClosed; - - private boolean openOnIO; - private boolean exceptionOnIO; - private boolean messageOnIO; - private boolean closingOnIO; - private boolean closedOnIO; - - public WebSocketCover(Httpv httpClient, String url) { - super(httpClient, url); - } - - /** - * 启动 WebSocket 监听 - * - * @return WebSocket - */ - public Sockets listen() { - String bodyType = getBodyType(); - String msgType = Builder.FORM.equalsIgnoreCase(bodyType) ? Builder.JSON : bodyType; - WebSocketImpl socket = new WebSocketImpl(httpClient.executor(), msgType); - registeTagTask(socket); - httpClient.preprocess(this, () -> { - synchronized (socket) { - if (socket.cancelOrClosed) { - removeTagTask(); - } else { - Request request = prepareRequest("GET"); - httpClient.webSocket(request, new MessageListener(socket)); - } - } - }, skipPreproc, skipSerialPreproc); - return socket; - } - - private void execute(Runnable command, boolean onIo) { - httpClient.executor().execute(command, onIo); - } - - /** - * 连接打开监听 - * - * @param onOpen 监听器 - * @return WebSocketCover - */ - public WebSocketCover setOnOpen(Sockets.Listener onOpen) { - this.onOpen = onOpen; - openOnIO = nextOnIO; - nextOnIO = false; - return this; - } - - /** - * 连接异常监听 - * - * @param onException 监听器 - * @return WebSocketCover - */ - public WebSocketCover setOnException(Sockets.Listener onException) { - this.onException = onException; - exceptionOnIO = nextOnIO; - nextOnIO = false; - return this; - } - - /** - * 消息监听 - * - * @param onMessage 监听器 - * @return WebSocketCover - */ - public WebSocketCover setOnMessage(Sockets.Listener onMessage) { - this.onMessage = onMessage; - messageOnIO = nextOnIO; - nextOnIO = false; - return this; - } - - /** - * 正在关闭监听 - * - * @param onClosing 监听器 - * @return WebSocketCover - */ - public WebSocketCover setOnClosing(Sockets.Listener onClosing) { - this.onClosing = onClosing; - closingOnIO = nextOnIO; - nextOnIO = false; - return this; - } - - /** - * 已关闭监听(当连接被取消或发生异常时,也会走该回调) - * - * @param onClosed 监听器 - * @return WebSocketCover - */ - public WebSocketCover setOnClosed(Sockets.Listener onClosed) { - this.onClosed = onClosed; - closedOnIO = nextOnIO; - nextOnIO = false; - return this; - } - - public interface Sockets extends Cancelable { - - /** - * 若连接已打开,则: - * 同 {@link Sockets#queueSize()},返回排序消息的字节数 - * 否则: - * - * @return 排队消息的数量 - */ - long queueSize(); - - /** - * @param object 待发送的对象,可以是 String | ByteString | byte[] | Java Bean - * @return 如果连接已断开 返回 false - */ - boolean send(Object object); - - /** - * 同 {@link Sockets#close(int, String)} - * - * @param code 编码 - * @param reason 原因 - * @return 是否关闭 - */ - boolean close(int code, String reason); - - /** - * 设置消息类型 - * - * @param type 消息类型,如 json、xml、protobuf 等 - */ - void msgType(String type); - - /** - * WebSocket 消息 - */ - interface Message extends Toable { - - /** - * 判断是文本消息还是二进制消息 - * - * @return 是否是文本消息 - */ - boolean isText(); - - } - - interface Listener { - - void on(Sockets ws, T data); - - } - - class Close { - - public static int CANCELED = 0; - public static int EXCEPTION = -1; - public static int NETWORK_ERROR = -2; - public static int TIMEOUT = -3; - - private int code; - private String reason; - - public Close(int code, String reason) { - this.code = code; - this.reason = reason; - } - - /** - * @return 关闭状态码 - */ - public int getCode() { - return code; - } - - /** - * @return 关闭原因 - */ - public String getReason() { - return reason; - } - - /** - * @return 是否因 WebSocket 连接被取消而关闭 - */ - public boolean isCanceled() { - return code == CANCELED; - } - - /** - * @return 是否因 WebSocket 连接发生异常而关闭 - */ - public boolean isException() { - return code == EXCEPTION; - } - - /** - * @return 是否因 网络错误 而关闭 - */ - public boolean isNetworkError() { - return code == NETWORK_ERROR; - } - - /** - * @return 是否因 网络超时 而关闭 - */ - public boolean isTimeout() { - return code == TIMEOUT; - } - - @Override - public String toString() { - return "Close [code=" + code + ", reason=" + reason + "]"; - } - } - - } - - static class WebSocketImpl implements Sockets { - - private final List queues = new ArrayList<>(); - private boolean cancelOrClosed; - private WebSocket webSocket; - private TaskExecutor taskExecutor; - - private Charset charset; - - private String msgType; - - public WebSocketImpl(TaskExecutor taskExecutor, String msgType) { - this.taskExecutor = taskExecutor; - this.msgType = msgType; - } - - public void setCharset(Charset charset) { - this.charset = charset; - } - - @Override - public synchronized boolean cancel() { - if (webSocket != null) { - webSocket.cancel(); - } - cancelOrClosed = true; - return true; - } - - @Override - public synchronized boolean close(int code, String reason) { - if (webSocket != null) { - webSocket.close(code, reason); - } - cancelOrClosed = true; - return true; - } - - @Override - public void msgType(String type) { - if (type == null || type.equalsIgnoreCase(Builder.FORM)) { - throw new IllegalArgumentException("msgType 不可为空 或 form"); - } - this.msgType = type; - } - - @Override - public long queueSize() { - if (webSocket != null) { - return webSocket.queueSize(); - } - return queues.size(); - } - - @Override - public boolean send(Object msg) { - if (msg == null) { - return false; - } - synchronized (queues) { - if (webSocket != null) { - return send(webSocket, msg); - } else { - queues.add(msg); - } - } - return true; - } - - void setWebSocket(WebSocket webSocket) { - synchronized (queues) { - for (Object msg : queues) { - send(webSocket, msg); - } - this.webSocket = webSocket; - queues.clear(); - } - } - - boolean send(WebSocket webSocket, Object msg) { - if (msg == null) { - return false; - } - if (msg instanceof String) { - return webSocket.send((String) msg); - } - if (msg instanceof ByteString) { - return webSocket.send((ByteString) msg); - } - if (msg instanceof byte[]) { - return webSocket.send(ByteString.of((byte[]) msg)); - } - byte[] bytes = taskExecutor.doMsgConvert(msgType, (Convertor c) -> c.serialize(msg, charset)).data; - return webSocket.send(new String(bytes, charset)); - } - - } - - class MessageListener extends WebSocketListener { - - WebSocketImpl webSocket; - - Charset charset; - - public MessageListener(WebSocketImpl webSocket) { - this.webSocket = webSocket; - } - - @Override - public void onOpen(WebSocket webSocket, Response response) { - this.charset = charset(response); - this.webSocket.setCharset(charset); - this.webSocket.setWebSocket(webSocket); - TaskListener listener = httpClient.executor().getResponseListener(); - Results result = new RealResult(WebSocketCover.this, response, httpClient.executor()); - if (listener != null) { - if (listener.listen(WebSocketCover.this, result) && onOpen != null) { - execute(() -> onOpen.on(this.webSocket, result), openOnIO); - } - } else if (onOpen != null) { - execute(() -> onOpen.on(this.webSocket, result), openOnIO); - } - } - - @Override - public void onMessage(WebSocket webSocket, String text) { - if (onMessage != null) { - execute(() -> onMessage.on(this.webSocket, new WebSocketMessage(text, httpClient.executor(), charset)), messageOnIO); - } - } - - @Override - public void onMessage(WebSocket webSocket, ByteString bytes) { - if (onMessage != null) { - execute(() -> onMessage.on(this.webSocket, new WebSocketMessage(bytes, httpClient.executor(), charset)), messageOnIO); - } - } - - @Override - public void onClosing(WebSocket webSocket, int code, String reason) { - if (onClosing != null) { - execute(() -> onClosing.on(this.webSocket, new Sockets.Close(code, reason)), closingOnIO); - } - } - - @Override - public void onClosed(WebSocket webSocket, int code, String reason) { - doOnClose(Results.State.RESPONSED, code, reason); - } - - private void doOnClose(Results.State state, int code, String reason) { - TaskListener listener = httpClient.executor().getCompleteListener(); - if (listener != null) { - if (listener.listen(WebSocketCover.this, state) && onClosed != null) { - execute(() -> onClosed.on(this.webSocket, toClose(state, code, reason)), closedOnIO); - } - } else if (onClosed != null) { - execute(() -> onClosed.on(this.webSocket, toClose(state, code, reason)), closedOnIO); - } - } - - private Sockets.Close toClose(Results.State state, int code, String reason) { - if (state == Results.State.CANCELED) { - return new Sockets.Close(Sockets.Close.CANCELED, "Canceled"); - } - if (state == Results.State.EXCEPTION) { - return new Sockets.Close(Sockets.Close.CANCELED, reason); - } - if (state == Results.State.NETWORK_ERROR) { - return new Sockets.Close(Sockets.Close.NETWORK_ERROR, reason); - } - if (state == Results.State.TIMEOUT) { - return new Sockets.Close(Sockets.Close.TIMEOUT, reason); - } - return new Sockets.Close(code, reason); - } - - @Override - public void onFailure(WebSocket webSocket, Throwable t, Response response) { - IOException e = t instanceof IOException ? (IOException) t : new IOException(t.getMessage(), t); - doOnClose(toState(e), 0, t.getMessage()); - TaskListener listener = httpClient.executor().getExceptionListener(); - if (listener != null) { - if (listener.listen(WebSocketCover.this, e) && onException != null) { - execute(() -> onException.on(this.webSocket, t), exceptionOnIO); - } - } else if (onException != null) { - execute(() -> onException.on(this.webSocket, t), exceptionOnIO); - } else if (!nothrow) { - throw new InstrumentException("WebSocket exception", t); - } - } - - } - -} diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java index b084e6307d..170f98bbd7 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketListener.java @@ -32,7 +32,7 @@ * web socket 监听器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class WebSocketListener { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketMessage.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketMessage.java deleted file mode 100644 index 3ff0d63d3c..0000000000 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketMessage.java +++ /dev/null @@ -1,117 +0,0 @@ -/********************************************************************************* - * * - * The MIT License (MIT) * - * * - * Copyright (c) 2015-2020 aoju.org and other contributors. * - * * - * 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. * - * * - ********************************************************************************/ -package org.aoju.bus.http.socket; - -import org.aoju.bus.core.io.ByteString; -import org.aoju.bus.http.bodys.AbstractBody; -import org.aoju.bus.http.metric.TaskExecutor; - -import java.io.*; -import java.nio.ByteBuffer; -import java.nio.charset.Charset; - -/** - * @author Kimi Liu - * @version 6.1.5 - * @since JDK 1.8+ - */ -public class WebSocketMessage extends AbstractBody implements WebSocketCover.Sockets.Message { - - private String text; - private ByteString bytes; - - public WebSocketMessage(String text, TaskExecutor taskExecutor, Charset charset) { - super(taskExecutor, charset); - this.text = text; - } - - public WebSocketMessage(ByteString bytes, TaskExecutor taskExecutor, Charset charset) { - super(taskExecutor, charset); - this.bytes = bytes; - } - - @Override - public boolean isText() { - return text != null; - } - - @Override - public byte[] toBytes() { - if (text != null) { - return text.getBytes(org.aoju.bus.core.lang.Charset.UTF_8); - } - if (bytes != null) { - return bytes.toByteArray(); - } - return null; - } - - @Override - public String toString() { - if (text != null) { - return text; - } - if (bytes != null) { - return bytes.utf8(); - } - return null; - } - - @Override - public ByteString toByteString() { - if (text != null) { - return ByteString.encodeUtf8(text); - } - return bytes; - } - - @Override - public Reader toCharStream() { - return new InputStreamReader(toByteStream()); - } - - @Override - public InputStream toByteStream() { - if (text != null) { - return new ByteArrayInputStream(text.getBytes(org.aoju.bus.core.lang.Charset.UTF_8)); - } - if (bytes != null) { - ByteBuffer buffer = bytes.asByteBuffer(); - return new InputStream() { - - @Override - public int read() throws IOException { - if (buffer.hasRemaining()) { - return buffer.get(); - } - return -1; - } - }; - } - return null; - } - -} diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java index 599d4b6bfb..1601fe151b 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketProtocol.java @@ -32,7 +32,7 @@ * web socket协议信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class WebSocketProtocol { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java index 981b048f2f..ca37f955c4 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketReader.java @@ -39,7 +39,7 @@ * 这个类不是线程安全的 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ final class WebSocketReader { diff --git a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java index 1d389e9288..bf04d005ab 100644 --- a/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java +++ b/bus-http/src/main/java/org/aoju/bus/http/socket/WebSocketWriter.java @@ -35,7 +35,7 @@ * 这个类不是线程安全的 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ final class WebSocketWriter { diff --git a/bus-image/pom.xml b/bus-image/pom.xml index 49fb8c6cf6..92d8dc3529 100755 --- a/bus-image/pom.xml +++ b/bus-image/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-image - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-image/src/main/java/org/aoju/bus/image/Args.java b/bus-image/src/main/java/org/aoju/bus/image/Args.java index d7219be6cf..8c7003b038 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Args.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Args.java @@ -42,7 +42,7 @@ * 请求参数信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Builder.java b/bus-image/src/main/java/org/aoju/bus/image/Builder.java index c8291185af..aa16dd804a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Builder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Builder.java @@ -53,7 +53,7 @@ * 方法参数等构建器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Centre.java b/bus-image/src/main/java/org/aoju/bus/image/Centre.java index 7bd2e14c77..f968f55407 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/Centre.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Centre.java @@ -50,7 +50,7 @@ * 2. 设备服务进程 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @lombok.Builder diff --git a/bus-image/src/main/java/org/aoju/bus/image/Device.java b/bus-image/src/main/java/org/aoju/bus/image/Device.java index 93ea93cda8..2d80e86b93 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Device.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Device.java @@ -53,7 +53,7 @@ * 设备信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Device implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Dimse.java b/bus-image/src/main/java/org/aoju/bus/image/Dimse.java index 815fc39658..d0e7c0d530 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Dimse.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Dimse.java @@ -33,7 +33,7 @@ * 复合DIMSE服务 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Dimse { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Editors.java b/bus-image/src/main/java/org/aoju/bus/image/Editors.java index 2be79cea15..84b5200aa7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Editors.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Editors.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-image/src/main/java/org/aoju/bus/image/Efforts.java b/bus-image/src/main/java/org/aoju/bus/image/Efforts.java index a717cdcaa1..0d37d21216 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/Efforts.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Efforts.java @@ -34,7 +34,7 @@ * 即: 后续业务处理支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Efforts { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Format.java b/bus-image/src/main/java/org/aoju/bus/image/Format.java index bf02adc413..efbbb0aa67 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Format.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Format.java @@ -45,7 +45,7 @@ * 日期格式化等工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Format extends java.text.Format { diff --git a/bus-image/src/main/java/org/aoju/bus/image/Node.java b/bus-image/src/main/java/org/aoju/bus/image/Node.java index fda05179b8..7a96434b79 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Node.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Node.java @@ -39,7 +39,7 @@ * 服务器信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Option.java b/bus-image/src/main/java/org/aoju/bus/image/Option.java index 94b95c6f18..5d6b14f266 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Option.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Option.java @@ -35,7 +35,7 @@ * 服务请求选项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Status.java b/bus-image/src/main/java/org/aoju/bus/image/Status.java index a1e0a47445..f1cc5151ae 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Status.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Status.java @@ -38,7 +38,7 @@ * 相关处理状态 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/Tag.java b/bus-image/src/main/java/org/aoju/bus/image/Tag.java index 9505aa3bc4..b2c24e7b94 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/Tag.java +++ b/bus-image/src/main/java/org/aoju/bus/image/Tag.java @@ -32,7 +32,7 @@ * 文件信息标识 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Tag { diff --git a/bus-image/src/main/java/org/aoju/bus/image/UID.java b/bus-image/src/main/java/org/aoju/bus/image/UID.java index 5e0359dc98..9bfbff0aa4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/UID.java +++ b/bus-image/src/main/java/org/aoju/bus/image/UID.java @@ -45,7 +45,7 @@ * UID信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UID { @@ -1765,19 +1765,19 @@ public class UID { /** * Private ERAD Practice Builder Report Text Storage */ - public static final String PrivateERADPracticeBuilderReportTextStorage = "1.2.826.1.5.3680043.293.1.0.1"; + public static final String PrivateERADPracticeBuilderReportTextStorage = "1.2.826.1.6.3680043.293.1.0.1"; /** * Private ERAD Practice Builder Report Dictation Storage */ - public static final String PrivateERADPracticeBuilderReportDictationStorage = "1.2.826.1.5.3680043.293.1.0.2"; + public static final String PrivateERADPracticeBuilderReportDictationStorage = "1.2.826.1.6.3680043.293.1.0.2"; /** * Private Philips HP Live 3D 01 Storage */ - public static final String PrivatePhilipsHPLive3D01Storage = "1.2.840.113543.6.6.1.5.10001"; + public static final String PrivatePhilipsHPLive3D01Storage = "1.2.840.113543.6.6.1.6.10001"; /** * Private Philips HP Live 3D 02 Storage */ - public static final String PrivatePhilipsHPLive3D02Storage = "1.2.840.113543.6.6.1.5.10002"; + public static final String PrivatePhilipsHPLive3D02Storage = "1.2.840.113543.6.6.1.6.10002"; /** * Private GE 3D Model Storage */ @@ -1825,7 +1825,7 @@ public class UID { /** * Private Siemens CSA Non Image Storage */ - public static final String PrivateSiemensCSANonImageStorage = "1.3.12.2.1107.6.1.5"; + public static final String PrivateSiemensCSANonImageStorage = "1.3.12.2.1107.6.1.6"; /** * Private Siemens CT MR Volume Storage */ @@ -1889,11 +1889,11 @@ public class UID { /** * Private Philips MR Cardio Storage (Retired) */ - public static final String PrivatePhilipsMRCardioStorageRetired = "1.3.46.670589.6.1.5"; + public static final String PrivatePhilipsMRCardioStorageRetired = "1.3.46.670589.6.1.6"; /** * Private Philips MR Cardio Storage */ - public static final String PrivatePhilipsMRCardioStorage = "1.3.46.670589.6.1.5.1"; + public static final String PrivatePhilipsMRCardioStorage = "1.3.46.670589.6.1.6.1"; /** * Private Philips CT Synthetic Image Storage */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java index dd8fa8b21a..5eef92da19 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/AcquisitionModality.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AcquisitionModality { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java index 5ea76d5281..49fbbc610a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/AnatomicRegion.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AnatomicRegion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java index e767fa8176..c953227663 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveElementDictionary.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArchiveElementDictionary extends ElementDictionary { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java index b62cb9a419..cbda97832f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveKey.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArchiveKey { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java index b84bec8390..2e8cdce75a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/ArchiveTag.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ArchiveTag { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java index ba3fa2123c..e9b74e3676 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationCoercion.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeIdentificationCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java index 7d61a9ab05..d03a8ba0a6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentificationMethod.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeIdentificationMethod { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java index 1279a4036d..93d28a1c06 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/DeIdentifier.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeIdentifier { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java index 8ab26915e6..e543c3c6d2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/FuzzyStr.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java index 6ff657caee..073e229727 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/HashUIDMapper.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HashUIDMapper implements UIDMapper { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java index 532a82baa8..d49ca3b3e1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/KPhonetik.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class KPhonetik implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java index d6584fc1a9..e6c420a3c1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Metaphone.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Metaphone implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java index 71521f5ba6..9f2018ecdb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Multiframe.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Multiframe { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java index 11fa895dca..85aa53d449 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Phonem.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Phonem implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java index 17de7b1bdd..2dd209f91a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/Soundex.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Soundex implements FuzzyStr { diff --git a/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java b/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java index 9a9080a8d6..26f4d1a0af 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java +++ b/bus-image/src/main/java/org/aoju/bus/image/builtin/UIDMapper.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UIDMapper { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java index 963958ab34..7b05117ed3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ApplicationCache.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ApplicationCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java index 95f73a6509..3330e76bd2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/AttributeCoercion.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AttributeCoercion implements Serializable, Comparable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java index bf2d2734d0..60ce443a7f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Availability.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Availability { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java index b26044e635..4c264c50d3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/BinaryPrefix.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum BinaryPrefix { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java index cc2475ad03..260298f531 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Capacity.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Capacity implements Cloneable, java.io.Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java index 42412e3239..105c5da70b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Configuration.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Configuration extends Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java index 454fc1db80..a385d850ce 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationCache.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class ConfigurationCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java index b4ca37bfff..ec8e3272c5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ConfigurationChange.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConfigurationChange { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java index 3cf7c5187e..12ed16d53d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeleterThreshold.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeleterThreshold extends StorageThreshold diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java index 46e4ca9858..82978faeba 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DeviceCache.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeviceCache extends ConfigurationCache diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java index 7ae0530d26..21e8dcd1db 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirReader.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DirReader implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java index 91e6018fcd..d2c1f298a5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/DirWriter.java @@ -46,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DirWriter extends DirReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java index 66df04853f..45b91a9324 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/IDeviceCache.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IDeviceCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java index c473c79e4f..c618b01c25 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/Property.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Property implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java index 5396b8de23..74793f18f1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/RetentionPeriod.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RetentionPeriod implements Comparable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java index 14733e549e..7cbf2f4dee 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/ScheduleExpression.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ScheduleExpression { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java index a436419134..3205ee1473 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/StorageThreshold.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StorageThreshold { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java index 13d9047301..a2710b4306 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/WebApplicationCache.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WebApplicationCache extends ConfigurationCache diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java index f1fb4f9fdf..af28758174 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Attributes.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Attributes implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java index 648b28544a..1c954cb680 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesCoercion.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java index 0130424748..4ac13f1aeb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/AttributesSelector.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AttributesSelector implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java index 0c402d6423..f577e25372 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BinaryValueType.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum BinaryValueType implements ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java index 7543c90cb1..6d72322f4d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/BulkData.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BulkData implements Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java index 085d8a079c..955fe2962d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Code.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Code implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java index 9eef10e557..76cd29a739 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DatePrecision.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DatePrecision { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java index 852512d365..17476533c9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/DateRange.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DateRange implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java index 61e2d64a05..5682c915f7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ElementDictionary.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class ElementDictionary { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java index 1ed0a160a7..5d5351ae0f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Fragments.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Fragments extends ArrayList implements Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java index ed0141a0ef..18301f4f34 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IOD.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IOD extends ArrayList { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java index bbbcfb87da..fb529146a8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/IODCache.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IODCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java index 6ceb80775e..b89efa29b6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Implementation.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Implementation { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java index 98de24669a..e9fc4d9f24 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Issuer.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Issuer implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java index b973ffeab7..9e80d42a70 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ItemPointer.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ItemPointer implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java index 74d0f016bc..f11fe689f9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Keyword.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Keyword { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java index 443e7c6225..adb28d9761 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/MergeAttributesCoercion.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MergeAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java index d3ad9b5352..732cebbfb1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/NullifyAttributesCoercion.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NullifyAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java index c89e19264f..283591b53a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/PersonName.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PersonName { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java index a5ce7dcae0..c894317b49 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/RemapUIDAttributesCoercion.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RemapUIDAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java index 92a91a11f2..4011eaba5a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Sequence.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Sequence extends ArrayList implements Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java index 0a8a88fda3..b4c34c6cc0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SequenceValueType.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum SequenceValueType implements ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java index 3ddae17954..2fb4c46221 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/SpecificCharacterSet.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SpecificCharacterSet { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java index 8d9e2187b8..ab68da9fbc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StandardDictionary.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StandardDictionary extends ElementDictionary { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java index 3c7b55c299..02125faa33 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/StringValueType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum StringValueType implements ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java index 9d8d740574..4d8721111c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/TemporalType.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum TemporalType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java index db94ddb4d3..da9a2f5f04 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/VR.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum VR { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java index 88550d56d9..6431c72db6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValidationResult.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ValidationResult { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java index 643762d63e..8088b02349 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/Value.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Value { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java index 76e31399a9..a5d7e7bd8b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueSelector.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ValueSelector implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java index c92d5f504a..709b53e423 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/data/ValueType.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ValueType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java index 3559a46f46..744894c57f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BasicBulkDataDescriptor.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicBulkDataDescriptor implements BulkDataDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java index f28a30c81b..5db1abe9d3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataCreator.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BulkDataCreator { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java index 091a2a0f43..062822508b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/BulkDataDescriptor.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BulkDataDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java index 5c5f06e530..b954812ec0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ContentHandlerAdapter.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ContentHandlerAdapter extends DefaultHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java index f6f2326561..927b6a42f0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageEncodingOptions.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageEncodingOptions { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java index df983be241..7bd6daf8b2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputHandler.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ImageInputHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java index d8aecf8c07..45fe40b1b0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageInputStream.java @@ -47,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageInputStream extends FilterInputStream @@ -381,7 +381,7 @@ public void readFully(short[] s, int off, int len) throws IOException { while (len > 0) { int nelts = Math.min(len, byteBuf.length / 2); readFully(byteBuf, 0, nelts * 2); - ByteKit.bytesToShorts(byteBuf, s, off, nelts, bigEndian); + ByteKit.bytesToShort(byteBuf, s, off, nelts, bigEndian); off += nelts; len -= nelts; } diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java index f787e8233e..1e062b8b95 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/ImageOutputStream.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageOutputStream extends FilterOutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java index 5ab4ac0969..67e5de3d41 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFInputStreamAdapter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RAFInputStreamAdapter extends InputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java index 026a46371a..44c0e7d38a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/RAFOutputStreamAdapter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RAFOutputStreamAdapter extends OutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java index f5e9190198..8fe260f784 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXReader.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SAXReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java index b8c115639b..35c9c1af97 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXTransformer.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class SAXTransformer { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java index d8d48b4dd2..c4d5ad9783 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/SAXWriter.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SAXWriter implements ImageInputHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java index 548ae48cc9..55bbf63146 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/TemplatesCache.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TemplatesCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java index 869244c0e4..95deaf7ee3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/io/XSLTAttributesCoercion.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class XSLTAttributesCoercion implements AttributesCoercion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java index 1bcccdc3d6..857f1b534a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/AbstractStowrs.java @@ -49,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AbstractStowrs implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java index db98b19eae..12ede352d5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/HeaderFieldValues.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HeaderFieldValues { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java index fd6f0a3521..3cdb8a8550 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/InvokeImageDisplay.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InvokeImageDisplay { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java index d938c5fde5..3651665073 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartInputStream.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MultipartInputStream extends FilterInputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java index b64206e1a9..d8bb8c51bb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartParser.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MultipartParser { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java index 309ae04d57..d7f72f8151 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/MultipartReader.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MultipartReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java index 7168441fc2..5dcb21159d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordFactory.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RecordFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java index 9ef392aac8..3e420d4f5b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/RecordType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum RecordType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java index 7375beebb8..633af1bc30 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsMultiFiles.java @@ -47,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StowrsMultiFiles extends AbstractStowrs { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java index 2069139aec..7185693334 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/StowrsSingleFile.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StowrsSingleFile extends AbstractStowrs implements UploadSingleFile { diff --git a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java index 0db04a2085..273d524a33 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java +++ b/bus-image/src/main/java/org/aoju/bus/image/galaxy/media/UploadSingleFile.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UploadSingleFile extends AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java index 38b079109b..633ee746d0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AdvancedHandler.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum AdvancedHandler implements TCPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java b/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java index c131e2b734..f73c25113b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/ApplicationEntity.java @@ -46,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApplicationEntity implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java index 3d33d7516e..0241cb7005 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Association.java @@ -47,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Association { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java index 42493c96a2..986a74302a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationHandler.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AssociationHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java index 5b777ddafe..5ea3874649 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationListener.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface AssociationListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java index c2d7f414a9..0e1e087e59 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AssociationMonitor.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface AssociationMonitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java b/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java index 023416ede8..7ed78b59fa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/AttributeContext.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java index e6d5af58c1..41a156653f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelListener.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CancelListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java index 0bd46a5ee8..8cc04a8f23 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/CancelRQHandler.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CancelRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java index d14b3732d0..ed38766d4e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Commands.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Commands { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java index d4ee35297d..9cf4cb363a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Compatible.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Compatible { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java index 92e142e1a3..776b60a986 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Connection.java @@ -52,7 +52,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Connection implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java index 212b57ead1..f51b5603ed 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriter.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DataWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java index 60d7c015bd..4ca69e5dd6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DataWriterAdapter.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DataWriterAdapter implements DataWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java index 783b6771ae..7d485c2fca 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DefaultEditors.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultEditors implements Editors { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java index 8fc77f388e..4b46678fd8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRQHandler.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DimseRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java index c8743e9fd0..0883a1f158 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSP.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DimseRSP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java index c165798a05..7ea53cd1f6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/DimseRSPHandler.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DimseRSPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java index 0b38276e10..52e34f5f8a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/FutureDimseRSP.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FutureDimseRSP extends DimseRSPHandler implements DimseRSP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java b/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java index 7431a31a09..de64fd39a7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/IdentityNegotiator.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IdentityNegotiator { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java b/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java index 1a22d7ac6b..836b1a146f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/ImageException.java @@ -37,7 +37,7 @@ * 自定义异常: 影像异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageException extends RelevantException { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java index 86a3d35209..95d12fdada 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/InputStreamWriter.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InputStreamWriter implements DataWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java b/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java index 68e41434c1..e8d352a30c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/KeycloakClient.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ * @since April 2019 */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java index c438753e3b..63708536a2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Monitoring.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Monitoring { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java index a57fa88c5f..d3f73aa8e7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVInputStream.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class PDVInputStream extends InputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java index b81e55b1a3..e43e312070 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/PDVOutputStream.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class PDVOutputStream extends OutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java index d2c91fd7bd..bff3774a60 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Progress.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Progress implements CancelListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java index 9614736567..af6fdb44ca 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/ProgressListener.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ProgressListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java index 55e429601c..f27a6ab40e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Readable.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Readable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java b/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java index 9a4d674f7c..2dfc427fb3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/SSLManagerFactory.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class SSLManagerFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java index 5d0f628e50..d3023ad9f9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/SocketListener.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SocketListener extends Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java b/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java index 8f23a96709..395e7fb4c2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/StorageOptions.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StorageOptions implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java index 23de68f7e3..6cc26ab364 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TagCamel.java @@ -53,7 +53,7 @@ * 这些标记的作用是提供公共标记(DICOM和non DICOM)的高级可访问性 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TagCamel implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java index d5e752ec59..cd1525a0ad 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TagValue.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TagValue { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java index d0a91bfcce..56148045c9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TagView.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TagView { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java index fe0d85a27a..f9e0ea9c75 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Tagable.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Tagable extends Readable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java index 9423b2567b..08072304ce 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Thumbnail.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Thumbnail { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java b/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java index 41fc952972..ec04b26f96 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/Timeout.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Timeout implements Runnable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java b/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java index bcb511efa6..61398ce6e9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/TransferCapability.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TransferCapability implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java b/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java index 24841df41f..95f1d590ce 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/WebApplication.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WebApplication { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java index fb3be6a456..2bc596d375 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/AEExtension.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AEExtension implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java index 6874af9d42..d0a7122fa9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/DeviceExtension.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DeviceExtension implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java index 1633b47646..823b5f373c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7ApplicationExtension.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7ApplicationExtension implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java index 723075911c..fd6634435a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/HL7DeviceExtension.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7DeviceExtension extends DeviceExtension { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java index 1672be4b30..02d210e09f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageReaderExtension.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageReaderExtension extends DeviceExtension { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java index fbc773ce42..aea052c23c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/acquire/ImageWriterExtension.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageWriterExtension extends DeviceExtension { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java index 95c428b00b..c4bf43f897 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Listener.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultHL7Listener implements HL7MessageListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java index b4b78d8e6d..8f2c7d03f6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/DefaultHL7Service.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultHL7Service extends DefaultHL7Listener diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java index 8e7f66bd61..883dddcf1c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/Delimiter.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Delimiter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java index 53ddd51077..ac69715044 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/ERRSegment.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ERRSegment extends HL7Segment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java index 8dc6484458..29d4a76b4f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Application.java @@ -42,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Application implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java index 645c9c3375..04eb3e01b2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationCache.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7ApplicationCache extends ConfigurationCache diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java index 4ca258a861..bc3ecbbf82 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ApplicationInfo.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7ApplicationInfo implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java index 21def1e72c..7b20e1d368 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Charset.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class HL7Charset { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java index 87fb8d4854..0e2b6c8933 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Configuration.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface HL7Configuration { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java index 4be7659915..4afb1828d0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Connection.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Connection implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java index e1f701f9c4..01953820e4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ConnectionMonitor.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface HL7ConnectionMonitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java index 7a2a539975..42a4565840 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ContentHandler.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7ContentHandler extends DefaultHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java index 75b23f6865..4d031ce2d6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Exception.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Exception extends Exception { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java index c3dfd6822a..49ab4e79c2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Handler.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum HL7Handler implements TCPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java index 7c55967930..1fe83f8a1f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Message.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Message extends ArrayList { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java index 38f3129d7d..2d9867322d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7MessageListener.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface HL7MessageListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java index 5a0b3a6751..d653295f7a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Parser.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Parser { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java index c2047502a4..a5270c7f52 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Segment.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Segment implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java index cbe0c48a01..067858f057 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7Service.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface HL7Service extends HL7MessageListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java index 7cbe219c78..db2f7cbc43 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/HL7ServiceRegistry.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7ServiceRegistry extends DefaultHL7Listener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java index b9a2990d80..265f25c422 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/IHL7ApplicationCache.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IHL7ApplicationCache { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java index 9598fe682d..7c4f2268c3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPConnection.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MLLPConnection implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java index 576323ce81..0c16df43f3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPInputStream.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MLLPInputStream extends BufferedInputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java index b486b39ce4..f16df21332 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/MLLPOutputStream.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MLLPOutputStream extends FilterOutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java index 155fe4b16f..7a69f5df12 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/hl7/UnparsedHL7Message.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UnparsedHL7Message implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java index 820ffad2ea..c19241e148 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPHandler.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TCPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java index ce8b041093..15f97843bf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/TCPListener.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TCPListener implements SocketListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java index dd779b12a8..90474c5468 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPHandler.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UDPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java index d2df2577ed..40be48140d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/net/UDPListener.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UDPListener implements SocketListener { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java index 6b27485822..fdd3cdf9c6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAbort.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AAbort extends IOException { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java index 565c8f8c04..e2ee1247cc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateAC.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AAssociateAC extends AAssociateRQAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java index 392a3aa342..ff619cbf59 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRJ.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AAssociateRJ extends IOException { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java index 66ec3af4ca..a0e612f248 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQ.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AAssociateRQ extends AAssociateRQAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java index 7adddd1369..140d7ede94 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/AAssociateRQAC.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AAssociateRQAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java index 5f51266e40..9aad098e90 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/CommonExtended.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommonExtended { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java index b83261f7c6..19b3cf41af 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/ExtendedNegotiate.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExtendedNegotiate { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java index 893c8419bc..ad3dc0146d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityAC.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IdentityAC { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java index 511ec3d5b6..9d26072240 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/IdentityRQ.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IdentityRQ { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java index f36e826675..9a85e09bfd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUDecoder.java @@ -50,7 +50,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PDUDecoder extends PDVInputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java index c61a9c904c..4c704e93f0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/PDUEncoder.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PDUEncoder extends PDVOutputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java index e7707f6893..96e38f86f4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/Presentation.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Presentation { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java index 35befdc769..fd0fec295c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/pdu/RoleSelection.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RoleSelection { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java index 9de65fd9c3..6d64a30541 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AcceptObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java index 62a023fccb..b3f56a038f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ActionType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java index b1419e66e3..337ff025b0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java index 5135c19fc9..785959b3e2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryRequest.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java index 2d9c56f789..34a95e67e2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryResponse.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java index 5fbec39e9c..3a87832bc0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AdhocQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java index dedbb6cfde..50707ee2c7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ApproveObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java index 5c09e5ed0d..5610513b1e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationBuilder.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AssociationBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java index 89dc84bfb6..affb42a66c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java index 289852fe45..1fd0ef27f3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AssociationType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java index 9629af5f55..8b5d088a4a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventQueryType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java index 37b95bd6bb..18348a52d2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/AuditableEventType.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java index aa2ea7a616..2cc6d7721a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BooleanFilterType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java index a9816a9ecb..c448ed8956 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/BranchType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java index 25f21f3914..3d1949a7ea 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationBuilder.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ClassificationBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java index 432dd84e74..9d1af0e6cf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeQueryType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java index 5818ba7800..ebe13375c9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationNodeType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java index b06afc3254..5cf4c685ab 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java index 700d65d235..79e368cf7d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeQueryType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java index 4a0da2cf5d..799092dd6a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationSchemeType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java index cce847efcf..307788652d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ClassificationType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java index 5735d862aa..7bb029b103 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/CompoundFilterType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java index 7c3000aa2c..54f558e3af 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DateTimeFilterType.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java index 8fdaf075e1..4a70f8a92e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DeprecateObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java index 5e0205dfea..180f9964b3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryPortType.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @WebService(targetNamespace = "urn:ihe:iti:xds-b:2007", name = "DocumentRepository_PortType") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java index f41cdc7f8a..c0304e9de7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/DocumentRepositoryService.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @WebServiceClient(name = "DocumentRepository_Service", wsdlLocation = "/wsdl/XDS.b_DocumentRepository.wsdl", targetNamespace = "urn:ihe:iti:xds-b:2007") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java index c36bfe739d..dc08a5f28e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EmailAddressType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java index 78b2331bec..e4ca48a6dc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/EnsureMustUnderstandHandler.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EnsureMustUnderstandHandler implements SOAPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java index 51bb02c519..2026b9f9ad 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierBuilder.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExternalIdentifierBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java index bc847c3f62..1f0c4ae967 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java index 517df59683..4a26985419 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalIdentifierType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java index d974f7297f..0a280b9638 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkQueryType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java index 686edbb134..59824265f4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExternalLinkType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java index 7d9dd2fa97..4128445ef7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java index 9058fa56bd..4eee998350 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ExtrinsicObjectType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java index 20e7a1dd81..407988c235 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationQueryType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java index 762f0540c4..ef59628046 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FederationType.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java index 4c14d229a9..eabf9e6c70 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterQueryType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java index 8dff231022..a65b43b169 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FilterType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java index 490fb82150..292e81a86b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/FloatFilterType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java index 5d7509f363..3a4613d3c7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IdentifiableType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java index 1675c3c928..9e5b374894 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSource.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @WebServiceClient(name = "ImagingDocumentSource", wsdlLocation = "/wsdl/XDS-I.b_ImagingDocumentSource.wsdl", targetNamespace = "urn:ihe:rad:xdsi-b:2009") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java index 9096e613f3..8f933dc574 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ImagingDocumentSourcePortType.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @WebService(targetNamespace = "urn:ihe:rad:xdsi-b:2009", name = "ImagingDocumentSource_PortType") diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java index 5267313451..65a9e63957 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/IntegerFilterType.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java index d19e64958e..933315d3f9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBranchType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java index 616a6c67a6..eb3ad4fcf8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringBuilder.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InternationalStringBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java index 724b5c0db9..ad493d405d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/InternationalStringType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java index 99fd466cff..5cf8710cbe 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/LocalizedStringType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java index 7159a27d4a..75a6752185 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java index f4ffd29ad0..120bb0397d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotificationType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java index 2941b2b86e..4025d457ab 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/NotifyActionType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java index 3d5e80787e..e48952d042 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectFactory.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlRegistry diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java index 767b145ed8..f44431f782 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefListType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java index 743fdc4ccc..fe14609227 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ObjectRefType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java index 7d74e70acf..bba972aedb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationQueryType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java index ca0ec1bdc6..589f186fb3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/OrganizationType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java index 9df3c17a6d..b5f84da342 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonNameType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java index 2bb65be35c..1a707b1bcd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonQueryType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java index 7b1057d84c..d06922773f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PersonType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java index 5e62288529..5d1da911fe 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/PostalAddressType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java index d856072b23..218bf1a32c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ProvideAndRegisterDocumentSetRequestType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java index 9c319f4b70..9a79c4a0b2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionBranchType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java index b0d3560d9c..d0f82c9b70 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/QueryExpressionType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java index 6717ce90f7..f8e2d6ec9a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryError.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java index fafdac3d36..dbd1c4a89f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryErrorList.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java index 39fb419e3a..e2aa44d28f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectListType.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java index bff58e05a7..470482c0a8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectQueryType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java index ba28d5a351..8fc9ec72b5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryObjectType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java index aed7ae319c..b92ba6ca81 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageQueryType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java index fa720e40fb..27fdfb5056 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryPackageType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java index 3b02a30e8b..e3ae099325 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java index 24fd074448..f535a1885f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryRequestType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java index 1bbdc4b50b..56123c2ee2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryResponseType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java index 77367e739e..a14ef2b576 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RegistryType.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java index 44424a5c6b..f99c469057 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RelocateObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java index 32cd8af20e..d36a8723de 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RemoveObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java index 8ec4b3cecd..265ca0f0ce 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ResponseOptionType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java index a279e620b0..95787b30ab 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetRequestType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java index 63e97158c8..6c318c4402 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveDocumentSetResponseType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java index 7850bd03d0..f7708e028b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveImagingDocumentSetRequestType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java index 4e4ecb9471..b3b47dccf5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetRequestType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java index bfbf752c37..0de0ef7a21 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/RetrieveRenderedImagingDocumentSetResponseType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java index 33ed9f8438..6b519c2844 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingQueryType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java index d56f79f878..a4804cb2fa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceBindingType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java index c7eabd6b23..2d803b4d31 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceQueryType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java index 8200ac85f5..e0e8d63d2b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ServiceType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java index 9a8fb1b657..a0029bd13b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SimpleFilterType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java index c92198ad79..7cc50ebff2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBranchType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java index e02624a761..2520ead78a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotBuilder.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SlotBuilder { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java index ab4dd4f81f..578641a237 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotListType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java index 26cb75f262..0e6e197b48 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SlotType.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java index 6fe65cd738..d430c286d6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java index 0ce198a694..0c047d4d75 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SpecificationLinkType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java index efad68aeea..11edf810d5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/StringFilterType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java index 3d1108709d..adf7638c4a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubmitObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java index 46f35fbb43..d232ab757f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionQueryType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java index 3e9a3b81f6..0091c96f43 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/SubscriptionType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java index 5ce90cf08d..a9e07d22ef 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberListType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java index 0c3ad0ce4b..590967295d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/TelephoneNumberType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java index e2098aee4c..72b527793d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UndeprecateObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java index 7f8e4cf7dc..12b62292bc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UpdateObjectsRequest.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java index 86a6d97015..8cde83d1cb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserQueryType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java index d6913e32ec..1084c51852 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/UserType.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java index ab72fa8d7e..0e42a69faa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/ValueListType.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java index 1007c751ff..ca6783ba5b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/VersionInfoType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlAccessorType(XmlAccessType.FIELD) diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java index 3e3a4648df..fbb7dc124d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/WSSESecurityUnderstandPretender.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WSSESecurityUnderstandPretender implements SOAPHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java index a271ebd129..b8e9e70454 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/internal/xdsi/XDSConstants.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface XDSConstants { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java index d84faf0ab1..584622c977 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/AbstractService.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractService implements ImageService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java index acb908aa58..59affe6f7b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCEchoSCP.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicCEchoSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java index da83aa03a2..fa2635c549 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCFindSCP.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicCFindSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java index 2ee679c664..ad82a5ab23 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCGetSCP.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicCGetSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java index c15bbfe38d..b98b6a0217 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCMoveSCP.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicCMoveSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java index 833122d12a..26a76a47ca 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicCStoreSCP.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicCStoreSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java index c678a8248d..0c8da05158 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicMPPSSCP.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicMPPSSCP extends AbstractService { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java index 9785880fe1..209180e95e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicQuery.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicQuery implements Query { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java index 42740d331c..997591e0ac 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/BasicRetrieve.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BasicRetrieve implements Retrieve { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java index 628293ee87..8e30909339 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ImageService.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ImageService extends DimseRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java index 4f7af20dda..50a2ae8a42 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Instance.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Instance implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java index ace1491c2f..d43ef05ad3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Level.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Level { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java index 82048e6003..870a5b87a4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Query.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Query extends Runnable, CancelRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java index f16291a026..3eaea9b1aa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/Retrieve.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Retrieve extends Runnable, CancelRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java index e2df65a768..b5cc0a415a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java +++ b/bus-image/src/main/java/org/aoju/bus/image/metric/service/ServiceHandler.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ServiceHandler implements DimseRQHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java index 81c5a84f70..3375d9007c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/BufferedImages.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BufferedImages { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java index 1057d109da..c8d50489fe 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ByteLookupTable.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ByteLookupTable extends LookupTable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java index 3fd93676f4..02be69de3d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorModelFactory.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ColorModelFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java index 45058d3c49..b5d92c9986 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ColorSubsampling.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum ColorSubsampling { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java index 0a735206a7..9dcce4b6e1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/DicomMetaData.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DicomMetaData extends IIOMetadata { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java index 3c54332956..567964de13 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTable.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class LookupTable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java index f8af941f58..6cfafee30c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/LookupTableFactory.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LookupTableFactory { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java index 541dea0552..40c39605fa 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/Overlays.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Overlays { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java index 5f5da10948..5ebeb0ff7b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/PaletteColorModel.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PaletteColorModel extends ColorModel { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java index b483d2875d..c31aeee927 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/Photometric.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Photometric { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java index 24cf192b86..5ac6b30c49 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/PixelAspectRatio.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PixelAspectRatio { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java index f7983c2b35..47da03f561 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledColorModel.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SampledColorModel extends ColorModel { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java index cafee35aef..b5f4f87433 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/SampledSampleModel.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SampledSampleModel extends SampleModel { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java index 5ca0cc0939..054af5e23c 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/ShortLookupTable.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ShortLookupTable extends LookupTable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java index 99d26ff920..fbe5f7911a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/StoredValue.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class StoredValue { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java index d04e11af5d..ac93649731 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBR.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum YBR { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java index 8f39800892..6dad4f1d79 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/YBRColorSpace.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class YBRColorSpace extends ColorSpace { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java index f0571e4962..b85cde320b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/BytesWithImageDescriptor.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BytesWithImageDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java index 950d7cb605..292e3c6b83 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRule.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompressionRule implements Comparable, Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java index 96283beee7..808ff3c3ca 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/CompressionRules.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompressionRules implements Iterable, Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java index b390ec388a..692d5bc057 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Compressor.java @@ -49,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Compressor extends Decompressor implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java index 8b398322bc..1f318aa357 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Decompressor.java @@ -49,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Decompressor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java index 333f6705db..5f542a214b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ExtMemoryOutputStream.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ final class ExtMemoryOutputStream extends MemoryCacheImageOutputStream diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java index e215100a56..a3ae908bc5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/FormatNameFilterIterator.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ * @since Jul 2015 */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java index 6e6f637d85..27b3c4dc3b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageDescriptor.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ImageDescriptor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java index 96a5d35921..6851e11eb7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageReaderFactory.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageReaderFactory implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java index b830557f90..e68b0a340b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/ImageWriterFactory.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageWriterFactory implements Serializable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java index 31e140e165..7457994bf7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/Transcoder.java @@ -51,7 +51,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Transcoder implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java index 59d4e2687d..3ab8843193 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/TransferSyntaxType.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum TransferSyntaxType { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java index 7677fea97e..f663688b14 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEG.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JPEG { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java index 07b068b1ee..a109c9ef56 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGHeader.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JPEGHeader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java index c5553c22eb..974eeff709 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/JPEGLSCodingParam.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JPEGLSCodingParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java index 8d9dc775ac..b0f692e9ba 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLS.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum PatchJPEGLS { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java index 9ba501ba72..0fdf1a7240 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageInputStream.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PatchJPEGLSImageInputStream extends ImageInputStreamImpl diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java index b13b3c9983..3846a89994 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/PatchJPEGLSImageOutputStream.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PatchJPEGLSImageOutputStream extends ImageOutputStreamImpl { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java index d8a6baef19..c82061af2e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOFSegment.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SOFSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java index 2007a7c442..ae954bc8cf 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/jpeg/SOSSegment.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SOSSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java index 42f4e94145..28242b2179 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/codec/mpeg/MPEGHeader.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MPEGHeader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java index 5342014d01..85a71bef08 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ExtendInputImageStream.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExtendInputImageStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java index 487e1a5c6f..62bce2dd15 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileRawImage.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileRawImage { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java index 0f189583a6..4d532913c4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/FileStreamSegment.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FileStreamSegment extends StreamSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java index 4ea549ec97..790d182bd6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageCV.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageCV extends Mat implements PlanarImage { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java index eacb20c564..0b12354d0e 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageConversion.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageConversion { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java index 8971bc8a55..94742c23f7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageParameters.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java index 0af98185ae..f6d78e45ee 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageProcessor.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageProcessor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java index 94f684ef13..111e1ad963 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/ImageSize.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ImageSize { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java index b067ad3ed6..19cac7e548 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/J2kImageWriteParam.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class J2kImageWriteParam extends ImageWriteParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java index 3815b1b588..2b3a68d8b6 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGImageWriteParam.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JPEGImageWriteParam extends ImageWriteParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java index 1b0444687d..114e9a8855 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/JPEGLSImageWriteParam.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JPEGLSImageWriteParam extends ImageWriteParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java index acabcb9574..e7f8f42e25 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/LookupTableCV.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LookupTableCV { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java index 5fb6dafc32..b81b85f697 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/MemoryStreamSegment.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MemoryStreamSegment extends StreamSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java index aebc01e074..cc8ddb55ab 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeImageReader.java @@ -52,7 +52,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeImageReader extends ImageReader implements Closeable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java index 13e0490a68..3303f8316d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageReaderSpi.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJ2kImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java index 22e4987b58..46cd6f6a3b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriter.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJ2kImageWriter extends ImageWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java index 654a8c46a8..e7ea0f3c25 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJ2kImageWriterSpi.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJ2kImageWriterSpi extends ImageWriterSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java index c5a1c71c3c..8c26529246 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageReaderSpi.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJLSImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java index 282b549607..e37a107c5b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriter.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJLSImageWriter extends ImageWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java index 8094c4bd0d..52235a65d9 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJLSImageWriterSpi.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJLSImageWriterSpi extends ImageWriterSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java index 3b96992b4e..b97ac572b5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageReaderSpi.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJPEGImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java index b144099df1..d7aad99c7b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriter.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJPEGImageWriter extends ImageWriter { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java index 40dadacbd5..5b86ce06bb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/NativeJPEGImageWriterSpi.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeJPEGImageWriterSpi extends ImageWriterSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java index 496ea588d2..997851d8bb 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/PlanarImage.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface PlanarImage extends ImageSize, AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java index b0e37fc1a1..5e971931d5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/SOFSegment.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SOFSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java index d05ca07b40..e549449dc2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/StreamSegment.java @@ -46,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class StreamSegment { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java index ff6aa6719c..f6e0d86508 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledAlgorithm.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TiledAlgorithm { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledProcessor.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledProcessor.java index 8409358159..272f22c902 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledProcessor.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/opencv/TiledProcessor.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TiledProcessor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java index e1da4734ad..1f5808ab04 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReader.java @@ -61,7 +61,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeDCMImageReader extends ImageReader implements Closeable { @@ -856,7 +856,7 @@ public double getPixelValue(int frameIndex, int row, int column) throws IOExcept /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public static class NativeDCMImageReadParam extends ImageReadParam { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java index d6f86740aa..b025ab8b67 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeDCMImageReaderSpi.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeDCMImageReaderSpi extends ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java index 8b99cff958..2bcbc30f01 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReader.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeRLEImageReader extends javax.imageio.ImageReader { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java index 0e19a32e28..aedf6a58ff 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/reader/NativeRLEImageReaderSpi.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NativeRLEImageReaderSpi extends javax.imageio.spi.ImageReaderSpi { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java index 7f09afcd74..36398f2bfc 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImageInputStreamAdapter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageInputStreamAdapter extends InputStream { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java index e557dcc48a..c8e7d7be4f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/ImagePixelInputStream.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImagePixelInputStream extends MemoryCacheImageInputStream diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java index e16ad4bcbb..7b58f09178 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/OutputStreamAdapter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OutputStreamAdapter extends ImageOutputStreamImpl { diff --git a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java index 456b68dade..3fb27ff63d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java +++ b/bus-image/src/main/java/org/aoju/bus/image/nimble/stream/SegmentedImageStream.java @@ -42,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SegmentedImageStream extends ImageInputStreamImpl { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java index fe82c5df5f..8d0a6a3f2b 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CFind.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CFind { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java index cee9be4002..e14a493dca 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CGet.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CGet { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java index 77b17f6252..859810531d 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CMove.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CMove { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java index c285bd3e7d..8ac4eefe94 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/CStore.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CStore { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java index 6b291d3cf5..8c0d383219 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Dcm.java @@ -57,7 +57,7 @@ * DCM解压缩/转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Dcm2Dcm { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java index 27cd06c84f..eae17478f1 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Jpg.java @@ -48,7 +48,7 @@ * DCM-JPG转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Dcm2Jpg { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java index d60ede1feb..bb6f880178 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Str.java @@ -41,7 +41,7 @@ * DCM-JPG转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Dcm2Str extends SimpleFileVisitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java index 9bdd26929e..2c3150a43f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Dcm2Xml.java @@ -48,7 +48,7 @@ * DCM-XML转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Dcm2Xml { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java index 3218d581f4..30c082cd2b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDir.java @@ -51,7 +51,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DcmDir { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java index d25d7e09c9..4b8cd88ab2 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/DcmDump.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DcmDump implements ImageInputHandler { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java index 3acacbf6c6..58e6a100a5 100644 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Echo.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Echo { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java index f8e81b1d70..0f110ff0a0 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Emf2sf.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Emf2sf { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java index a698a4c155..895fb9b6ab 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/FindSCU.java @@ -61,7 +61,7 @@ * findscu只支持使用C-FIND消息的查询功能 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FindSCU extends Device implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java index acf8b3a243..e6541f7bef 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/FixLO2UN.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FixLO2UN extends SimpleFileVisitor { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java index cd873c9e56..50d57cad8d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/GetSCU.java @@ -49,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GetSCU implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java index f1fa73b36c..a215a764f7 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL72Xml.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL72Xml { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java index 97d8b49967..255226daab 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Pix.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Pix extends Device { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java index 052476a283..361c885f38 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Rcv.java @@ -46,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Rcv { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java index 0f9ff50fbd..ab5d23d361 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/HL7Snd.java @@ -42,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HL7Snd extends Device { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java index 4fdba12661..b11ee8114b 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCP.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IanSCP extends Device { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java index 6920b5c4dc..30f9e17539 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/IanSCU.java @@ -46,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IanSCU { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java index 94ffcb00d9..229b7e549a 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Jpg2Dcm.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Jpg2Dcm { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java index b4c899adc6..776a7919cd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MkKOS.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MkKOS { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java index cdd5b8b2c2..32f319125f 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Modality.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Modality { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java index 8055a56be3..5fb49c6ca5 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MoveSCU.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MoveSCU extends Device implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java index 0d7c5c56fd..3c71420ddd 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCP.java @@ -50,7 +50,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MppsSCP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java index a9f14cf4a0..e935fed512 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/MppsSCU.java @@ -49,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MppsSCU { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java index 6f9dc369a7..8112813ad3 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Pdf2Dcm.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java index 03140165e7..c1f56db94d 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/StgSCU.java @@ -52,7 +52,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StgSCU { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java index d831801fb8..3c2109a5e8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCP.java @@ -49,7 +49,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StoreSCP extends BasicCStoreSCP { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java index 016552c14f..197afc65a4 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/StoreSCU.java @@ -56,7 +56,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StoreSCU implements AutoCloseable { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java index 7f5e0c576d..c242608719 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2Dcm.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Xml2Dcm { diff --git a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java index 29e1541f0e..6dec2fcbf8 100755 --- a/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java +++ b/bus-image/src/main/java/org/aoju/bus/image/plugin/Xml2HL7.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Xml2HL7 { diff --git a/bus-limiter/pom.xml b/bus-limiter/pom.xml index 48a2d359d2..d0d1be470f 100755 --- a/bus-limiter/pom.xml +++ b/bus-limiter/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-limiter - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java index dda1d47931..009b3ee3aa 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Handler.java @@ -35,7 +35,7 @@ * limiter 降级策略应该由limiter本身实现,这里只是一个简单的替代方案 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Handler { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java index 850c4d5113..33efbdef71 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Injector.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Injector { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java index f43fd61468..26e78fc439 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Limiter.java @@ -32,7 +32,7 @@ * 限制器件的定义 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java index 986d29f0cb..b9165217b8 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Parser.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Parser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java index 44e35e9d42..4c80c807d1 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/Resolver.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Resolver { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java index ad1cc046fe..c814c7b369 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/LimiterParameter.java @@ -34,7 +34,7 @@ * 限流参数 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target(ElementType.FIELD) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java index 76f0d37a5e..9fadf3a9cc 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Lock.java @@ -33,7 +33,7 @@ * 锁 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java index 1d880accd8..ee969af563 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Locks.java @@ -34,7 +34,7 @@ * 锁 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java index 47992c72d2..06aabecc7d 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/Peak.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java index 937b077b60..5d678a8eaa 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/annotation/RateLimiter.java @@ -33,7 +33,7 @@ * 限流 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE}) diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java index 1d230e19f1..6f414a30c8 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimitContextsValueWrapper.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimitContextsValueWrapper { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java index d594eaf205..8d75db8402 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/execute/LimiterExecutionContext.java @@ -46,7 +46,7 @@ * limiter 上下文信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimiterExecutionContext { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java index c6da46c7e1..49f24babe3 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterExpressionRootObject.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimiterExpressionRootObject { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java index b910b235b6..6bda113734 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/expression/LimiterOperationExpressionEvaluator.java @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimiterOperationExpressionEvaluator { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java index 572fe3896a..3fce125c39 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/BeanFactoryLimitedResourceSourceAdvisor.java @@ -33,7 +33,7 @@ * 实际的切面 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanFactoryLimitedResourceSourceAdvisor extends AbstractBeanFactoryPointcutAdvisor { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java index c0bb582a45..2e28e6aaf2 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimitedResourceSourcePointcut.java @@ -37,7 +37,7 @@ * 切点抽象定义 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ abstract class LimitedResourceSourcePointcut extends StaticMethodMatcherPointcut implements Serializable { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java index d95f157d83..e17ff0cf18 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterAspectSupport.java @@ -49,7 +49,7 @@ * 使用beanfactory的一些基础设施 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class LimiterAspectSupport implements BeanFactoryAware, InitializingBean, SmartInitializingSingleton { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java index 61d1cbdbca..bee18e98c4 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/intercept/LimiterInterceptor.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimiterInterceptor extends LimiterAspectSupport implements MethodInterceptor, Serializable { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java index 26fc7e9086..f9e72e3f91 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/AbstractLimitedResourceMetadata.java @@ -42,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractLimitedResourceMetadata implements LimitedResourceMetadata, Observer { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java index 3420410ce8..1bec4f2204 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceKey.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimitedResourceKey implements Comparable { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java index bfa6ff5c0e..06a394a658 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadata.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface LimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java index 1303ad0fe2..348f2ea2d9 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/metadata/LimitedResourceMetadataCache.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimitedResourceMetadataCache { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java index 5ab6ffb82c..84b01a445e 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/AbstractLimitedResource.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractLimitedResource extends Observable implements LimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java index 041b022dc9..2a820f5595 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/DefaultLimitedResourceSource.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultLimitedResourceSource implements LimitedResourceSource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java index 32219b2700..9530c10ab2 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResource.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface LimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java index b468d6b820..8c764b8188 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceScanner.java @@ -47,7 +47,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimitedResourceScanner implements LimitedResourceSource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java index 7d20db16e6..7e04ba94df 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/resource/LimitedResourceSource.java @@ -32,7 +32,7 @@ * 获取限流规则 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface LimitedResourceSource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java index 305bb6ab04..864bd39555 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/Lock.java @@ -33,7 +33,7 @@ * Lock * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class Lock implements Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java index 15e8dc5c1c..2676568ab2 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockAnnotationParser.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LockAnnotationParser extends AbstractParser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java index 012389e9fa..e6d0912b6d 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResource.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LockResource extends AbstractLimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java index f50b414492..5ed4f57147 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/LockResourceMetadata.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LockResourceMetadata extends AbstractLimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java index 8480057469..1fc17db523 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/jdk/JdkLock.java @@ -35,7 +35,7 @@ * 基于ConcurrentHashMap和ReentrantLock实现的一个简单的锁组件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkLock extends org.aoju.bus.limiter.support.lock.Lock { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java index 89a93fb0e6..bdf3b9708a 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/redis/RedisLock.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RedisLock extends Lock { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java index a9017e26db..c983ba62e8 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/lock/zookeeper/ZookeeperLock.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ZookeeperLock extends Lock { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java index 3952688995..bfaf648380 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiter.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class PeakLimiter implements Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java index e6ae52e922..fa75094f8a 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterAnnotationParser.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PeakLimiterAnnotationParser extends AbstractParser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java index 8d42673a33..cb6b7e5215 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResource.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PeakLimiterResource extends AbstractLimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java index d739b2ba12..920851a007 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/PeakLimiterResourceMetadata.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PeakLimiterResourceMetadata extends AbstractLimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java index 108a7f78dc..bfdd17263a 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/jdk/JdkPeakLimiter.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkPeakLimiter extends PeakLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java index f74b3aafc2..a29df9e4e2 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/peak/redis/RedisPeakLimiter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RedisPeakLimiter extends PeakLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java index 731b1408d3..19ea92f2e4 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/AbstractParser.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractParser, V extends Annotation> implements Parser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java index e36ff11106..2b35bb93c3 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class RateLimiter implements Limiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java index 032e18be1b..0b6c9adfd8 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterAnnotationParser.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RateLimiterAnnotationParser extends AbstractParser { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java index b4a0485158..76943651fb 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResource.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RateLimiterResource extends AbstractLimitedResource { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java index a66d8e2120..14ce9c6cb1 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/RateLimiterResourceMetadata.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RateLimiterResourceMetadata extends AbstractLimitedResourceMetadata { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java index eadfcebf6e..0caea64a34 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/JdkRateLimiter.java @@ -37,7 +37,7 @@ * 一个RateLimiter组件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkRateLimiter extends RateLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java index 9bd8737e3a..61902232e6 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/jdk/RateLimiterObject.java @@ -29,7 +29,7 @@ * 基于令牌桶实现的速率限制器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RateLimiterObject { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java index 72d42ee23b..a999e7eaf0 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiter.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RedisRatelimiter extends RateLimiter { diff --git a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java index 528efcde9d..6a0278f0ac 100755 --- a/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java +++ b/bus-limiter/src/main/java/org/aoju/bus/limiter/support/rate/redis/RedisRatelimiterObject.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RedisRatelimiterObject extends RedissonObject { diff --git a/bus-logger/pom.xml b/bus-logger/pom.xml index 664cc5dec1..389c4daf7d 100644 --- a/bus-logger/pom.xml +++ b/bus-logger/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-logger - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java b/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java index b6b581e32c..2238391667 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/AbstractAware.java @@ -36,7 +36,7 @@ * 实现了一些通用的接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ public abstract class AbstractAware implements Log, Serializable { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java index 9497723ab8..8e731de81f 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/GlobalFactory.java @@ -37,7 +37,7 @@ * 用于减少日志工厂创建,减少日志库探测 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GlobalFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/Log.java b/bus-logger/src/main/java/org/aoju/bus/logger/Log.java index 4b9a5b1154..7282292d62 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/Log.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/Log.java @@ -31,7 +31,7 @@ * 日志统一接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Log extends TraceLog, DebugLog, InfoLog, WarnLog, ErrorLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java index 8c3c01f1cb..73005cbeb8 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/LogFactory.java @@ -40,7 +40,7 @@ * 日志工厂类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java b/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java index 94e70cf0c7..8b0f15da61 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/Logger.java @@ -33,7 +33,7 @@ * 静态日志类,用于在不引入日志对象的情况下打印日志 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Logger { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java index 7845d875df..99cb76e496 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog.java @@ -36,7 +36,7 @@ * Apache Commons Logging * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApacheCommonsLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java index 385293be14..399bbb531e 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLog4JLog.java @@ -33,7 +33,7 @@ * Apache Commons Logging for Log4j * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApacheCommonsLog4JLog extends Log4jLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java index bfc1e88916..7009cfe442 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/commons/ApacheCommonsLogFactory.java @@ -32,7 +32,7 @@ * Apache Commons Logging * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ApacheCommonsLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java index 69191a0aac..664a5ef80b 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLog.java @@ -38,7 +38,7 @@ * 利用System.out.println()打印日志 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConsoleLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java index 76799e29ec..7e43b3972b 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/console/ConsoleLogFactory.java @@ -32,7 +32,7 @@ * 利用System.out.println()打印日志 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConsoleLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java index ec10e0bf58..09f7231e38 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLog.java @@ -35,7 +35,7 @@ * Jboss-Logging log. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JbossLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java index 227fad2521..b5a8b88b3c 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jboss/JbossLogFactory.java @@ -32,7 +32,7 @@ * Jboss-Logging * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JbossLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java index c07f834483..353b02cf77 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLog.java @@ -37,7 +37,7 @@ * java.util.logging log. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java index b6c531dacb..e03f21ae37 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/jdk/JdkLogFactory.java @@ -39,7 +39,7 @@ * java.util.logging * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdkLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java index 6af953a159..4e768a9cfa 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLog.java @@ -35,7 +35,7 @@ * Apache Log4J log. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Log4jLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java index 1fa295fb80..c4afbbb7a9 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j/Log4jLogFactory.java @@ -32,7 +32,7 @@ * Apache Log4J * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Log4jLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java index e0e7df223b..71ac792b85 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2Log.java @@ -36,7 +36,7 @@ * Apache Log4J 2 log. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Log4j2Log extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java index 2f2ba51ce5..74180c1502 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/log4j2/Log4j2LogFactory.java @@ -32,7 +32,7 @@ * Apache Log4J 2 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Log4j2LogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java index 5c337453c2..4f79da5086 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLog.java @@ -38,7 +38,7 @@ * 无缝支持 LogBack * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Slf4jLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java index edf076f58f..e1ac2a93f1 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/slf4j/Slf4jLogFactory.java @@ -40,7 +40,7 @@ * 无缝支持LogBack * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Slf4jLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java index bd85d034c2..2696987095 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLog.java @@ -40,7 +40,7 @@ * tinylog2 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TinyLog extends AbstractAware { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java index 201d71d1f7..bb63a4d7a2 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/dialect/tinylog/TinyLogFactory.java @@ -32,7 +32,7 @@ * TinyLog2 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TinyLogFactory extends LogFactory { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java index 049de217ca..84107fed26 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/DebugLog.java @@ -29,7 +29,7 @@ * DEBUG级别日志接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DebugLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java index 74c5b19770..6d63847a0a 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/ErrorLog.java @@ -29,7 +29,7 @@ * ERROR级别日志接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ErrorLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java index ab3efea7d9..912f62571c 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/InfoLog.java @@ -29,7 +29,7 @@ * INFO级别日志接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface InfoLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java index b08ab08477..82ddd24ce4 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/Level.java @@ -29,7 +29,7 @@ * 日志等级 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Level { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java index c631e3d802..38a1f889d6 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/TraceLog.java @@ -29,7 +29,7 @@ * TRACE级别日志接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TraceLog { diff --git a/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java b/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java index ada32f0299..7277bfa30c 100755 --- a/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java +++ b/bus-logger/src/main/java/org/aoju/bus/logger/level/WarnLog.java @@ -29,7 +29,7 @@ * WARN级别日志接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface WarnLog { diff --git a/bus-mapper/pom.xml b/bus-mapper/pom.xml index 87cf46dce5..ffa3f7f66d 100755 --- a/bus-mapper/pom.xml +++ b/bus-mapper/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-mapper - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java index 345ebd9685..5b497e7cff 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/ColumnType.java @@ -39,7 +39,7 @@ * 针对列的复杂属性配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.FIELD}) diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java index b682a778ea..1102f54009 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/NameStyle.java @@ -36,7 +36,7 @@ * 名字转换样式,注解的优先级高于全局配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.TYPE}) diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java index a690b73bb4..a5ca80f8ed 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/annotation/Version.java @@ -37,7 +37,7 @@ * 版本信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.FIELD}) diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java index 399c34663d..cf4abed937 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/EntityBuilder.java @@ -51,7 +51,7 @@ * 实体类工具类 - 处理实体和数据库表以及字段 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EntityBuilder { @@ -192,7 +192,7 @@ public static synchronized void initEntityNameMap(Class entityClass, Config c } for (EntityField field : fields) { //如果启用了简单类型,就做简单类型校验,如果不是简单类型,直接跳过 - //6.1.5 如果启用了枚举作为简单类型,就不会自动忽略枚举类型 + //6.1.6 如果启用了枚举作为简单类型,就不会自动忽略枚举类型 if (config.isUseSimpleType() && !(SimpleType.isSimpleType(field.getJavaType()) || diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java index 8123b77c5f..e896bb371b 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/FieldSourceBuilder.java @@ -42,7 +42,7 @@ * 类字段工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FieldSourceBuilder { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java index bafcf34e1c..cff1c473b6 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperBuilder.java @@ -47,7 +47,7 @@ * 处理主要逻辑,最关键的一个类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapperBuilder { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java index 03011beb0a..a630d4cd4c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/MapperTemplate.java @@ -55,7 +55,7 @@ * 通用Mapper模板类,扩展通用Mapper时需要继承该类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java index 92ed5e28a4..52cdd28293 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/OGNL.java @@ -36,7 +36,7 @@ * OGNL静态方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class OGNL { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java index 194b336a1c..dc43846ed6 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/builder/SqlSourceBuilder.java @@ -39,7 +39,7 @@ * 拼常用SQL的工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlSourceBuilder { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java index 0ed335fc1b..67fccbb1cb 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/BasicMapper.java @@ -34,7 +34,7 @@ * 通用Mapper接口,其他接口继承该接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BasicMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java index 3052a8be5c..35bdd0a64d 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ConditionMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ConditionMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java index 14bfc61434..82846909cc 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/IdsMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,根据ids操作 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IdsMapper extends SelectByIdsMapper, DeleteByIdsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java index 49d5c0089a..821b65f9d9 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Mapper.java @@ -29,7 +29,7 @@ * 通用Mapper接口,其他接口继承该接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Mapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java index d057876d3b..85f773daf3 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/Marker.java @@ -29,7 +29,7 @@ * 标记接口,继承该接口的接口,在MapperScannerConfigurer#setMarkerInterface时,会自动注册到通用Mapper * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Marker { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java index 9d2fd29dad..c4581c848f 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/RowBoundsMapper.java @@ -32,7 +32,7 @@ * 配合分页插件可以实现物理分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface RowBoundsMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java index 6b31b1ba87..2f3341a90a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicDeleteMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,基础删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BasicDeleteMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java index e78845996c..3ec4504e62 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicInsertMapper.java @@ -33,7 +33,7 @@ * 通用Mapper接口,基础查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BasicInsertMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java index 1b5d4d3433..b530712ddc 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicSelectMapper.java @@ -31,7 +31,7 @@ * 通用Mapper接口,基础查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BasicSelectMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java index 9eec4f40ac..dd6ac5b3f0 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/BasicUpdateMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,基础查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BasicUpdateMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java index 02caded6fa..035281bff5 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteByPrimaryKeyMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DeleteByPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java index d1cf56492d..022c3f02b2 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/delete/DeleteMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DeleteMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java index 12bbb325f3..54735aeb84 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertListMapper.java @@ -35,7 +35,7 @@ * 通用Mapper接口,特殊方法,批量插入,支持批量插入的数据库都可以使用,例如mysql,h2等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface InsertListMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java index 2f1845b22e..8c60d2bba4 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface InsertMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java index 1c2897bffe..998252013e 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/insert/InsertSelectiveMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface InsertSelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java index d85c6a85b9..ff76310735 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/ExistsWithPrimaryKeyMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ExistsWithPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java index 783e1d7ec8..148d07e833 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectAllMapper.java @@ -34,7 +34,7 @@ * 通用Mapper接口,查询全部 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectAllMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java index 2dfabe6351..6eac9307cc 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectByPrimaryKeyMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,其他接口继承该接口即可 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectByPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java index 4f7fe22746..ad856cf4c9 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectCountMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectCountMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java index ff3f26daf6..a787c4d391 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectMapper.java @@ -34,7 +34,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java index e86f9a63f4..5da468335a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/select/SelectOneMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectOneMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java index d0c88173bf..ae22c80904 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeyMapper.java @@ -33,7 +33,7 @@ * 通用Mapper接口,更新 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UpdateByPrimaryKeyMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java index a4d21267f8..4a5d9a4d02 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/basic/update/UpdateByPrimaryKeySelectiveMapper.java @@ -33,7 +33,7 @@ * 通用Mapper接口,更新 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UpdateByPrimaryKeySelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java index a2f8774e91..cf26ce4c4e 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/DeleteByConditionMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DeleteByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java index 02c03beaf9..520ffa37e8 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectByConditionMapper.java @@ -34,7 +34,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java index 3aa1c4872e..bf71f6b1ad 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/SelectCountByConditionMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectCountByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java index b5280a9519..155d1e2991 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionMapper.java @@ -34,7 +34,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UpdateByConditionMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java index af70304282..9351292b4a 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/condition/UpdateByConditionSelectiveMapper.java @@ -34,7 +34,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface UpdateByConditionSelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java index d1792a2c33..052fdf87fa 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/SqlServerMapper.java @@ -33,7 +33,7 @@ * 通用Mapper接口,SqlServerMapper独有的通用方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SqlServerMapper extends diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java index 79368fa999..291c7b3f48 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertMapper.java @@ -33,7 +33,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface InsertMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java index bfd8004ab2..357f6ab4b8 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/dialect/sqlserver/InsertSelectiveMapper.java @@ -33,7 +33,7 @@ * 通用Mapper接口,插入 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface InsertSelectiveMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java index b9fb44dbe7..70f47b9011 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/DeleteByIdsMapper.java @@ -32,7 +32,7 @@ * 通用Mapper接口,根据ids删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DeleteByIdsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java index 79b2eee3d7..c9b80c272e 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/ids/SelectByIdsMapper.java @@ -34,7 +34,7 @@ * 通用Mapper接口,根据ids查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectByIdsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java index d23c51c4cf..629ddf9b96 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectByConditionRowBoundsMapper.java @@ -35,7 +35,7 @@ * 通用Mapper接口,Condition查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectByConditionRowBoundsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java index 37eb05069b..5842a35739 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/common/rowbounds/SelectRowBoundsMapper.java @@ -35,7 +35,7 @@ * 通用Mapper接口,查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SelectRowBoundsMapper { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java index 7fa72b769b..71d275252c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Assert.java @@ -34,7 +34,7 @@ * 规则处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Assert { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java index 533d5172c4..948ae2b157 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criteria.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Criteria { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java index 32d6a51197..602b399d74 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Criterion.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Criterion { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java index 5d1510033e..77b0022a04 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Identity.java @@ -29,7 +29,7 @@ * 主键处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Identity { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java index a0e4cfd177..c84f41d17f 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/OrderBy.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OrderBy { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java index 7062b5bb94..366f588f95 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SimpleType.java @@ -38,7 +38,7 @@ * 参考 org.apache.ibatis.type.SimpleTypeRegistry * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleType { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java index 0e4bfb6624..67411898ec 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/SqlsCriteria.java @@ -29,7 +29,7 @@ * 条件处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SqlsCriteria { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java index 9bb9522566..5df12df71c 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Style.java @@ -29,7 +29,7 @@ * 字段转换方式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Style { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java index fd7b1fbb4a..7280be55e9 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/criteria/Words.java @@ -32,7 +32,7 @@ * 关键字处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Words { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java index bb1730bbb8..96a372b580 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Condition.java @@ -38,7 +38,7 @@ * 通用查询对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Condition implements EntityTableName { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java index 5751b77492..0157e202cb 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/Config.java @@ -40,7 +40,7 @@ * 通用Mapper属性配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Config { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java index 061f49b06c..811ea3b9b2 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityColumn.java @@ -34,7 +34,7 @@ * 数据库表对应的列 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EntityColumn { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java index 9bd7d40265..97e6f65708 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityField.java @@ -34,7 +34,7 @@ * 封装字段和方法,统一调用某些方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EntityField { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java index 2e5251d18a..157dc3f470 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTable.java @@ -45,7 +45,7 @@ * 数据库表 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EntityTable { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java index 96440d8434..76232d47b6 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/entity/EntityTableName.java @@ -29,7 +29,7 @@ * 实现动态表名时,实体类需要实现该接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface EntityTableName { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java index 8ab0c26f60..220fe790e3 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/executor/SelectKey.java @@ -49,7 +49,7 @@ * 主键处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SelectKey implements KeyGenerator { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java index 9940bafe7e..a34961d32c 100644 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/handlers/AbstractSqlHandler.java @@ -38,7 +38,7 @@ * SQL 解析处理器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSqlHandler { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java index 34c8e40cba..3076fbe12e 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseDeleteProvider.java @@ -34,7 +34,7 @@ * BaseDeleteMapper实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaseDeleteProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java index eb92c69cd2..3ca820ac28 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseInsertProvider.java @@ -42,7 +42,7 @@ * BaseInsertProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaseInsertProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java index 4d8be7f680..777f47f635 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseSelectProvider.java @@ -34,7 +34,7 @@ * BaseSelectProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaseSelectProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java index 0caa594229..1fa227bb0f 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/BaseUpdateProvider.java @@ -34,7 +34,7 @@ * BaseUpdateProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaseUpdateProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java index c7c4da8823..89dd1bd299 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/ConditionProvider.java @@ -34,7 +34,7 @@ * ConditionProvider实现类,基础方法实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConditionProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java index 18f543f72c..320d6367de 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/EmptyProvider.java @@ -33,7 +33,7 @@ * 如BaseSelectMapper,接口纯继承,不包含任何方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EmptyProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java index 085cb8202c..26268f2abf 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/IdsProvider.java @@ -40,7 +40,7 @@ * ids 如 "1,2,3" * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IdsProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java index 6fe5f160e8..61e4156dd8 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/InsertListProvider.java @@ -40,7 +40,7 @@ * ids 如 "1,2,3" * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InsertListProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java index 1966d64c68..ae030609a3 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/provider/SqlServerProvider.java @@ -34,7 +34,7 @@ * SqlServerProvider实现类,特殊方法实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlServerProvider extends MapperTemplate { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java index ff78eb2fd6..ea0385bb8b 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/reflection/Reflector.java @@ -33,7 +33,7 @@ * 反射工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Reflector { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java index bfecb98ab7..b43ffabce1 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/DefaultVersion.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultVersion implements NextVersion { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java index 6cc310d62f..d9f414b0d2 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/NextVersion.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface NextVersion { diff --git a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java index d518d05066..1725dd475e 100755 --- a/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java +++ b/bus-mapper/src/main/java/org/aoju/bus/mapper/version/VersionException.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class VersionException extends RuntimeException { diff --git a/bus-notify/README.md b/bus-notify/README.md index 58f982e527..ae28bb2f16 100755 --- a/bus-notify/README.md +++ b/bus-notify/README.md @@ -11,7 +11,7 @@ org.aoju bus-notify - 6.1.5 + 6.1.6 ``` diff --git a/bus-notify/pom.xml b/bus-notify/pom.xml index 6c4d36b37b..57521e875c 100755 --- a/bus-notify/pom.xml +++ b/bus-notify/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-notify - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java b/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java index a8aa4addaf..8217ed9e8f 100755 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Builder.java @@ -35,7 +35,7 @@ * 构造信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Setter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Context.java b/bus-notify/src/main/java/org/aoju/bus/notify/Context.java index cbda135a45..f448ebe258 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Context.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Context.java @@ -32,7 +32,7 @@ * 配置信息 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Data diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java b/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java index e643aae004..03b6487e70 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Provider.java @@ -36,7 +36,7 @@ * 通知器,用于发送通知,如: 短信,邮件,语音,微信等s * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public interface Provider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java b/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java index 3e8ac14307..1da88de2c2 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/Registry.java @@ -29,7 +29,7 @@ * 通知注册器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Registry { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java index bf19e815a0..b45f84e51c 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Message.java @@ -32,7 +32,7 @@ * 返回消息 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Data diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java index 1d98d5b015..be42fdb5e6 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/magic/Property.java @@ -33,7 +33,7 @@ * 消息模版 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java b/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java index ae1c08e92c..5e37d02b8c 100755 --- a/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/metric/NotifyCache.java @@ -33,7 +33,7 @@ * 默认缓存实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum NotifyCache implements ExtendCache { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java index 1589095030..34bd992ac7 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/AbstractProvider.java @@ -37,7 +37,7 @@ * 抽象类 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @AllArgsConstructor diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java index a6d35a3c9e..e163c1fcad 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProperty.java @@ -34,7 +34,7 @@ * 阿里云邮件模版 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java index cd9740e293..bdcb9e42ed 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunDmProvider.java @@ -41,7 +41,7 @@ * 阿里云邮件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AliyunDmProvider extends AliyunProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java index cc0d3a7630..ddcc48f96a 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunProvider.java @@ -51,7 +51,7 @@ * 阿里云抽象类提供者 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class AliyunProvider extends AbstractProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java index 77f1debafd..cb28f16930 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProperty.java @@ -34,7 +34,7 @@ * 阿里云短信模版 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java index 78602b59f5..ef8a908209 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunSmsProvider.java @@ -38,7 +38,7 @@ * 阿里云短信 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class AliyunSmsProvider extends AliyunProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java index 6baa3de906..58acfa3dec 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProperty.java @@ -34,7 +34,7 @@ * 阿里云语音通知模版 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java index d34a6efe0b..2ad054912d 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/aliyun/AliyunVmsProvider.java @@ -38,7 +38,7 @@ * 阿里云语音通知 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class AliyunVmsProvider extends AliyunProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java index adefc3f9ed..e3854bf34e 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProperty.java @@ -34,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java index 1dadbfb834..2b2aabeb6c 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/baidu/BaiduSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class BaiduSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java index ac1b3818d3..5d65ee631d 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProperty.java @@ -34,7 +34,7 @@ * 钉钉通知模版 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java index a23e89cb8c..aa2b3240cf 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/dingtalk/DingTalkProvider.java @@ -44,7 +44,7 @@ * 钉钉通知 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Setter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java index 564a41553f..8d71283573 100755 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProperty.java @@ -38,7 +38,7 @@ * 邮件消息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java index e23ba5d266..ceaab5d65d 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/generic/NativeDmProvider.java @@ -52,7 +52,7 @@ * 邮件消息 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class NativeDmProvider extends AbstractProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java index 8b44091687..b47fdd1417 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProperty.java @@ -34,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java index 2c8814f9a0..44ca681697 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/huawei/HuaweiSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class HuaweiSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java index 393a56c195..9e2ad93ca0 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProperty.java @@ -34,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java index b0c3e54ee9..8e95b1a036 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/jdcloud/JdcloudSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class JdcloudSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java index 32a258cbad..87e9796611 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseProvider.java @@ -43,7 +43,7 @@ * 网易云抽象类 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public abstract class NeteaseProvider extends AbstractProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java index 79754b27d1..4527e4503a 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProperty.java @@ -34,7 +34,7 @@ * 网易云短信模版 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java index c1a002d339..0b1f809c60 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/netease/NeteaseSmsProvider.java @@ -11,7 +11,7 @@ * 网易云短信消息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class NeteaseSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java index b0f0d09607..7a326bee6c 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProperty.java @@ -34,7 +34,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java index 1b5e561eeb..5eead79072 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/qiniu/QiniuSmsProvider.java @@ -8,7 +8,7 @@ * 七牛云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class QiniuSmsProvider extends NeteaseProvider { diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java index f114cbe2d5..084bd4c306 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProperty.java @@ -34,7 +34,7 @@ * 腾讯云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ @Getter diff --git a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java index f8ab5edebf..a9e13e67af 100644 --- a/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java +++ b/bus-notify/src/main/java/org/aoju/bus/notify/provider/tencent/QCloudSmsProvider.java @@ -8,7 +8,7 @@ * 腾讯云短信 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class QCloudSmsProvider extends NeteaseProvider { diff --git a/bus-oauth/README.md b/bus-oauth/README.md index ec5f996440..8188cb016f 100755 --- a/bus-oauth/README.md +++ b/bus-oauth/README.md @@ -16,7 +16,7 @@ org.aoju bus-oauth - 6.1.5 + 6.1.6 ``` diff --git a/bus-oauth/pom.xml b/bus-oauth/pom.xml index 6fada2a208..2ac806d7da 100755 --- a/bus-oauth/pom.xml +++ b/bus-oauth/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-oauth - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java index c6b90d87c0..82b400884e 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Builder.java @@ -42,7 +42,7 @@ * 构造URL * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Setter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java index 8f3ec3dd80..6b915e618b 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Complex.java @@ -42,7 +42,7 @@ * ③、如果扩展了对应枚举类时,在{@link Provider#login(Callback)}中可以通过{@code xx.toString()}获取对应的source * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Complex { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java index 9c294fa0c3..1d6b180f71 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Context.java @@ -37,7 +37,7 @@ * 上下文配置类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java index 124715ecde..64bb6134a9 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Provider.java @@ -38,7 +38,7 @@ * {@link Provider#refresh(AccToken)} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java index 250e0e1b4f..216fc44b09 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/Registry.java @@ -31,7 +31,7 @@ * 内置的各api需要的url, 用枚举类分平台类型管理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Registry implements Complex { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java index 947a5def36..5e697424ae 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/AccToken.java @@ -31,7 +31,7 @@ * 授权所需的token * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ @Getter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java index 030db217a4..1e29ff174b 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Callback.java @@ -32,7 +32,7 @@ * 授权回调时的参数类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java index ec9d0b82e3..b0ed87a359 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Message.java @@ -34,7 +34,7 @@ * 统一授权响应类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java index c02437d6a1..beccf42c2d 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/magic/Property.java @@ -33,7 +33,7 @@ * 授权成功后的用户信息,根据授权平台的不同,获取的数据完整性也不同 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java index 0aa3e059bc..d0f5917006 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthCache.java @@ -33,7 +33,7 @@ * 默认缓存实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum OauthCache implements ExtendCache { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java index 5f26b7c580..e994e6a690 100644 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/metric/OauthScope.java @@ -36,7 +36,7 @@ * 各个平台 scope 类的统一接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OauthScope { @@ -45,7 +45,7 @@ public class OauthScope { * 百度 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -71,7 +71,7 @@ public enum Baidu implements Scope { * Coding 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -98,7 +98,7 @@ public enum Coding implements Scope { * Facebook 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -133,7 +133,7 @@ public enum Facebook implements Scope { * Gitee 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -165,7 +165,7 @@ public enum Gitee implements Scope { * Github 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -215,7 +215,7 @@ public enum Github implements Scope { * Gitlab 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -247,7 +247,7 @@ public enum Gitlab implements Scope { * Google 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -707,7 +707,7 @@ public static List getDriveScopes() { * 华为 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -746,7 +746,7 @@ public enum Huawei implements Scope { * 京东 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -768,7 +768,7 @@ public enum Jd implements Scope { * 酷家乐 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -792,7 +792,7 @@ public enum Kujiale implements Scope { * 领英 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -831,7 +831,7 @@ public enum Linkedin implements Scope { * 微软 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -893,7 +893,7 @@ public enum Microsoft implements Scope { * 小米 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -917,7 +917,7 @@ public enum Mi implements Scope { * Pinterest 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -942,7 +942,7 @@ public enum Pinterest implements Scope { * QQ 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -973,7 +973,7 @@ public enum Qq implements Scope { * 人人 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -1023,7 +1023,7 @@ public enum Renren implements Scope { * Stackoverflow 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -1048,7 +1048,7 @@ public enum StackOverflow implements Scope { * 微信公众平台 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -1071,7 +1071,7 @@ public enum WechatMp implements Scope { * 微博 授权范围 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter @@ -1101,7 +1101,7 @@ public enum Weibo implements Scope { * 各个平台 scope 类的统一接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Scope { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java index e9b47ff9e1..e881a4135a 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AbstractProvider.java @@ -58,7 +58,7 @@ * 默认的request处理类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProvider implements Provider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java index 9ab2dce4f1..c22f0cd989 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AlipayProvider.java @@ -50,7 +50,7 @@ * 支付宝登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AlipayProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java index d2eb792c14..d7700d03aa 100644 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/AliyunProvider.java @@ -38,7 +38,7 @@ * 阿里云登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AliyunProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java index f9e5b3891f..e1b28a1d01 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/BaiduProvider.java @@ -45,7 +45,7 @@ * 百度账号登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaiduProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java index 52999e8be8..39e2764858 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/CodingProvider.java @@ -42,7 +42,7 @@ * Cooding登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CodingProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java index 3dea12e75c..73af25b947 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DingTalkProvider.java @@ -48,7 +48,7 @@ * 钉钉登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DingTalkProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java index bf5eb46311..0be3022b7c 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/DouyinProvider.java @@ -42,7 +42,7 @@ * 抖音登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DouyinProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java index 4901f52f8f..a6d0dbe65b 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ElemeProvider.java @@ -55,7 +55,7 @@ * 注:集成的是正式环境,非沙箱环境 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ElemeProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java index 324cd4dd3f..fd2206929f 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/FacebookProvider.java @@ -41,7 +41,7 @@ * Facebook登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FacebookProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java index ced36a40a6..0033887969 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GiteeProvider.java @@ -42,7 +42,7 @@ * Gitee登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GiteeProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java index db2bfa6773..4f8e12e503 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GithubProvider.java @@ -48,7 +48,7 @@ * Github登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GithubProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java index 4c1a1257fc..c95878bdee 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GitlabProvider.java @@ -41,7 +41,7 @@ * Gitlab登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GitlabProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java index b6eb353c71..8e4d5d02ae 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/GoogleProvider.java @@ -46,7 +46,7 @@ * Google登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GoogleProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java index 1837c62004..c3e1e6b673 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/HuaweiProvider.java @@ -46,7 +46,7 @@ * 华为授权登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HuaweiProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java index 6b9bdc0e42..dee1494014 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/JdProvider.java @@ -54,7 +54,7 @@ * 京东账号登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java index eeedbea7d0..4c7176cb19 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/KujialeProvider.java @@ -43,7 +43,7 @@ * 酷家乐授权登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class KujialeProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java index 5990c3904b..1fa9f2ca31 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/LinkedinProvider.java @@ -48,7 +48,7 @@ * 领英登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LinkedinProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java index f983cb3820..af772bddf8 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MeituanProvider.java @@ -45,7 +45,7 @@ * 美团登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MeituanProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java index 8995822c2b..2c8bf7dd4f 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MiProvider.java @@ -47,7 +47,7 @@ * 小米登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MiProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java index cdfd2eb097..70e90d6066 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/MicrosoftProvider.java @@ -49,7 +49,7 @@ * 微软登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MicrosoftProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java index 10211a32a8..3bd8a7ae0a 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/OschinaProvider.java @@ -40,7 +40,7 @@ * oschina登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OschinaProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java index 7a905e1f50..2749ddd545 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/PinterestProvider.java @@ -45,7 +45,7 @@ * Pinterest登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PinterestProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java index 87a5388c05..9e369ba30d 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/QqProvider.java @@ -49,7 +49,7 @@ * qq登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QqProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java index cbff0fb2af..bab485373c 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/RenrenProvider.java @@ -47,7 +47,7 @@ * 人人登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RenrenProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java index eafcb9d0b6..f147dbe0cc 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/StackOverflowProvider.java @@ -47,7 +47,7 @@ * Stack Overflow登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StackOverflowProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java index 43c2592312..1dae1d903e 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TaobaoProvider.java @@ -41,7 +41,7 @@ * 淘宝登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TaobaoProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java index d894108eb7..57cab942f1 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TeambitionProvider.java @@ -45,7 +45,7 @@ * Teambition授权登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TeambitionProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java index 18405e4a78..d38def0249 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TencentProvider.java @@ -40,7 +40,7 @@ * 腾讯云登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TencentProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java index 35ff0fdeb4..fa86cd758b 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/ToutiaoProvider.java @@ -43,7 +43,7 @@ * 今日头条登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ToutiaoProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java index 12cc5af7fe..36350a31b7 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/TwitterProvider.java @@ -52,7 +52,7 @@ * 今日头条登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TwitterProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java index 38e3d3e325..27e2016a3f 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatEEProvider.java @@ -42,7 +42,7 @@ * 企业微信登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WeChatEEProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java index 38feecd36b..bc3b7cb45c 100644 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatMpProvider.java @@ -45,7 +45,7 @@ * 微信公众平台登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WeChatMpProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java index c294971e19..a33dc20ec1 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeChatOPProvider.java @@ -43,7 +43,7 @@ * 微信登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WeChatOPProvider extends AbstractProvider { diff --git a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java index 2ca92532b1..09ecff4d50 100755 --- a/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java +++ b/bus-oauth/src/main/java/org/aoju/bus/oauth/provider/WeiboProvider.java @@ -49,7 +49,7 @@ * 微博登录 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WeiboProvider extends AbstractProvider { diff --git a/bus-office/pom.xml b/bus-office/pom.xml index 4ca9ebb113..3885637363 100755 --- a/bus-office/pom.xml +++ b/bus-office/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-office - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-office/src/main/java/org/aoju/bus/office/Builder.java b/bus-office/src/main/java/org/aoju/bus/office/Builder.java index 0a61a091c8..e8dd81659d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Builder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Builder.java @@ -38,6 +38,9 @@ import org.aoju.bus.office.magic.UnoUrl; import org.aoju.bus.office.magic.family.FamilyType; import org.aoju.bus.office.process.*; +import org.apache.poi.ss.formula.ConditionalFormattingEvaluator; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.ExcelNumberFormat; import java.io.File; import java.util.*; @@ -47,7 +50,7 @@ * 为office提供辅助功能. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Builder { @@ -402,6 +405,48 @@ public static void validateOfficeWorkingDirectory(final File workingDir) { } } + /** + * 某些特殊的自定义日期格式 + */ + private static final int[] customFormats = new int[]{28, 30, 31, 32, 33, 55, 56, 57, 58}; + + public static boolean isDateFormat(Cell cell) { + return isDateFormat(cell, null); + } + + /** + * 判断是否日期格式 + * + * @param cell 单元格 + * @param cfEvaluator {@link ConditionalFormattingEvaluator} + * @return 是否日期格式 + */ + public static boolean isDateFormat(Cell cell, ConditionalFormattingEvaluator cfEvaluator) { + final ExcelNumberFormat nf = ExcelNumberFormat.from(cell, cfEvaluator); + return isDateFormat(nf.getIdx(), nf.getFormat()); + } + + /** + * 判断日期格式 + * + * @param formatIndex 格式索引,一般用于内建格式 + * @param formatString 格式字符串 + * @return 是否为日期格式 + */ + public static boolean isDateFormat(int formatIndex, String formatString) { + if (ArrayKit.contains(customFormats, formatIndex)) { + return true; + } + // 自定义格式判断 + if (StringKit.isNotEmpty(formatString) && + StringKit.containsAny(formatString, "周", "星期", "aa")) { + // aa -> 周一 + // aaa -> 星期一 + return true; + } + return org.apache.poi.ss.usermodel.DateUtil.isADateFormat(formatIndex, formatString); + } + private static File findOfficeHome(final String executablePath, final String... homePaths) { return Stream.of(homePaths) .map(File::new) diff --git a/bus-office/src/main/java/org/aoju/bus/office/Context.java b/bus-office/src/main/java/org/aoju/bus/office/Context.java index 92a5e0271a..71da277408 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Context.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Context.java @@ -29,7 +29,7 @@ * 所有office上下文接口的基本接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Context { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Expense.java b/bus-office/src/main/java/org/aoju/bus/office/Expense.java index 18f0202e81..07407f6b31 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Expense.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Expense.java @@ -35,7 +35,7 @@ * 重定向输出和错误流的进程的包装器类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Expense { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Protocol.java b/bus-office/src/main/java/org/aoju/bus/office/Protocol.java index 68346b2204..1ffff34da9 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Protocol.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Protocol.java @@ -29,7 +29,7 @@ * 表示可用于与正在运行的office实例通信的协议. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Protocol { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Provider.java b/bus-office/src/main/java/org/aoju/bus/office/Provider.java index 70b513b897..a111b81af4 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/Provider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Provider.java @@ -37,7 +37,7 @@ * 负责使用office管理器执行文档的转换. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/Registry.java b/bus-office/src/main/java/org/aoju/bus/office/Registry.java index 6bc9fc7fb5..b4074204b5 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/Registry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/Registry.java @@ -35,7 +35,7 @@ * 支持类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Registry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java index c4bc168715..8a78f91d81 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeBridgeFactory.java @@ -56,7 +56,7 @@ * 负责使用给定的UnoUrl管理到office进程的连接. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LocalOfficeBridgeFactory implements LocalOfficeContextAware, XEventListener { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java index 4667f4b072..2c445235cb 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficeContextAware.java @@ -34,7 +34,7 @@ * 表示用于本地转换的office上下文 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface LocalOfficeContextAware extends Context { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java index a1e8f57128..8e66c69de5 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/LocalOfficePoolManager.java @@ -42,7 +42,7 @@ * 默认的{@link OfficeManager}实现,它使用一个office进程池来执行转换任务. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class LocalOfficePoolManager extends AbstractOfficePoolManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java index 88efc92dd3..38365b805b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeBridgeFactory.java @@ -31,7 +31,7 @@ * 保存与LibreOffice在线服务器通信的请求配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OnlineOfficeBridgeFactory implements OnlineOfficeContextAware { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java index b00a054180..b169593c55 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeContextAware.java @@ -32,7 +32,7 @@ * 表示用于在线转换的office环境. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OnlineOfficeContextAware extends Context { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java index 33c4e50f7e..757471646c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryBuilder.java @@ -32,7 +32,7 @@ * 当不需要office实例来执行转换时,该类保存{@link OnlineOfficeEntryManager}的配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OnlineOfficeEntryBuilder implements OfficeManagerEntryBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java index 22faef397a..dae1b85a34 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficeEntryManager.java @@ -47,7 +47,7 @@ * 它将向LibreOffice在线服务器发送转换请求,并等待任务完成或达到配置的任务执行超时. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OnlineOfficeEntryManager extends AbstractOfficeEntryManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java index 4fcfeebafe..5ac317f23a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolBuilder.java @@ -36,7 +36,7 @@ * 该类提供{@link AbstractOfficePoolManager}的配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OnlineOfficePoolBuilder extends OnlineOfficeEntryBuilder diff --git a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java index 579c376f95..79d56d85a8 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/bridge/OnlineOfficePoolManager.java @@ -37,7 +37,7 @@ * {@link OfficeManager}池实现,不依赖于office安装来处理转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class OnlineOfficePoolManager extends AbstractOfficePoolManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java index e694ba74ef..6ddac54d24 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractJob.java @@ -35,7 +35,7 @@ * 所有转换作业实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractJob implements OptionalTarget { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java index a7c06ad3e7..352e5e6496 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractLocalOffice.java @@ -48,7 +48,7 @@ * 所有本地office任务实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractLocalOffice extends AbstractOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java index debe8b1228..8814746f4d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractNorm.java @@ -42,7 +42,7 @@ * 使用尚未应用于转换器的源格式的所有转换作业实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractNorm implements OptionalSource { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java index 48eab9707b..6202c118f8 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOffice.java @@ -31,7 +31,7 @@ * 所有office任务实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractOffice implements MadeInOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java index 3103c8bc71..85139b38bb 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/AbstractOnlineOffice.java @@ -31,7 +31,7 @@ * 所有在线office任务实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractOnlineOffice extends AbstractOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java index 234830fd9e..bee53ebec1 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/ConvertJob.java @@ -31,7 +31,7 @@ * 尚未应用到转换器的完整指定转换. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ConvertJob { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java index 4110f27c65..ca5c30f2ce 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/JobWithSource.java @@ -32,7 +32,7 @@ * 具有指定转换源的转换作业. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface JobWithSource { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java index ec68ed2fd9..0cb91bab37 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/LocalMadeInOffice.java @@ -49,7 +49,7 @@ * 表示本地转换任务的默认行为. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LocalMadeInOffice extends AbstractLocalOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java index 5e70d2ed14..02b2e70b5f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/MadeInOffice.java @@ -33,7 +33,7 @@ * 表示由{@link OfficeManager}执行的任务. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface MadeInOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java index 0938051032..38fa1da35f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/OnlineMadeInOffice.java @@ -47,7 +47,7 @@ * 表示在线转换任务的默认行为. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OnlineMadeInOffice extends AbstractOnlineOffice { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java index d5f3cdbe36..a26bada211 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalSource.java @@ -31,7 +31,7 @@ * 具有尚未应用于转换器的可选源格式的转换作业. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OptionalSource extends JobWithSource { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java index c736725350..baa97b3932 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/OptionalTarget.java @@ -29,7 +29,7 @@ * 具有尚未应用到转换器的可选目标格式的转换作业. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OptionalTarget extends RequiredTarget, ConvertJob { diff --git a/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java b/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java index bb594ab0c7..6d0ea1bafc 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java +++ b/bus-office/src/main/java/org/aoju/bus/office/builtin/RequiredTarget.java @@ -30,7 +30,7 @@ * 具有所需目标格式但尚未应用到转换器的转换作业. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface RequiredTarget { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java index fb435a7b3a..77f91a0a0c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Calc.java @@ -33,7 +33,7 @@ * 使Office Calc文档(电子表格)更容易使用的实用函数集合. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Calc { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java index 0c44314bbf..a3ecd619db 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Draw.java @@ -32,7 +32,7 @@ * 使office draw文档(Drawing)更容易使用的实用函数集合 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Draw { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java index 63ac48a9b7..d8a7cc3b1c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Info.java @@ -47,7 +47,7 @@ * 实用程序函数,使office信息更容易获取. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Info { @@ -86,7 +86,7 @@ public static String getOfficeName(final XComponentContext context) { } /** - * 获取给定上下文的office产品版本(长版本号),例如e.g 6.1.5.3 + * 获取给定上下文的office产品版本(长版本号),例如e.g 6.1.6.3 * * @param context 上下文. * @return office产品版本,如果无法检索,则为{@code null}. diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java index 35e0d0875d..10e3430c15 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Lo.java @@ -38,7 +38,7 @@ * 实用程序函数,使Office更易于使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Lo { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java index c3e0967361..a1f4efe680 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Props.java @@ -37,7 +37,7 @@ * 实用程序函数,使office属性更易于使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Props { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java b/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java index 5ead55c890..cb3935f22d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/UnoUrl.java @@ -34,7 +34,7 @@ * 这意味着设置java.library.path启动Java时路径 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UnoUrl { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java b/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java index 6c0078b2f8..82d4a84ea0 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/Write.java @@ -33,7 +33,7 @@ * 实用程序函数,使office文本文档(Writer)更容易使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Write { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java index 0c83910b02..fa55a45a4b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DefaultFormatRegistry.java @@ -32,7 +32,7 @@ * 应该足以满足我们的大部分需求. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class DefaultFormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java index 26dd58fae1..c8bccee388 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/DocumentFormat.java @@ -36,7 +36,7 @@ * 包含处理特定文档格式所需的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DocumentFormat { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java index af301581c5..4cff7f5de2 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FamilyType.java @@ -29,7 +29,7 @@ * 表示office支持的文档类型. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum FamilyType { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java index d1554e8472..f321b4f6e4 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatProperties.java @@ -32,7 +32,7 @@ * 包含将在为特定的{@link DocumentFormat}加载(打开)和存储(保存)文档时应用的属性. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FormatProperties { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java index b9cab12b49..8f7c0fac7d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/FormatRegistry.java @@ -31,7 +31,7 @@ * 实现此接口的类应该保留office支持的文档格式集合. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface FormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java index 28d409add8..ebecf4b80d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/JsonFormatRegistry.java @@ -40,7 +40,7 @@ * 包含office支持的{@code DocumentFormat}集合,该集合已从JSON源加载. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JsonFormatRegistry extends SimpleFormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java index 3cc90f5c9d..d2ba85976c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/RegistryInstanceHolder.java @@ -31,7 +31,7 @@ * 保存默认的{@link FormatRegistry}实例. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class RegistryInstanceHolder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java b/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java index 97f880107d..5314324a11 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/family/SimpleFormatRegistry.java @@ -34,7 +34,7 @@ * SimpleDocumentFormatRegistry包含office支持的文档格式集合. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleFormatRegistry implements FormatRegistry { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java index c6390584b6..9adf63b9d5 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/AbstractFilter.java @@ -40,7 +40,7 @@ * 过滤器链的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractFilter implements FilterChain { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java index 7625026f20..54f85e9248 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/DefaultFilter.java @@ -33,7 +33,7 @@ * FilterChain的默认实现. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultFilter extends AbstractFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java index c88ff2d728..392bbfd798 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/Filter.java @@ -32,7 +32,7 @@ * 表示转换文档的步骤. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java index bb5bbf285a..ef60b70d9f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/FilterChain.java @@ -35,7 +35,7 @@ * 或者如果调用过滤器是链中的最后一个过滤器,则结束调用链。 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface FilterChain { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java index 4858972aed..77a03282e7 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/NoopFilter.java @@ -33,7 +33,7 @@ * 这个过滤器除了调用链中的下一个过滤器外什么也不做. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NoopFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java index 1411525856..a23ed56e04 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/PageCounterFilter.java @@ -36,7 +36,7 @@ * 此筛选器用于计算文档的页数. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageCounterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java index 26e38f57ae..dbbc747c9b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/RefreshFilter.java @@ -35,7 +35,7 @@ * 此筛选器用于刷新文档. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RefreshFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java index 3ee81aa24f..aa3659a670 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/UnmodifiableFilter.java @@ -29,7 +29,7 @@ * FilterChain的不可修改的实现. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UnmodifiableFilter extends AbstractFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java index c1805eecfd..dc6c3e082e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/draw/PageSelectorFilter.java @@ -40,7 +40,7 @@ * 此筛选器用于从文档中选择特定页面,以便仅转换所选页面 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageSelectorFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java index 8e6b81346a..e26a9177b9 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/AbstractTextContentInserterFilter.java @@ -39,7 +39,7 @@ * 用于将文本内容插入文档的所有筛选器的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractTextContentInserterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java index ff6259f603..2cf88dfa8c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/DocumentInserterFilter.java @@ -43,7 +43,7 @@ * 此筛选器用于在转换的文档末尾插入文档. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DocumentInserterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java index 556e629541..8d7e0e7801 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/GraphicInserterFilter.java @@ -60,7 +60,7 @@ * 此筛选器用于将图形插入到文档中. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GraphicInserterFilter extends AbstractTextContentInserterFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java index 013c3e1527..345eaf9ee1 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/LinkedImagesEmbedderFilter.java @@ -50,7 +50,7 @@ * 此筛选器用于将图形插入到文档中. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LinkedImagesEmbedderFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java index c860dd77e3..7438cc640d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageMarginsFilter.java @@ -44,7 +44,7 @@ * 此筛选器用于设置要转换的文档的页边距. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageMarginsFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java index b08960d7ea..85dfd7e3cf 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/PageSelectorFilter.java @@ -41,7 +41,7 @@ * 此筛选器用于从文档中选择特定页面,以便仅转换所选页面. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageSelectorFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java index 2b40303815..2cb5f72d62 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TableOfContentUpdaterFilter.java @@ -41,7 +41,7 @@ * 此筛选器更新文档中的所有索引. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TableOfContentUpdaterFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java index 8c7244c288..efaf85b3bd 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextInserterFilter.java @@ -46,7 +46,7 @@ * 筛选器用于将文本插入文档. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TextInserterFilter extends AbstractTextContentInserterFilter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java index a430077fc4..dd5e8bc2e4 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/magic/filter/text/TextReplacerFilter.java @@ -41,7 +41,7 @@ * 此筛选器用于替换文档中的文本. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TextReplacerFilter implements Filter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java index 42900ba79e..d9c81cf90d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeEntryManager.java @@ -38,7 +38,7 @@ * 这个抽象类从未将可用性设置为true 只有当管理器停止时,可用性才设置为false. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractOfficeEntryManager implements OfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java index e258fb505a..0e1b4a0694 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficeManager.java @@ -39,7 +39,7 @@ * 所有{@link OfficeManager}的基类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractOfficeManager implements OfficeManager, TemporaryFileMaker { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java index 188ac99598..2d2c8ad3ed 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractOfficePoolManager.java @@ -41,7 +41,7 @@ * 当调用{@link #execute(MadeInOffice)}函数时,池将使用第一个{@link OfficeProcessEntryManager}来执行给定的任务 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractOfficePoolManager extends AbstractOfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java index 657cb1407a..a256b71f98 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/AbstractRetryable.java @@ -31,7 +31,7 @@ * 该对象将尝试执行任务,直到任务成功或达到特定超时为止. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractRetryable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java index 33cfdcda47..ce5b05b479 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ConnectRetryable.java @@ -34,7 +34,7 @@ * 执行到office进程的连接. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConnectRetryable extends AbstractRetryable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java index 32ef0d5933..fe887a61e3 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ExitCodeRetryable.java @@ -32,7 +32,7 @@ * 获取office进程的退出码值. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExitCodeRetryable extends AbstractRetryable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java index 4424777975..a28364c8ff 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeBuilder.java @@ -33,7 +33,7 @@ * 这个类包含{@link ExternalOfficeManager}的配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExternalOfficeBuilder implements OfficeManagerBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java index ddd7127922..1d6c6d4218 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/ExternalOfficeManager.java @@ -40,7 +40,7 @@ * 但是,如果外部进程是手动重新启动的,那么它将自动重新连接到外部进程 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ExternalOfficeManager extends AbstractOfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java index e6211f7070..3a877994c5 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/InstalledOfficeHolder.java @@ -33,7 +33,7 @@ * 创建的{@link Provider}将使用该实例. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class InstalledOfficeHolder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java index ac97c5d0d6..df868e7a38 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEvent.java @@ -33,7 +33,7 @@ * office连接打开或关闭时引发的事件. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeConnectEvent extends EventObject { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java index 6f6fbe90e6..1b4b730c93 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeConnectEventListener.java @@ -31,7 +31,7 @@ * office连接事件侦听器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OfficeConnectEventListener extends EventListener { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java index 9eda263c14..c1b9a36f58 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManager.java @@ -33,7 +33,7 @@ * 并且在不再需要它时必须停止它。停止后就无法重新启动office管理器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OfficeManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java index 49dd84b021..f75f117975 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerBuilder.java @@ -31,7 +31,7 @@ * 这个类提供了{@link AbstractOfficeManager}的配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OfficeManagerBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java index d1b309d71b..552efd87ca 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerEntryBuilder.java @@ -29,7 +29,7 @@ * 这个接口提供了{@link OfficeProcessEntryManager}的配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OfficeManagerEntryBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java index 896356177c..12b5cc3468 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeManagerPoolBuilder.java @@ -29,7 +29,7 @@ * 这个类提供了{@link AbstractOfficePoolManager}的配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface OfficeManagerPoolBuilder extends OfficeManagerBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java index 53f1cd7b62..bf7fb9c83a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeOption.java @@ -34,7 +34,7 @@ * 包含有关正在使用的office的基本信息. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class OfficeOption { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java index a6929891c6..27e9282bfb 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcess.java @@ -49,7 +49,7 @@ * 表示正在执行的office程序的实例. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeProcess { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java index 96d9fd062d..aa2d3ff118 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessBuilder.java @@ -35,7 +35,7 @@ * 这个类包含{@link OfficeProcess}的配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeProcessBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java index ab01fd311c..d4ded1208c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessEntryManager.java @@ -49,7 +49,7 @@ * OfficeProcessManagerPoolEntry还负责在达到每个进程的最大任务数时重新启动office进程. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeProcessEntryManager extends AbstractOfficeEntryManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java index 7ed9a4a32f..099b819a8b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManager.java @@ -39,7 +39,7 @@ * OfficeProcessManager负责管理一个office流程以及到这个office流程的连接(桥接). * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java index daa213372f..bb761277f4 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerBuilder.java @@ -34,7 +34,7 @@ * 这个类包含{@link OfficeProcessManager}的配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeProcessManagerBuilder extends OfficeProcessBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java index 0dad478a1f..b821992e6d 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerEntryBuilder.java @@ -34,7 +34,7 @@ * 当需要office实例来执行转换时,该类保存{@link OfficeProcessEntryManager}的配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeProcessManagerEntryBuilder extends OfficeProcessManagerBuilder diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java index 5008992f04..f5f68b0ec2 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/OfficeProcessManagerPoolBuilder.java @@ -34,7 +34,7 @@ * 当需要某个office实例执行转换时,该类提供{@link AbstractOfficePoolManager}的配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OfficeProcessManagerPoolBuilder extends OfficeProcessManagerEntryBuilder diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java b/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java index dce1fbc17d..aaf3c8989a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/RequestBuilder.java @@ -29,7 +29,7 @@ * LibreOffice联机通信的请求配置. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RequestBuilder { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java b/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java index f76aeb898b..bf10474a60 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/SuspendableThread.java @@ -36,7 +36,7 @@ * 可以挂起的线程池执行程序,池中只允许有一个线程 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SuspendableThread extends ThreadPoolExecutor { diff --git a/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java b/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java index 2c6b8c1e13..957a0c3ebb 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java +++ b/bus-office/src/main/java/org/aoju/bus/office/metric/TemporaryFileMaker.java @@ -31,7 +31,7 @@ * 提供创建临时文件的服务. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TemporaryFileMaker { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java index ffb7f585aa..6867915167 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/AbstractProcessManager.java @@ -41,7 +41,7 @@ * 包含的所有流程管理器实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProcessManager implements ProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java index cb3b5fa9aa..ba376ad9ad 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/FreeBSDProcessManager.java @@ -29,7 +29,7 @@ * 用于FreeBSD的{@link ProcessManager}实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FreeBSDProcessManager extends UnixProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java b/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java index eb94bccdb9..44a5cbdfd3 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/LinesPumpStreamHandler.java @@ -31,7 +31,7 @@ * 将子进程的标准输出和错误复制到行列表中. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LinesPumpStreamHandler extends PumpStreamHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java b/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java index 653dec90f8..b74f2e837b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/LinesStreamPumper.java @@ -33,7 +33,7 @@ * 从输入流中读取所有行. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LinesStreamPumper extends StreamPumper { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java index e92d9feb32..3d391e4e97 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/MacProcessManager.java @@ -29,7 +29,7 @@ * 用于MAC的{@link ProcessManager}实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MacProcessManager extends UnixProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java index 58739207a9..0c79604b5f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessManager.java @@ -31,7 +31,7 @@ * 提供管理正在运行的流程所需的服务. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java index 3745515f24..97e81f87f0 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/ProcessQuery.java @@ -29,7 +29,7 @@ * 包含用于查询正在运行的进程所需的信息. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProcessQuery { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java b/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java index 6216a1a476..aee94a8aaa 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/PumpStreamHandler.java @@ -29,7 +29,7 @@ * 将子过程的标准输出和错误复制到给定的pumpers. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PumpStreamHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java index ac923e5e35..65e4e5b130 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/PureJavaProcessManager.java @@ -31,7 +31,7 @@ * PureJava 系统流程管理器实现类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PureJavaProcessManager implements ProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java b/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java index 0c03d7308e..942690df2f 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/StreamPumper.java @@ -37,7 +37,7 @@ * 从输入流中读取所有行. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StreamPumper extends Thread { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java index 374719ea81..e1bcaef517 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/UnixProcessManager.java @@ -38,7 +38,7 @@ * 这也适用于Solaris,这将影响{@link #find(ProcessQuery)} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UnixProcessManager extends AbstractProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java b/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java index 59e5ccfb80..ae8725d329 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java +++ b/bus-office/src/main/java/org/aoju/bus/office/process/WindowsProcessManager.java @@ -33,7 +33,7 @@ * 需要wmic.exe和taskkill.exe,至少在Windows XP、Windows Vista和Windows 7上可用(家庭版除外) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WindowsProcessManager extends AbstractProcessManager { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java index 39721c696e..3b4c2b404a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractDocumentProvider.java @@ -34,7 +34,7 @@ * 所有文档规范实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractDocumentProvider implements DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java index 7a7fb68970..85b63423e8 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractProvider.java @@ -44,7 +44,7 @@ * 所有文档转换器实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProvider implements Provider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java index 410417968b..5a27da1d0c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractSourceProvider.java @@ -31,7 +31,7 @@ * 所有源文档规范实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSourceProvider extends AbstractDocumentProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java index a6ad45633c..ff99ec3cc8 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/AbstractTargetProvider.java @@ -31,7 +31,7 @@ * 所有目标文档规范实现的基类. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractTargetProvider extends AbstractDocumentProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java index d5c0dc178d..b23fc5e627 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/DocumentProvider.java @@ -33,7 +33,7 @@ * 为文档提供转换过程所需的物理文件和格式的接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java index 0ab7ce10b1..a2fa1ef0d3 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/LocalOfficeProvider.java @@ -46,7 +46,7 @@ * 必须启动所提供的office管理器才能被此转换器使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LocalOfficeProvider extends AbstractProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java index 4abd388717..d56b804ca7 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/OnlineOfficeProvider.java @@ -38,7 +38,7 @@ * 按预期工作,它必须与在线office管理器一起使用. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OnlineOfficeProvider extends AbstractProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java index 0da5f701ca..3c0a4f24fc 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceDocumentProvider.java @@ -31,7 +31,7 @@ * 当转换过程不再需要源文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SourceDocumentProvider extends DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java index e234f71eb2..fea8d31ec4 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromFileProvider.java @@ -31,7 +31,7 @@ * 当转换过程不再需要源文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SourceFromFileProvider extends AbstractSourceProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java index 529422a1c3..6c816f9069 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/SourceFromInputStreamProvider.java @@ -40,7 +40,7 @@ * 当转换过程不再需要源文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SourceFromInputStreamProvider extends AbstractSourceProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java index 010da10da2..e4f80da615 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetDocumentProvider.java @@ -31,7 +31,7 @@ * 当转换过程不再需要目标文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TargetDocumentProvider extends DocumentProvider { diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java index b6e8c39706..8197aa29bf 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromFileProvider.java @@ -34,7 +34,7 @@ * 当转换过程不再需要目标文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TargetFromFileProvider extends AbstractTargetProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java index a85c149a4a..270bd1eeb3 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java +++ b/bus-office/src/main/java/org/aoju/bus/office/provider/TargetFromOutputStreamProvider.java @@ -39,7 +39,7 @@ * 当转换过程不再需要目标文件时,提供应用行为的接口. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TargetFromOutputStreamProvider extends AbstractTargetProvider diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java b/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java index fea799e95c..eefedb0352 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/PoiChecker.java @@ -32,7 +32,7 @@ * POI引入检查器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PoiChecker { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java index 3bbca7395e..ec1b86c328 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/BigExcelWriter.java @@ -37,7 +37,7 @@ * 大数据量Excel写出 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BigExcelWriter extends ExcelWriter { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java index 7b9642a982..af97c3e0dd 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/CellKit.java @@ -30,6 +30,7 @@ import org.aoju.bus.core.toolkit.DateKit; import org.aoju.bus.core.toolkit.ObjectKit; import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.office.Builder; import org.aoju.bus.office.support.excel.cell.CellEditor; import org.aoju.bus.office.support.excel.cell.CellLocation; import org.aoju.bus.office.support.excel.cell.FormulaCellValue; @@ -53,7 +54,7 @@ * Excel表格中单元格工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CellKit { @@ -464,9 +465,8 @@ private static Object getNumericValue(Cell cell) { final CellStyle style = cell.getCellStyle(); if (null != style) { - final short formatIndex = style.getDataFormat(); // 判断是否为日期 - if (isDateType(cell, formatIndex)) { + if (Builder.isDateFormat(cell)) { return DateKit.date(cell.getDateCellValue()); } @@ -481,36 +481,8 @@ private static Object getNumericValue(Cell cell) { } } - // 某些Excel单元格值为double计算结果,可能导致精度问题,通过转换解决精度问题。 + // 某些Excel单元格值为double计算结果,可能导致精度问题,通过转换解决精度问题 return Double.parseDouble(NumberToTextConverter.toText(value)); } - /** - * 是否为日期格式 - * 判断方式: - * - *
-     * 1、指定序号
-     * 2、org.apache.poi.ss.usermodel.DateUtil.isADateFormat方法判定
-     * 
- * - * @param cell 单元格 - * @param formatIndex 格式序号 - * @return 是否为日期格式 - */ - private static boolean isDateType(Cell cell, int formatIndex) { - // yyyy-MM-dd----- 14 - // yyyy年m月d日---- 31 - // yyyy年m月------- 57 - // m月d日 --------- 58 - // HH:mm---------- 20 - // h时mm分 -------- 32 - if (formatIndex == 14 || formatIndex == 31 || - formatIndex == 57 || formatIndex == 58 || - formatIndex == 20 || formatIndex == 32) { - return true; - } - return DateUtil.isCellDateFormatted(cell); - } - } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java index 462bddecfe..aecdb753b1 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelBase.java @@ -39,7 +39,7 @@ * * @param 子类类型,用于返回this * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExcelBase> implements Closeable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java index 072f76e663..fe7c5f1d3d 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelFileKit.java @@ -37,7 +37,7 @@ * Excel文件工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExcelFileKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java index f6a842eabc..07da154b52 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelKit.java @@ -43,7 +43,7 @@ * Excel工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExcelKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java index cad02fcb92..30568984b4 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelPicKit.java @@ -43,7 +43,7 @@ * Excel图片工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExcelPicKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java index bd7b418c63..e56f93196b 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelReader.java @@ -52,7 +52,7 @@ * 读取Excel工作簿 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExcelReader extends ExcelBase { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java index 29f308821c..65193edfde 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelSaxKit.java @@ -31,6 +31,7 @@ import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.toolkit.DateKit; import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.office.Builder; import org.aoju.bus.office.support.excel.sax.*; import org.apache.poi.hssf.eventusermodel.FormatTrackingHSSFListener; import org.apache.poi.hssf.record.CellValueRecordInterface; @@ -51,7 +52,7 @@ * Sax方式读取Excel相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExcelSaxKit { @@ -217,33 +218,6 @@ public static DateTime getDateValue(double value) { return DateKit.date(org.apache.poi.ss.usermodel.DateUtil.getJavaDate(value, false)); } - /** - * 判断数字Record中是否为日期格式 - * - * @param cell 单元格记录 - * @param formatListener {@link FormatTrackingHSSFListener} - * @return 是否为日期格式 - */ - public static boolean isDateFormat(CellValueRecordInterface cell, FormatTrackingHSSFListener formatListener) { - final int formatIndex = formatListener.getFormatIndex(cell); - final String formatString = formatListener.getFormatString(cell); - return isDateFormat(formatIndex, formatString); - } - - /** - * 判断日期格式 - * - * @param formatIndex 格式索引,一般用于内建格式 - * @param formatString 格式字符串 - * @return 是否为日期格式 - */ - public static boolean isDateFormat(int formatIndex, String formatString) { - if (formatIndex == 28 || formatIndex == 31) { - return true; - } - return org.apache.poi.ss.usermodel.DateUtil.isADateFormat(formatIndex, formatString); - } - /** * 在Excel03 sax读取中获取日期或数字类型的结果值 * @@ -253,7 +227,7 @@ public static boolean isDateFormat(int formatIndex, String formatString) { * @return 值,可能为Date或Double或Long */ public static Object getNumberOrDateValue(CellValueRecordInterface cell, double value, FormatTrackingHSSFListener formatListener) { - if (isDateFormat(cell, formatListener)) { + if (Builder.isDateFormat(formatListener.getFormatIndex(cell), formatListener.getFormatString(cell))) { // 可能为日期格式 return getDateValue(value); } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java index b98b8f0a2a..44c996c70c 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/ExcelWriter.java @@ -25,11 +25,11 @@ ********************************************************************************/ package org.aoju.bus.office.support.excel; +import org.aoju.bus.core.lang.Align; import org.aoju.bus.core.lang.Assert; import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.toolkit.*; import org.aoju.bus.office.support.excel.cell.CellLocation; -import org.aoju.bus.office.support.excel.style.Align; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.xssf.usermodel.XSSFDataValidation; @@ -52,7 +52,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExcelWriter extends ExcelBase { @@ -859,7 +859,6 @@ public ExcelWriter setStyle(CellStyle style, String locationRef) { * @param style 样式 * @return this * @see Row#setRowStyle(CellStyle) - * @since 5.4.5 */ public ExcelWriter setRowStyle(int y, CellStyle style) { getOrCreateRow(y).setRowStyle(style); diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java index 8d90f98762..c472fc4a59 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/RowKit.java @@ -44,7 +44,7 @@ * Excel中的行{@link Row}封装工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RowKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java index 54c5fd7142..4816350e99 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleKit.java @@ -32,7 +32,7 @@ * Excel样式工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StyleKit { @@ -207,4 +207,16 @@ public static CellStyle createCellStyle(Workbook workbook) { return workbook.createCellStyle(); } + /** + * 创建数据格式并获取格式 + * + * @param workbook 工作簿 + * @param format 数据格式 + * @return 数据格式 + */ + public Short getFormat(Workbook workbook, String format) { + final DataFormat dataFormat = workbook.createDataFormat(); + return dataFormat.getFormat(format); + } + } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java index bc1d334a8a..3616df8267 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/StyleSet.java @@ -33,7 +33,7 @@ * 样式集合,此样式集合汇集了整个工作簿的样式,用于减少样式的创建和冗余 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StyleSet implements Serializable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java index 85f584bc71..c99b3766ce 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/WorksKit.java @@ -45,7 +45,7 @@ * Excel工作簿{@link Workbook}相关工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WorksKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java index e8feea14b4..706d2afe20 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellEditor.java @@ -31,7 +31,7 @@ * 单元格编辑器接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java index 405adedcb1..070b4fa587 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellHandler.java @@ -32,7 +32,7 @@ * 单元格处理器接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java index 0a84bbdd35..d3af04ae6a 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellLocation.java @@ -32,7 +32,7 @@ * 单元格位置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CellLocation implements Serializable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java index e7c1230c31..21d646c470 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/CellValue.java @@ -29,7 +29,7 @@ * 抽象的单元格值接口,用于判断不同类型的单元格值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface CellValue { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java index 2fac39b1e6..cd9b23353e 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/FormulaCellValue.java @@ -29,7 +29,7 @@ * 公式类型的值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FormulaCellValue implements CellValue { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/NullCell.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/NullCell.java index 19161e76d9..83d519cc1b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/NullCell.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/cell/NullCell.java @@ -39,7 +39,7 @@ * 此对象只用于标注单元格所在位置信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NullCell implements Cell { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java index 58bdb3e50f..e0449c8472 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/NumericToIntEditor.java @@ -32,7 +32,7 @@ * POI中NUMRIC类型的值默认返回的是Double类型,此编辑器用于转换其为int型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NumericToIntEditor implements CellEditor { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java index 47698477d2..145f71d889 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/editors/TrimEditor.java @@ -33,7 +33,7 @@ * 去除String类型的单元格值两边的空格 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TrimEditor implements CellEditor { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java index d3372c427c..89ff76e10b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/AbstractSheetReader.java @@ -42,7 +42,7 @@ * * @param 读取类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSheetReader implements SheetReader { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java index e6ba5feb46..24a961ecb1 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/BeanSheetReader.java @@ -37,7 +37,7 @@ * 读取{@link Sheet}为bean的List列表形式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanSheetReader implements SheetReader> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java index 35ed2a9996..0c991a4cbc 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/ListSheetReader.java @@ -36,7 +36,7 @@ * 读取{@link Sheet}为List列表形式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ListSheetReader extends AbstractSheetReader>> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java index b80b64ab79..0d6791788b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/MapSheetReader.java @@ -38,7 +38,7 @@ * 读取{@link Sheet}为Map的List列表形式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapSheetReader extends AbstractSheetReader>> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java index b7db7fcfbc..637128cb0c 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/reader/SheetReader.java @@ -32,7 +32,7 @@ * * @param 读取的数据类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java index a8328bc562..1cc928636b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/AbstractRowHandler.java @@ -36,7 +36,7 @@ * * @param 转换后的数据类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractRowHandler implements RowHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java index 35a2b398d6..535eee1ff6 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/BeanRowHandler.java @@ -38,7 +38,7 @@ * 将一行数据转换为Map,key为指定行,value为当前行对应位置的值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class BeanRowHandler extends AbstractRowHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java index 8d4c5b06a8..e8205c0a3b 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/CellDataType.java @@ -31,7 +31,7 @@ * 单元格数据类型枚举 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum CellDataType { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java index 4847cf6ac5..39888f0c76 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel03SaxReader.java @@ -30,6 +30,7 @@ import org.aoju.bus.core.toolkit.IoKit; import org.aoju.bus.core.toolkit.ObjectKit; import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.office.Builder; import org.aoju.bus.office.support.excel.ExcelSaxKit; import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener; import org.apache.poi.hssf.eventusermodel.*; @@ -50,7 +51,7 @@ * Excel2003格式的事件-用户模型方式读取器,统一将此归类为Sax读取 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader { @@ -308,7 +309,7 @@ private void processCellValue(Record record) { break; case NumberRecord.sid: // 数字类型 final NumberRecord numrec = (NumberRecord) record; - if (ExcelSaxKit.isDateFormat(numrec, formatListener)) { + if (Builder.isDateFormat(formatListener.getFormatIndex(numrec), formatListener.getFormatString(numrec))) { // 可能为日期格式 value = ExcelSaxKit.getDateValue(numrec.getValue()); } else { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java index f0294010f4..cee683cb40 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/Excel07SaxReader.java @@ -32,6 +32,7 @@ import org.aoju.bus.core.toolkit.MathKit; import org.aoju.bus.core.toolkit.ObjectKit; import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.office.Builder; import org.aoju.bus.office.support.excel.ExcelSaxKit; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; @@ -57,7 +58,7 @@ * Excel2007格式说明见:http://www.cnblogs.com/wangmingshun/p/6654143.html * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Excel07SaxReader extends DefaultHandler implements ExcelSaxReader { @@ -183,14 +184,13 @@ public Excel07SaxReader read(OPCPackage opcPackage, String idOrRid) throws Instr * @param idOrRid Excel中的sheet id或者rid编号,rid必须加rId前缀,例如rId1,如果为-1处理所有编号的sheet * @return this * @throws InstrumentException POI异常 - * @since 5.4.4 */ public Excel07SaxReader read(XSSFReader xssfReader, String idOrRid) throws InstrumentException { - // 获取共享样式表 + // 获取共享样式表,样式非必须 try { - stylesTable = xssfReader.getStylesTable(); - } catch (Exception e) { - //ignore + this.stylesTable = xssfReader.getStylesTable(); + } catch (IOException | InvalidFormatException ignore) { + // ignore } // 获取共享字符串表 @@ -410,7 +410,7 @@ private void setCellType(Attributes attributes) { this.numFmtString = ObjectKit.defaultIfNull( xssfCellStyle.getDataFormatString(), BuiltinFormats.getBuiltinFormat(numFmtIndex)); - if (CellDataType.NUMBER == this.cellDataType && ExcelSaxKit.isDateFormat(numFmtIndex, numFmtString)) { + if (CellDataType.NUMBER == this.cellDataType && Builder.isDateFormat(numFmtIndex, numFmtString)) { cellDataType = CellDataType.DATE; } } diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java index 059aafa066..a1ccf69302 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/ExcelSaxReader.java @@ -36,7 +36,7 @@ * * @param 子对象类型,用于标记返回值this * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ExcelSaxReader { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java index fc340b3c24..988a5bca94 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/MapRowHandler.java @@ -37,7 +37,7 @@ * 将一行数据转换为Map,key为指定行,value为当前行对应位置的值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class MapRowHandler extends AbstractRowHandler> { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java index 5a72342d8c..6fa606e9c0 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/RowHandler.java @@ -33,7 +33,7 @@ * Sax方式读取Excel行处理器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java index 74c4950c1d..a3b390377b 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/excel/sax/SheetSaxReader.java @@ -43,7 +43,7 @@ * 在Sax方式读取Excel时,读取sheet标签中sheetId和rid的对应关系 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SheetSaxReader extends DefaultHandler { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java index 8012514f51..a6e0c8d84e 100644 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/PicType.java @@ -31,7 +31,7 @@ * Word中的图片类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum PicType { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java index 5177c28976..83da3f9df6 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/TableKit.java @@ -43,7 +43,7 @@ * Word中表格相关工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TableKit { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java index a4d77e3391..2034d49a1c 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/Word07Writer.java @@ -44,7 +44,7 @@ * Word生成器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Word07Writer implements Closeable { diff --git a/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java b/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java index b978ea2200..4d88d1fa13 100755 --- a/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java +++ b/bus-office/src/main/java/org/aoju/bus/office/support/word/WordKit.java @@ -38,7 +38,7 @@ * Word工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WordKit { diff --git a/bus-opencv/pom.xml b/bus-opencv/pom.xml index de861c023a..50c7d813e6 100755 --- a/bus-opencv/pom.xml +++ b/bus-opencv/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-opencv - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-pager/README.md b/bus-pager/README.md index 0e9d87b83a..d6e085cad9 100755 --- a/bus-pager/README.md +++ b/bus-pager/README.md @@ -42,7 +42,7 @@ org.aoju bus-pager - 6.1.5 + 6.1.6 ``` diff --git a/bus-pager/pom.xml b/bus-pager/pom.xml index b7af91148c..850acd3bfa 100755 --- a/bus-pager/pom.xml +++ b/bus-pager/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-pager - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/Page.java b/bus-pager/src/main/java/org/aoju/bus/pager/Page.java index 4b172c7d33..0f0b8d843b 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/Page.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/Page.java @@ -33,7 +33,7 @@ * Mybatis - 分页对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Page extends ArrayList implements Closeable { @@ -155,7 +155,7 @@ public int getPageNo() { } public Page setPageNo(int pageNo) { - //分页合理化,针对不合理的页码自动处理 + // 分页合理化,针对不合理的页码自动处理 this.pageNo = ((reasonable != null && reasonable) && pageNo <= 0) ? 1 : pageNo; return this; } @@ -193,7 +193,7 @@ public void setTotal(long total) { } else { pages = 0; } - //分页合理化,针对不合理的页码自动处理 + // 分页合理化,针对不合理的页码自动处理 if ((reasonable != null && reasonable) && pageNo > pages) { if (pages != 0) { pageNo = pages; @@ -211,7 +211,7 @@ public Page setReasonable(Boolean reasonable) { return this; } this.reasonable = reasonable; - //分页合理化,针对不合理的页码自动处理 + // 分页合理化,针对不合理的页码自动处理 if (this.reasonable && this.pageNo <= 0) { this.pageNo = 1; calculateStartAndEndRow(); @@ -271,7 +271,7 @@ public Page setCount(boolean count) { * @return 结果 */ public Page pageNo(int pageNo) { - //分页合理化,针对不合理的页码自动处理 + // 分页合理化,针对不合理的页码自动处理 this.pageNo = ((reasonable != null && reasonable) && pageNo <= 0) ? 1 : pageNo; return this; } @@ -332,30 +332,30 @@ public Page countColumn(String columnName) { return this; } - public Pages toPages() { - return new Pages<>(this); + public Paginating toPages() { + return new Paginating<>(this); } - public PageSerializable toPageSerializable() { - return new PageSerializable<>(this); + public Serialize toPageSerializable() { + return new Serialize<>(this); } - public Page doSelectPage(ISelect select) { + public Page doSelectPage(Querying select) { select.doSelect(); return (Page) this; } - public Pages doSelectPages(ISelect select) { + public Paginating doSelectPages(Querying select) { select.doSelect(); - return (Pages) this.toPages(); + return (Paginating) this.toPages(); } - public PageSerializable doSelectPageSerializable(ISelect select) { + public Serialize doSelectPageSerializable(Querying select) { select.doSelect(); - return (PageSerializable) this.toPageSerializable(); + return (Serialize) this.toPageSerializable(); } - public long doCount(ISelect select) { + public long doCount(Querying select) { this.pageSizeZero = true; this.pageSize = 0; select.doSelect(); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java b/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java index a9b2f5f4ec..9f48e142fe 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/PageContext.java @@ -45,7 +45,7 @@ * Mybatis - 通用分页拦截器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageContext extends PageMethod implements Dialect { @@ -56,13 +56,13 @@ public class PageContext extends PageMethod implements Dialect { @Override public boolean skip(MappedStatement ms, Object parameterObject, RowBounds rowBounds) { if (ms.getId().endsWith(CountMappedStatement.COUNT)) { - throw new RuntimeException("在系统中发现了多个分页插件,请检查系统配置!"); + throw new RuntimeException("Multiple paging plug-ins found, please check the system configuration!"); } Page page = pageParams.getPage(parameterObject, rowBounds); if (page == null) { return true; } else { - //设置默认的 count 列 + // 设置默认的 count 列 if (PageFromObject.isEmpty(page.getCountColumn())) { page.setCountColumn(pageParams.getCountColumn()); } @@ -107,7 +107,7 @@ public String getPageSql(String sql, Page page, RowBounds rowBounds, CacheKey pa @Override public Object afterPage(List pageList, Object parameterObject, RowBounds rowBounds) { - //这个方法即使不分页也会被执行,所以要判断 null + // 这个方法即使不分页也会被执行,所以要判断 null AbstractSqlDialect delegate = autoDialect.getDelegate(); if (delegate != null) { return delegate.afterPage(pageList, parameterObject, rowBounds); @@ -117,7 +117,7 @@ public Object afterPage(List pageList, Object parameterObject, RowBounds rowBoun @Override public void afterAll() { - //这个方法即使不分页也会被执行,所以要判断 null + // 这个方法即使不分页也会被执行,所以要判断 null AbstractSqlDialect delegate = autoDialect.getDelegate(); if (delegate != null) { delegate.afterAll(); @@ -133,7 +133,7 @@ public void setProperties(Properties properties) { autoDialect = new PageAutoDialect(); pageParams.setProperties(properties); autoDialect.setProperties(properties); - //20180902新增 aggregateFunctions, 允许手动添加聚合函数(影响行数) + // 20180902新增 aggregateFunctions, 允许手动添加聚合函数(影响行数) CountSqlParser.addAggregateFunctions(properties.getProperty("aggregateFunctions")); } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java b/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java index 0e36db1aa1..6a5ea2142f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/PageException.java @@ -29,7 +29,7 @@ * 分页插件异常 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageException extends RuntimeException { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/Pages.java b/bus-pager/src/main/java/org/aoju/bus/pager/Paginating.java similarity index 84% rename from bus-pager/src/main/java/org/aoju/bus/pager/Pages.java rename to bus-pager/src/main/java/org/aoju/bus/pager/Paginating.java index 007287ec26..c3bacaf77f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/Pages.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/Paginating.java @@ -36,51 +36,79 @@ * 新增分页的多项属性 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ -public class Pages extends PageSerializable { +public class Paginating extends Serialize { - //当前页 + /** + * 当前页 + */ private int pageNo; - //每页的数量 + /** + * 每页的数量 + */ private int pageSize; - //当前页的数量 + /** + * 当前页的数量 + */ private int size; - - //由于startRow和endRow不常用,这里说个具体的用法 - //可以在页面中"显示startRow到endRow 共size条数据" - - //当前页面第一个元素在数据库中的行号 + /** + * 由于startRow和endRow不常用,这里说个具体的用法 + * 可以在页面中"显示startRow到endRow 共size条数据" + * 当前页面第一个元素在数据库中的行号 + */ private int startRow; - //当前页面最后一个元素在数据库中的行号 + /** + * 当前页面最后一个元素在数据库中的行号 + */ private int endRow; - //总页数 + /** + * 总页数 + */ private int pages; - - //前一页 + /** + * 前一页 + */ private int prePage; - //下一页 + /** + * 下一页 + */ private int nextPage; - - //是否为第一页 + /** + * 是否为第一页 + */ private boolean isFirstPage = false; - //是否为最后一页 + /** + * 是否为最后一页 + */ private boolean isLastPage = false; - //是否有前一页 + /** + * 是否有前一页 + */ private boolean hasPreviousPage = false; - //是否有下一页 + /** + * 是否有下一页 + */ private boolean hasNextPage = false; - //导航页码数 + /** + * 导航页码数 + */ private int navigatePages; - //所有导航页号 + /** + * 所有导航页号 + */ private int[] navigatePageNo; - //导航条上的第一页 + /** + * 导航条上的第一页 + */ private int navigateFirstPage; - //导航条上的最后一页 + /** + * 导航条上的最后一页 + */ private int navigateLastPage; - public Pages() { + public Paginating() { } /** @@ -88,7 +116,7 @@ public Pages() { * * @param list 对象 */ - public Pages(List list) { + public Paginating(List list) { this(list, 8); } @@ -98,7 +126,7 @@ public Pages(List list) { * @param list page结果 * @param navigatePages 页码数量 */ - public Pages(List list, int navigatePages) { + public Paginating(List list, int navigatePages) { super(list); if (list instanceof Page) { Page page = (Page) list; @@ -107,13 +135,13 @@ public Pages(List list, int navigatePages) { this.pages = page.getPages(); this.size = page.size(); - //由于结果是>startRow的,所以实际的需要+1 + // 由于结果是>startRow的,所以实际的需要+1 if (this.size == 0) { this.startRow = 0; this.endRow = 0; } else { this.startRow = page.getStartRow() + 1; - //计算实际的endRow(最后一页的时候特殊) + // 计算实际的endRow(最后一页的时候特殊) this.endRow = this.startRow - 1 + this.size; } } else if (list instanceof Collection) { @@ -127,52 +155,52 @@ public Pages(List list, int navigatePages) { } if (list instanceof Collection) { this.navigatePages = navigatePages; - //计算导航页 + // 计算导航页 calcNavigatePageNo(); - //计算前后页,第一页,最后一页 + // 计算前后页,第一页,最后一页 calcPage(); - //判断页面边界 + // 判断页面边界 judgePageBoudary(); } } - public static Pages of(List list) { - return new Pages<>(list); + public static Paginating of(List list) { + return new Paginating<>(list); } - public static Pages of(List list, int navigatePages) { - return new Pages<>(list, navigatePages); + public static Paginating of(List list, int navigatePages) { + return new Paginating<>(list, navigatePages); } /** * 计算导航页 */ private void calcNavigatePageNo() { - //当总页数小于或等于导航页码数时 + // 当总页数小于或等于导航页码数时 if (pages <= navigatePages) { navigatePageNo = new int[pages]; for (int i = 0; i < pages; i++) { navigatePageNo[i] = i + 1; } - } else { //当总页数大于导航页码数时 + } else { // 当总页数大于导航页码数时 navigatePageNo = new int[navigatePages]; int startNum = pageNo - navigatePages / 2; int endNum = pageNo + navigatePages / 2; if (startNum < 1) { startNum = 1; - //(最前navigatePages页 + // 最前navigatePages页 for (int i = 0; i < navigatePages; i++) { navigatePageNo[i] = startNum++; } } else if (endNum > pages) { endNum = pages; - //最后navigatePages页 + // 最后navigatePages页 for (int i = navigatePages - 1; i >= 0; i--) { navigatePageNo[i] = endNum--; } } else { - //所有中间页 + // 所有中间页 for (int i = 0; i < navigatePages; i++) { navigatePageNo[i] = startNum++; } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/IPage.java b/bus-pager/src/main/java/org/aoju/bus/pager/Paging.java similarity index 98% rename from bus-pager/src/main/java/org/aoju/bus/pager/IPage.java rename to bus-pager/src/main/java/org/aoju/bus/pager/Paging.java index 493cf7a82e..4223525f69 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/IPage.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/Paging.java @@ -29,10 +29,10 @@ * 分页接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ -public interface IPage { +public interface Paging { Integer getPageNo(); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/ISelect.java b/bus-pager/src/main/java/org/aoju/bus/pager/Querying.java similarity index 98% rename from bus-pager/src/main/java/org/aoju/bus/pager/ISelect.java rename to bus-pager/src/main/java/org/aoju/bus/pager/Querying.java index 6c3eb80db3..d079e4d5d1 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/ISelect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/Querying.java @@ -29,10 +29,10 @@ * 分页查询接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ -public interface ISelect { +public interface Querying { /** * 在接口中调用自己的查询方法,不要在该方法内写过多代码,只要一行查询方法最好 diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageRowBounds.java b/bus-pager/src/main/java/org/aoju/bus/pager/RowBounds.java similarity index 94% rename from bus-pager/src/main/java/org/aoju/bus/pager/PageRowBounds.java rename to bus-pager/src/main/java/org/aoju/bus/pager/RowBounds.java index 025843094c..367a2414d2 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageRowBounds.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/RowBounds.java @@ -25,21 +25,19 @@ ********************************************************************************/ package org.aoju.bus.pager; -import org.apache.ibatis.session.RowBounds; - /** * 分页结果信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ -public class PageRowBounds extends RowBounds { +public class RowBounds extends org.apache.ibatis.session.RowBounds { private Long total; private Boolean count; - public PageRowBounds(int offset, int limit) { + public RowBounds(int offset, int limit) { super(offset, limit); } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/PageSerializable.java b/bus-pager/src/main/java/org/aoju/bus/pager/Serialize.java similarity index 90% rename from bus-pager/src/main/java/org/aoju/bus/pager/PageSerializable.java rename to bus-pager/src/main/java/org/aoju/bus/pager/Serialize.java index b03e57bc87..e2133608b5 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/PageSerializable.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/Serialize.java @@ -32,21 +32,26 @@ * 分页信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ -public class PageSerializable implements Serializable { +public class Serialize implements Serializable { private static final long serialVersionUID = 1L; - //总记录数 + + /** + * 总记录数 + */ protected long total; - //结果集 + /** + * 结果集 + */ protected List list; - public PageSerializable() { + public Serialize() { } - public PageSerializable(List list) { + public Serialize(List list) { this.list = list; if (list instanceof Page) { this.total = ((Page) list).getTotal(); @@ -55,8 +60,8 @@ public PageSerializable(List list) { } } - public static PageSerializable of(List list) { - return new PageSerializable<>(list); + public static Serialize of(List list) { + return new Serialize<>(list); } public long getTotal() { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java index b5aa6a98d3..75143ac7d4 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/Cache.java @@ -29,7 +29,7 @@ * Simple cache interface * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Cache { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java index cebcbf10b3..4aebb445cf 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/CacheFactory.java @@ -35,7 +35,7 @@ * CacheFactory * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CacheFactory { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java index ce302fc3f4..d4058d6c9d 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/GuavaCache.java @@ -35,7 +35,7 @@ * Simple Guava Cache * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GuavaCache implements Cache { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java b/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java index 634ce64836..6100e9704b 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/cache/SimpleCache.java @@ -36,7 +36,7 @@ * Simple MyBatis Cache * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleCache implements Cache { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java index 1d5d26ca26..a6b6db9a8f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractDialect.java @@ -35,12 +35,12 @@ * 基于 CountSqlParser 的智能 Count 查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractDialect implements Dialect { - //处理SQL + // 处理SQL protected CountSqlParser countSqlParser = new CountSqlParser(); @Override diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java index 4823fc07aa..57d77559c2 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractRowBoundsDialect.java @@ -25,11 +25,10 @@ ********************************************************************************/ package org.aoju.bus.pager.dialect; -import org.aoju.bus.pager.PageRowBounds; +import org.aoju.bus.pager.RowBounds; import org.apache.ibatis.cache.CacheKey; import org.apache.ibatis.mapping.BoundSql; import org.apache.ibatis.mapping.MappedStatement; -import org.apache.ibatis.session.RowBounds; import java.util.List; import java.util.Properties; @@ -38,29 +37,29 @@ * 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractRowBoundsDialect extends AbstractDialect { @Override - public boolean skip(MappedStatement ms, Object parameterObject, RowBounds rowBounds) { - return rowBounds == RowBounds.DEFAULT; + public boolean skip(MappedStatement ms, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { + return rowBounds == org.apache.ibatis.session.RowBounds.DEFAULT; } @Override - public boolean beforeCount(MappedStatement ms, Object parameterObject, RowBounds rowBounds) { - if (rowBounds instanceof PageRowBounds) { - PageRowBounds pageRowBounds = (PageRowBounds) rowBounds; + public boolean beforeCount(MappedStatement ms, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { + if (rowBounds instanceof RowBounds) { + RowBounds pageRowBounds = (RowBounds) rowBounds; return pageRowBounds.getCount() == null || pageRowBounds.getCount(); } return false; } @Override - public boolean afterCount(long count, Object parameterObject, RowBounds rowBounds) { - //由于 beforeCount 校验,这里一定是 PageRowBounds - ((PageRowBounds) rowBounds).setTotal(count); + public boolean afterCount(long count, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { + // 由于 beforeCount 校验,这里一定是 PageRowBounds + ((RowBounds) rowBounds).setTotal(count); return count > 0; } @@ -70,20 +69,20 @@ public Object processParameterObject(MappedStatement ms, Object parameterObject, } @Override - public boolean beforePage(MappedStatement ms, Object parameterObject, RowBounds rowBounds) { + public boolean beforePage(MappedStatement ms, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { return true; } @Override - public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameterObject, RowBounds rowBounds, CacheKey pageKey) { + public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds, CacheKey pageKey) { String sql = boundSql.getSql(); return getPageSql(sql, rowBounds, pageKey); } - public abstract String getPageSql(String sql, RowBounds rowBounds, CacheKey pageKey); + public abstract String getPageSql(String sql, org.apache.ibatis.session.RowBounds rowBounds, CacheKey pageKey); @Override - public Object afterPage(List pageList, Object parameterObject, RowBounds rowBounds) { + public Object afterPage(List pageList, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { return pageList; } @@ -96,4 +95,5 @@ public void afterAll() { public void setProperties(Properties properties) { } + } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractSqlDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractSqlDialect.java index b8eabbf0ce..299c1d36d0 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractSqlDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/AbstractSqlDialect.java @@ -27,7 +27,7 @@ import org.aoju.bus.pager.Page; import org.aoju.bus.pager.PageContext; -import org.aoju.bus.pager.PageRowBounds; +import org.aoju.bus.pager.RowBounds; import org.aoju.bus.pager.parser.OrderByParser; import org.aoju.bus.pager.plugin.PageFromObject; import org.aoju.bus.pager.reflect.MetaObject; @@ -35,7 +35,6 @@ import org.apache.ibatis.mapping.BoundSql; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.ParameterMapping; -import org.apache.ibatis.session.RowBounds; import java.util.*; @@ -43,7 +42,7 @@ * 针对 PageContext 的实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSqlDialect extends AbstractDialect { @@ -59,19 +58,19 @@ public Page getLocalPage() { } @Override - public final boolean skip(MappedStatement ms, Object parameterObject, RowBounds rowBounds) { - //该方法不会被调用 + public final boolean skip(MappedStatement ms, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { + // 该方法不会被调用 return true; } @Override - public boolean beforeCount(MappedStatement ms, Object parameterObject, RowBounds rowBounds) { + public boolean beforeCount(MappedStatement ms, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { Page page = getLocalPage(); return !page.isOrderByOnly() && page.isCount(); } @Override - public String getCountSql(MappedStatement ms, BoundSql boundSql, Object parameterObject, RowBounds rowBounds, CacheKey countKey) { + public String getCountSql(MappedStatement ms, BoundSql boundSql, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds, CacheKey countKey) { Page page = getLocalPage(); String countColumn = page.getCountColumn(); if (PageFromObject.isNotEmpty(countColumn)) { @@ -81,14 +80,14 @@ public String getCountSql(MappedStatement ms, BoundSql boundSql, Object paramete } @Override - public boolean afterCount(long count, Object parameterObject, RowBounds rowBounds) { + public boolean afterCount(long count, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { Page page = getLocalPage(); page.setTotal(count); - if (rowBounds instanceof PageRowBounds) { - ((PageRowBounds) rowBounds).setTotal(count); + if (rowBounds instanceof RowBounds) { + ((RowBounds) rowBounds).setTotal(count); } - //pageSize < 0 的时候,不执行分页查询 - //pageSize = 0 的时候,还需要执行后续查询,但是不会分页 + // pageSize < 0 的时候,不执行分页查询 + // pageSize = 0 的时候,还需要执行后续查询,但是不会分页 if (page.getPageSize() < 0) { return false; } @@ -97,9 +96,9 @@ public boolean afterCount(long count, Object parameterObject, RowBounds rowBound @Override public Object processParameterObject(MappedStatement ms, Object parameterObject, BoundSql boundSql, CacheKey pageKey) { - //处理参数 + // 处理参数 Page page = getLocalPage(); - //如果只是 order by 就不必处理参数 + // 如果只是 order by 就不必处理参数 if (page.isOrderByOnly()) { return parameterObject; } @@ -107,22 +106,22 @@ public Object processParameterObject(MappedStatement ms, Object parameterObject, if (parameterObject == null) { paramMap = new HashMap<>(); } else if (parameterObject instanceof Map) { - //解决不可变Map的情况 + // 解决不可变Map的情况 paramMap = new HashMap<>(); paramMap.putAll((Map) parameterObject); } else { paramMap = new HashMap<>(); - //动态sql时的判断条件不会出现在ParameterMapping中,但是必须有,所以这里需要收集所有的getter属性 - //TypeHandlerRegistry可以直接处理的会作为一个直接使用的对象进行处理 + // 动态sql时的判断条件不会出现在ParameterMapping中,但是必须有,所以这里需要收集所有的getter属性 + // TypeHandlerRegistry可以直接处理的会作为一个直接使用的对象进行处理 boolean hasTypeHandler = ms.getConfiguration().getTypeHandlerRegistry().hasTypeHandler(parameterObject.getClass()); org.apache.ibatis.reflection.MetaObject metaObject = MetaObject.forObject(parameterObject); - //需要针对注解形式的MyProviderSqlSource保存原值 + // 需要针对注解形式的MyProviderSqlSource保存原值 if (!hasTypeHandler) { for (String name : metaObject.getGetterNames()) { paramMap.put(name, metaObject.getValue(name)); } } - //下面这段方法,主要解决一个常见类型的参数时的问题 + // 下面这段方法,主要解决一个常见类型的参数时的问题 if (boundSql.getParameterMappings() != null && boundSql.getParameterMappings().size() > 0) { for (ParameterMapping parameterMapping : boundSql.getParameterMappings()) { String name = parameterMapping.getProperty(); @@ -154,7 +153,7 @@ public Object processParameterObject(MappedStatement ms, Object parameterObject, public abstract Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey); @Override - public boolean beforePage(MappedStatement ms, Object parameterObject, RowBounds rowBounds) { + public boolean beforePage(MappedStatement ms, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { Page page = getLocalPage(); if (page.isOrderByOnly() || page.getPageSize() > 0) { return true; @@ -163,10 +162,10 @@ public boolean beforePage(MappedStatement ms, Object parameterObject, RowBounds } @Override - public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameterObject, RowBounds rowBounds, CacheKey pageKey) { + public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds, CacheKey pageKey) { String sql = boundSql.getSql(); Page page = getLocalPage(); - //支持 order by + // 支持 order by String orderBy = page.getOrderBy(); if (PageFromObject.isNotEmpty(orderBy)) { pageKey.update(orderBy); @@ -189,7 +188,7 @@ public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameter public abstract String getPageSql(String sql, Page page, CacheKey pageKey); @Override - public Object afterPage(List pageList, Object parameterObject, RowBounds rowBounds) { + public Object afterPage(List pageList, Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { Page page = getLocalPage(); if (page == null) { return pageList; diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java index eeff3fad1e..780411dae3 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/Dialect.java @@ -37,18 +37,26 @@ * 数据库方言,针对不同数据库进行实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Dialect { - //分页的id后缀 + /** + * 分页的id后缀 + */ String SUFFIX_PAGE = "_PageContext"; - //count查询的id后缀 + /** + * count查询的id后缀 + */ String SUFFIX_COUNT = SUFFIX_PAGE + "_Count"; - //第一个分页参数 + /** + * 第一个分页参数 + */ String PAGEPARAMETER_FIRST = "First" + SUFFIX_PAGE; - //第二个分页参数 + /** + * 第二个分页参数 + */ String PAGEPARAMETER_SECOND = "Second" + SUFFIX_PAGE; /** diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java index 2eb7ea0da9..196009819f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/ReplaceSql.java @@ -29,7 +29,7 @@ * 替换和还原 SQL * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ReplaceSql { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java index 7a3147b402..0f9a5fc11e 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Db2Dialect.java @@ -37,7 +37,7 @@ * 数据库方言 db2 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Db2Dialect extends AbstractSqlDialect { @@ -46,10 +46,10 @@ public class Db2Dialect extends AbstractSqlDialect { public Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey) { paramMap.put(PAGEPARAMETER_FIRST, page.getStartRow() + 1); paramMap.put(PAGEPARAMETER_SECOND, page.getEndRow()); - //处理pageKey + // 处理pageKey pageKey.update(page.getStartRow() + 1); pageKey.update(page.getEndRow()); - //处理参数配置 + // 处理参数配置 handleParameter(boundSql, ms); return paramMap; } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HerdDBDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HerdDBDialect.java index 0fce906f06..738bf21d7c 100644 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HerdDBDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HerdDBDialect.java @@ -41,7 +41,7 @@ * 数据库方言 herddb * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HerdDBDialect extends AbstractSqlDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java index 67e731a9dd..4a62272f76 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/HsqldbDialect.java @@ -41,7 +41,7 @@ * 数据库方言 hsqldb * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HsqldbDialect extends AbstractSqlDialect { @@ -50,10 +50,10 @@ public class HsqldbDialect extends AbstractSqlDialect { public Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey) { paramMap.put(PAGEPARAMETER_FIRST, page.getPageSize()); paramMap.put(PAGEPARAMETER_SECOND, page.getStartRow()); - //处理pageKey + // 处理pageKey pageKey.update(page.getPageSize()); pageKey.update(page.getStartRow()); - //处理参数配置 + // 处理参数配置 if (boundSql.getParameterMappings() != null) { List newParameterMappings = new ArrayList<>(boundSql.getParameterMappings()); if (page.getPageSize() > 0) { @@ -80,4 +80,5 @@ public String getPageSql(String sql, Page page, CacheKey pageKey) { } return sqlBuilder.toString(); } + } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java index e756a55d97..e86acbb007 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/InformixDialect.java @@ -41,7 +41,7 @@ * 数据库方言 informix * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InformixDialect extends AbstractSqlDialect { @@ -50,10 +50,10 @@ public class InformixDialect extends AbstractSqlDialect { public Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey) { paramMap.put(PAGEPARAMETER_FIRST, page.getStartRow()); paramMap.put(PAGEPARAMETER_SECOND, page.getPageSize()); - //处理pageKey + // 处理pageKey pageKey.update(page.getStartRow()); pageKey.update(page.getPageSize()); - //处理参数配置 + // 处理参数配置 if (boundSql.getParameterMappings() != null) { List newParameterMappings = new ArrayList<>(); if (page.getStartRow() > 0) { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java index bdba866b2f..c6c59c1b5f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/MySqlDialect.java @@ -41,7 +41,7 @@ * 数据库方言 mysql * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MySqlDialect extends AbstractSqlDialect { @@ -50,10 +50,10 @@ public class MySqlDialect extends AbstractSqlDialect { public Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey) { paramMap.put(PAGEPARAMETER_FIRST, page.getStartRow()); paramMap.put(PAGEPARAMETER_SECOND, page.getPageSize()); - //处理pageKey + // 处理pageKey pageKey.update(page.getStartRow()); pageKey.update(page.getPageSize()); - //处理参数配置 + // 处理参数配置 if (boundSql.getParameterMappings() != null) { List newParameterMappings = new ArrayList<>(boundSql.getParameterMappings()); if (page.getStartRow() == 0) { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Oracle9iDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Oracle9iDialect.java index b69453267e..2839ddf64f 100644 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Oracle9iDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/Oracle9iDialect.java @@ -37,7 +37,7 @@ * 数据库方言 oracle 9i * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Oracle9iDialect extends AbstractSqlDialect { @@ -46,10 +46,10 @@ public class Oracle9iDialect extends AbstractSqlDialect { public Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey) { paramMap.put(PAGEPARAMETER_FIRST, page.getEndRow()); paramMap.put(PAGEPARAMETER_SECOND, page.getStartRow()); - //处理pageKey + // 处理pageKey pageKey.update(page.getEndRow()); pageKey.update(page.getStartRow()); - //处理参数配置 + // 处理参数配置 handleParameter(boundSql, ms); return paramMap; } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java index b8d87d4bfe..651bb0b35b 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/OracleDialect.java @@ -37,7 +37,7 @@ * 数据库方言 oracle * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OracleDialect extends AbstractSqlDialect { @@ -46,10 +46,10 @@ public class OracleDialect extends AbstractSqlDialect { public Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey) { paramMap.put(PAGEPARAMETER_FIRST, page.getEndRow()); paramMap.put(PAGEPARAMETER_SECOND, page.getStartRow()); - //处理pageKey + // 处理pageKey pageKey.update(page.getEndRow()); pageKey.update(page.getStartRow()); - //处理参数配置 + // 处理参数配置 handleParameter(boundSql, ms); return paramMap; } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java index 30d66f801f..befb9a6981 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServer2012Dialect.java @@ -36,7 +36,7 @@ * 数据库方言 sqlserver2012 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlServer2012Dialect extends SqlServerDialect { @@ -45,10 +45,10 @@ public class SqlServer2012Dialect extends SqlServerDialect { public Object processPageParameter(MappedStatement ms, Map paramMap, Page page, BoundSql boundSql, CacheKey pageKey) { paramMap.put(PAGEPARAMETER_FIRST, page.getStartRow()); paramMap.put(PAGEPARAMETER_SECOND, page.getPageSize()); - //处理pageKey + // 处理pageKey pageKey.update(page.getStartRow()); pageKey.update(page.getPageSize()); - //处理参数配置 + // 处理参数配置 handleParameter(boundSql, ms); return paramMap; } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java index b75ec6cb61..10dd964b0c 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/general/SqlServerDialect.java @@ -48,7 +48,7 @@ * 数据库方言 sqlserver * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlServerDialect extends AbstractSqlDialect { @@ -102,7 +102,7 @@ public String getPageSql(MappedStatement ms, BoundSql boundSql, Object parameter @Override public String getPageSql(String sql, Page page, CacheKey pageKey) { - //处理pageKey + // 处理pageKey pageKey.update(page.getStartRow()); pageKey.update(page.getPageSize()); String cacheSql = CACHE_PAGESQL.get(sql); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java index 0d281675e8..402d208e46 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/RegexWithNolockReplaceSql.java @@ -31,14 +31,11 @@ * 正则处理 with(nolock),转换为一个 table_PAGEWITHNOLOCK * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RegexWithNolockReplaceSql implements ReplaceSql { - //with(nolock) - protected String WITHNOLOCK = ", PAGEWITHNOLOCK"; - @Override public String replace(String sql) { return sql.replaceAll("((?i)\\s*(\\w+)\\s*with\\s*\\(nolock\\))", " $2_PAGEWITHNOLOCK"); @@ -48,4 +45,5 @@ public String replace(String sql) { public String restore(String sql) { return sql.replaceAll("\\s*(\\w*?)_PAGEWITHNOLOCK", " $1 WITH(NOLOCK)"); } + } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java index b14096704a..b1864554d1 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/replace/SimpleWithNolockReplaceSql.java @@ -31,12 +31,11 @@ * 简单处理 with(nolock) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleWithNolockReplaceSql implements ReplaceSql { - //with(nolock) protected String WITHNOLOCK = ", PAGEWITHNOLOCK"; @Override diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java index 8d99e68bcb..454fd4a2d6 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/Db2RowBoundsDialect.java @@ -33,7 +33,7 @@ * db2 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Db2RowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java index 210f579db4..00a84bc3ab 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/HsqldbRowBoundsDialect.java @@ -33,7 +33,7 @@ * hsqldb 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HsqldbRowBoundsDialect extends AbstractRowBoundsDialect { @@ -54,4 +54,5 @@ public String getPageSql(String sql, RowBounds rowBounds, CacheKey pageKey) { } return sqlBuilder.toString(); } + } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java index c8cfbf7a7b..6c61d5ce36 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/InformixRowBoundsDialect.java @@ -33,7 +33,7 @@ * informix 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InformixRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java index f4883258ec..500529c7f9 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/MySqlRowBoundsDialect.java @@ -34,7 +34,7 @@ * mysql 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MySqlRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java index 64488d8ca2..0f54d936d1 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/OracleRowBoundsDialect.java @@ -33,7 +33,7 @@ * oracle 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OracleRowBoundsDialect extends AbstractRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java index d59a56caba..5a68bfb6fb 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServer2012RowBoundsDialect.java @@ -32,7 +32,7 @@ * sqlserver2012 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlServer2012RowBoundsDialect extends SqlServerRowBoundsDialect { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java index 9082f250fa..978c3acb41 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/dialect/rowbounds/SqlServerRowBoundsDialect.java @@ -42,10 +42,11 @@ * sqlserver 基于 RowBounds 的分页 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlServerRowBoundsDialect extends AbstractRowBoundsDialect { + protected SqlServerParser pageSql = new SqlServerParser(); protected ReplaceSql replaceSql; @@ -60,7 +61,7 @@ public String getCountSql(MappedStatement ms, BoundSql boundSql, Object paramete @Override public String getPageSql(String sql, RowBounds rowBounds, CacheKey pageKey) { - //处理pageKey + // 处理pageKey pageKey.update(rowBounds.getOffset()); pageKey.update(rowBounds.getLimit()); sql = replaceSql.replace(sql); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java b/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java index c8042e6856..5e36511cb9 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/parser/CountSqlParser.java @@ -41,7 +41,7 @@ * sql解析类,提供更智能的count查询sql * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CountSqlParser { @@ -137,9 +137,9 @@ public class CountSqlParser { TABLE_ALIAS.setUseAs(false); } - // + // private final Set skipFunctions = Collections.synchronizedSet(new HashSet<>()); - // + // private final Set falseFunctions = Collections.synchronizedSet(new HashSet<>()); /** @@ -174,30 +174,30 @@ public String getSmartCountSql(String sql) { * @return the string */ public String getSmartCountSql(String sql, String name) { - //解析SQL + // 解析SQL Statement stmt; - //特殊sql不需要去掉order by时,使用注释前缀 + // 特殊sql不需要去掉order by时,使用注释前缀 if (sql.indexOf(KEEP_ORDERBY) >= 0) { return getSimpleCountSql(sql, name); } try { stmt = CCJSqlParserUtil.parse(sql); } catch (Throwable e) { - //无法解析的用一般方法返回count语句 + // 无法解析的用一般方法返回count语句 return getSimpleCountSql(sql, name); } Select select = (Select) stmt; SelectBody selectBody = select.getSelectBody(); try { - //处理body-去order by + // 处理body-去order by processSelectBody(selectBody); } catch (Exception e) { - //当 sql 包含 group by 时,不去除 order by + // 当 sql 包含 group by 时,不去除 order by return getSimpleCountSql(sql, name); } - //处理with-去order by + // 处理with-去order by processWithItemsList(select.getWithItemsList()); - //处理为count查询 + // 处理为count查询 sqlToCount(select, name); return select.toString(); } @@ -260,11 +260,11 @@ public void sqlToCount(Select select, String name) { * @return the boolean */ public boolean isSimpleCount(PlainSelect select) { - //包含group by的时候不可以 + // 包含group by的时候不可以 if (select.getGroupBy() != null) { return false; } - //包含distinct的时候不可以 + // 包含distinct的时候不可以 if (select.getDistinct() != null) { return false; } @@ -273,7 +273,7 @@ public boolean isSimpleCount(PlainSelect select) { if (item.toString().contains(Symbol.QUESTION_MARK)) { return false; } - //如果查询列中包含函数,也不可以,函数可能会聚合列 + // 如果查询列中包含函数,也不可以,函数可能会聚合列 if (item instanceof SelectExpressionItem) { Expression expression = ((SelectExpressionItem) item).getExpression(); if (expression instanceof Function) { @@ -392,7 +392,7 @@ public void processFromItem(FromItem fromItem) { } } } - //Table时不用处理 + // Table时不用处理 } /** diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java b/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java index eb6475705d..e0c64ec772 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/parser/OrderByParser.java @@ -37,7 +37,7 @@ * 处理 Order by * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OrderByParser { @@ -54,13 +54,13 @@ public static String converToOrderBySql(String sql, String orderBy) { Statement stmt = CCJSqlParserUtil.parse(sql); Select select = (Select) stmt; SelectBody selectBody = select.getSelectBody(); - //处理body-去最外层order by + // 处理body-去最外层order by List orderByElements = extraOrderBy(selectBody); String defaultOrderBy = PlainSelect.orderByToString(orderByElements); if (defaultOrderBy.indexOf(Symbol.C_QUESTION_MARK) != -1) { throw new PageException("原SQL[" + sql + "]中的order by包含参数,因此不能使用OrderBy插件进行修改!"); } - //新的sql + // 新的sql sql = select.toString(); } catch (Throwable e) { throw new PageException("处理排序失败: " + e, e); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java b/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java index 7023ec4532..3be43d2f7f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/parser/SqlServerParser.java @@ -52,31 +52,51 @@ * 该类设计为一个独立的工具类,依赖jsqlparser,可以独立使用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlServerParser { - //开始行号 + /** + * 开始行号 + */ public static final String START_ROW = String.valueOf(Long.MIN_VALUE); - //结束行号 + /** + * 结束行号 + */ public static final String PAGE_SIZE = String.valueOf(Long.MAX_VALUE); - //外层包装表 + /** + * 外层包装表 + */ protected static final String WRAP_TABLE = "WRAP_OUTER_TABLE"; - //表别名名字 + /** + * 表别名名字 + */ protected static final String PAGE_TABLE_NAME = "PAGE_TABLE_ALIAS"; - //protected + /** + * protected + */ public static final Alias PAGE_TABLE_ALIAS = new Alias(PAGE_TABLE_NAME); - //行号 + /** + * 行号 + */ protected static final String PAGE_ROW_NUMBER = "PAGE_ROW_NUMBER"; - //行号列 + /** + * 行号列 + */ protected static final Column PAGE_ROW_NUMBER_COLUMN = new Column(PAGE_ROW_NUMBER); - //TOP 100 PERCENT + /** + * TOP 100 PERCENT + */ protected static final Top TOP100_PERCENT; - //别名前缀 + /** + * 别名前缀 + */ protected static final String PAGE_COLUMN_ALIAS_PREFIX = "ROW_ALIAS_"; - //静态方法处理 + /** + * 静态方法处理 + */ static { TOP100_PERCENT = new Top(); TOP100_PERCENT.setExpression(new LongValue(100)); @@ -102,7 +122,7 @@ public String convertToPageSql(String sql) { * @return the string */ public String convertToPageSql(String sql, Integer offset, Integer limit) { - //解析SQL + // 解析SQL Statement stmt; try { stmt = CCJSqlParserUtil.parse(sql); @@ -112,10 +132,10 @@ public String convertToPageSql(String sql, Integer offset, Integer limit) { if (!(stmt instanceof Select)) { throw new PageException("分页语句必须是Select查询!"); } - //获取分页查询的select + // 获取分页查询的select Select pageSelect = getPageSelect((Select) stmt); String pageSql = pageSelect.toString(); - //缓存移到外面了,所以不替换参数 + // 缓存移到外面了,所以不替换参数 if (offset != null) { pageSql = pageSql.replace(START_ROW, String.valueOf(offset)); } @@ -136,23 +156,23 @@ protected Select getPageSelect(Select select) { if (selectBody instanceof SetOperationList) { selectBody = wrapSetOperationList((SetOperationList) selectBody); } - //这里的selectBody一定是PlainSelect + // 这里的selectBody一定是PlainSelect if (((PlainSelect) selectBody).getTop() != null) { throw new PageException("被分页的语句已经包含了Top,不能再通过分页插件进行分页查询!"); } - //获取查询列 + // 获取查询列 List selectItems = getSelectItems((PlainSelect) selectBody); - //对一层的SQL增加ROW_NUMBER() + // 对一层的SQL增加ROW_NUMBER() List autoItems = new ArrayList<>(); SelectItem orderByColumn = addRowNumber((PlainSelect) selectBody, autoItems); - //加入自动生成列 + // 加入自动生成列 ((PlainSelect) selectBody).addSelectItems(autoItems.toArray(new SelectItem[autoItems.size()])); - //处理子语句中的order by + // 处理子语句中的order by processSelectBody(selectBody, 0); - //中层子查询 + // 中层子查询 PlainSelect innerSelectBody = new PlainSelect(); - //PAGE_ROW_NUMBER + // PAGE_ROW_NUMBER innerSelectBody.addSelectItems(orderByColumn); innerSelectBody.addSelectItems(selectItems.toArray(new SelectItem[selectItems.size()])); //将原始查询作为内层子查询 @@ -161,29 +181,30 @@ protected Select getPageSelect(Select select) { fromInnerItem.setAlias(PAGE_TABLE_ALIAS); innerSelectBody.setFromItem(fromInnerItem); - //新建一个select + // 新建一个select Select newSelect = new Select(); PlainSelect newSelectBody = new PlainSelect(); - //设置top + // 设置top Top top = new Top(); top.setExpression(new LongValue(Long.MAX_VALUE)); newSelectBody.setTop(top); - //设置order by + // 设置order by List orderByElements = new ArrayList<>(); OrderByElement orderByElement = new OrderByElement(); orderByElement.setExpression(PAGE_ROW_NUMBER_COLUMN); orderByElements.add(orderByElement); newSelectBody.setOrderByElements(orderByElements); - //设置where + // 设置where GreaterThan greaterThan = new GreaterThan(); greaterThan.setLeftExpression(PAGE_ROW_NUMBER_COLUMN); greaterThan.setRightExpression(new LongValue(Long.MIN_VALUE)); newSelectBody.setWhere(greaterThan); - //设置selectItems + // 设置selectItems newSelectBody.setSelectItems(selectItems); - //设置fromIterm + // 设置fromIterm SubSelect fromItem = new SubSelect(); - fromItem.setSelectBody(innerSelectBody); //中层子查询 + // 中层子查询 + fromItem.setSelectBody(innerSelectBody); fromItem.setAlias(PAGE_TABLE_ALIAS); newSelectBody.setFromItem(fromItem); @@ -201,7 +222,7 @@ protected Select getPageSelect(Select select) { * @return the selectBody */ protected SelectBody wrapSetOperationList(SetOperationList setOperationList) { - //获取最后一个plainSelect + // 获取最后一个plainSelect SelectBody setSelectBody = setOperationList.getSelects().get(setOperationList.getSelects().size() - 1); if (!(setSelectBody instanceof PlainSelect)) { throw new PageException("目前无法处理该SQL,您可以将该SQL发送给abel533@gmail.com协助作者解决!"); @@ -211,12 +232,12 @@ protected SelectBody wrapSetOperationList(SetOperationList setOperationList) { List selectItems = getSelectItems(plainSelect); selectBody.setSelectItems(selectItems); - //设置fromIterm + // 设置fromIterm SubSelect fromItem = new SubSelect(); fromItem.setSelectBody(setOperationList); fromItem.setAlias(new Alias(WRAP_TABLE)); selectBody.setFromItem(fromItem); - //order by + // order by if (isNotEmptyList(plainSelect.getOrderByElements())) { selectBody.setOrderByElements(plainSelect.getOrderByElements()); plainSelect.setOrderByElements(null); @@ -231,14 +252,14 @@ protected SelectBody wrapSetOperationList(SetOperationList setOperationList) { * @return 结果 */ protected List getSelectItems(PlainSelect plainSelect) { - //设置selectItems + // 设置selectItems List selectItems = new ArrayList<>(); for (SelectItem selectItem : plainSelect.getSelectItems()) { - //别名需要特殊处理 + // 别名需要特殊处理 if (selectItem instanceof SelectExpressionItem) { SelectExpressionItem selectExpressionItem = (SelectExpressionItem) selectItem; if (selectExpressionItem.getAlias() != null) { - //直接使用别名 + // 直接使用别名 Column column = new Column(selectExpressionItem.getAlias().getName()); SelectExpressionItem expressionItem = new SelectExpressionItem(column); selectItems.add(expressionItem); @@ -282,13 +303,13 @@ protected List getSelectItems(PlainSelect plainSelect) { * @return ROW_NUMBER() 列 */ protected SelectItem addRowNumber(PlainSelect plainSelect, List autoItems) { - //增加ROW_NUMBER() + // 增加ROW_NUMBER() StringBuilder orderByBuilder = new StringBuilder(); orderByBuilder.append("ROW_NUMBER() OVER ("); if (isNotEmptyList(plainSelect.getOrderByElements())) { orderByBuilder.append(PlainSelect.orderByToString( getOrderByElements(plainSelect, autoItems)).substring(1)); - //清空排序列表 + // 清空排序列表 plainSelect.setOrderByElements(null); } else { orderByBuilder.append("ORDER BY RAND()"); @@ -385,7 +406,6 @@ protected void processFromItem(FromItem fromItem, int level) { } } } - //Table时不用处理 } public boolean isNotEmptyList(List list) { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java index 2e283ccffa..21d5457ad0 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountExecutor.java @@ -25,6 +25,7 @@ ********************************************************************************/ package org.aoju.bus.pager.plugin; +import org.aoju.bus.logger.Logger; import org.aoju.bus.pager.PageException; import org.aoju.bus.pager.dialect.Dialect; import org.apache.ibatis.cache.CacheKey; @@ -44,17 +45,17 @@ * count 查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class CountExecutor { - private static Field additionalParametersField; + private static final Field ADDITIONAL_PARAMETERS_FIELD; static { try { - additionalParametersField = BoundSql.class.getDeclaredField("additionalParameters"); - additionalParametersField.setAccessible(true); + ADDITIONAL_PARAMETERS_FIELD = BoundSql.class.getDeclaredField("additionalParameters"); + ADDITIONAL_PARAMETERS_FIELD.setAccessible(true); } catch (NoSuchFieldException e) { throw new PageException("获取 BoundSql 属性 additionalParameters 失败: " + e, e); } @@ -68,7 +69,7 @@ public abstract class CountExecutor { */ public static Map getAdditionalParameter(BoundSql boundSql) { try { - return (Map) additionalParametersField.get(boundSql); + return (Map) ADDITIONAL_PARAMETERS_FIELD.get(boundSql); } catch (IllegalAccessException e) { throw new PageException("获取 BoundSql 属性值 additionalParameters 失败: " + e, e); } @@ -86,7 +87,7 @@ public static MappedStatement getExistedMappedStatement(Configuration configurat try { mappedStatement = configuration.getMappedStatement(msId, false); } catch (Throwable t) { - //ignore + Logger.warn(t.getMessage()); } return mappedStatement; } @@ -108,8 +109,7 @@ public static Long executeManualCount(Executor executor, MappedStatement countMs CacheKey countKey = executor.createCacheKey(countMs, parameter, RowBounds.DEFAULT, boundSql); BoundSql countBoundSql = countMs.getBoundSql(parameter); Object countResultList = executor.query(countMs, parameter, RowBounds.DEFAULT, resultHandler, countKey, countBoundSql); - Long count = ((Number) ((List) countResultList).get(0)).longValue(); - return count; + return ((Number) ((List) countResultList).get(0)).longValue(); } /** @@ -129,20 +129,19 @@ public static Long executeAutoCount(Dialect dialect, Executor executor, MappedSt Object parameter, BoundSql boundSql, RowBounds rowBounds, ResultHandler resultHandler) throws SQLException { Map additionalParameters = getAdditionalParameter(boundSql); - //创建 count 查询的缓存 key + // 创建 count 查询的缓存 key CacheKey countKey = executor.createCacheKey(countMs, parameter, RowBounds.DEFAULT, boundSql); - //调用方言获取 count sql + // 调用方言获取 count sql String countSql = dialect.getCountSql(countMs, boundSql, parameter, rowBounds, countKey); - //countKey.update(countSql); + // countKey.update(countSql); BoundSql countBoundSql = new BoundSql(countMs.getConfiguration(), countSql, boundSql.getParameterMappings(), parameter); - //当使用动态 SQL 时,可能会产生临时的参数,这些参数需要手动设置到新的 BoundSql 中 + // 当使用动态 SQL 时,可能会产生临时的参数,这些参数需要手动设置到新的 BoundSql 中 for (String key : additionalParameters.keySet()) { countBoundSql.setAdditionalParameter(key, additionalParameters.get(key)); } - //执行 count 查询 + // 执行 count 查询 Object countResultList = executor.query(countMs, parameter, RowBounds.DEFAULT, resultHandler, countKey, countBoundSql); - Long count = (Long) ((List) countResultList).get(0); - return count; + return (Long) ((List) countResultList).get(0); } /** @@ -163,25 +162,25 @@ public static Long executeAutoCount(Dialect dialect, Executor executor, MappedSt public static List pageQuery(Dialect dialect, Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql, CacheKey cacheKey) throws SQLException { - //判断是否需要进行分页查询 + // 判断是否需要进行分页查询 if (dialect.beforePage(ms, parameter, rowBounds)) { - //生成分页的缓存 key + // 生成分页的缓存 key CacheKey pageKey = cacheKey; - //处理参数对象 + // 处理参数对象 parameter = dialect.processParameterObject(ms, parameter, boundSql, pageKey); - //调用方言获取分页 sql + // 调用方言获取分页 sql String pageSql = dialect.getPageSql(ms, boundSql, parameter, rowBounds, pageKey); BoundSql pageBoundSql = new BoundSql(ms.getConfiguration(), pageSql, boundSql.getParameterMappings(), parameter); Map additionalParameters = getAdditionalParameter(boundSql); - //设置动态参数 + // 设置动态参数 for (String key : additionalParameters.keySet()) { pageBoundSql.setAdditionalParameter(key, additionalParameters.get(key)); } - //执行分页查询 + // 执行分页查询 return executor.query(ms, parameter, RowBounds.DEFAULT, resultHandler, pageKey, pageBoundSql); } else { - //不执行分页的情况下,也不执行内存分页 + // 不执行分页的情况下,也不执行内存分页 return executor.query(ms, parameter, RowBounds.DEFAULT, resultHandler, cacheKey, boundSql); } } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java index 072b4e9e1d..c7ed35ed06 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/CountMappedStatement.java @@ -37,7 +37,7 @@ * 创建新的MappedStatement,主要是Count返回值int * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CountMappedStatement { @@ -68,7 +68,7 @@ public static MappedStatement newCountMappedStatement(MappedStatement ms, String } builder.timeout(ms.getTimeout()); builder.parameterMap(ms.getParameterMap()); - //count查询返回值int + // count查询返回值int List resultMaps = new ArrayList<>(); ResultMap resultMap = new ResultMap.Builder(ms.getConfiguration(), ms.getId(), Long.class, EMPTY_RESULTMAPPING).build(); resultMaps.add(resultMap); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java index 73faf877ce..f6720a1aa0 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageFromObject.java @@ -26,9 +26,10 @@ package org.aoju.bus.pager.plugin; import org.aoju.bus.core.lang.Normal; -import org.aoju.bus.pager.IPage; +import org.aoju.bus.logger.Logger; import org.aoju.bus.pager.Page; import org.aoju.bus.pager.PageException; +import org.aoju.bus.pager.Paging; import org.aoju.bus.pager.reflect.MetaObject; import java.lang.reflect.Method; @@ -39,23 +40,23 @@ * 分页参数对象工具类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class PageFromObject { - protected static Boolean hasRequest; - protected static Class requestClass; - protected static Method getParameterMap; + protected static Boolean HAS_REQUEST; + protected static Class REQUEST_CLASS; + protected static Method GET_PARAMETER_MAP; protected static Map PARAMS = new HashMap<>(6, 1); static { try { - requestClass = Class.forName("javax.servlet.ServletRequest"); - getParameterMap = requestClass.getMethod("getParameterMap", new Class[]{}); - hasRequest = true; + REQUEST_CLASS = Class.forName("javax.servlet.ServletRequest"); + GET_PARAMETER_MAP = REQUEST_CLASS.getMethod("getParameterMap"); + HAS_REQUEST = true; } catch (Throwable e) { - hasRequest = false; + HAS_REQUEST = false; } PARAMS.put("pageNo", "pageNo"); PARAMS.put("pageSize", "pageSize"); @@ -77,8 +78,8 @@ public static Page getPageFromObject(Object params, boolean required) { if (params == null) { throw new PageException("无法获取分页查询参数!"); } - if (params instanceof IPage) { - IPage pageParams = (IPage) params; + if (params instanceof Paging) { + Paging pageParams = (Paging) params; Page page = null; if (pageParams.getPageNo() != null && pageParams.getPageSize() != null) { page = new Page(pageParams.getPageNo(), pageParams.getPageSize()); @@ -97,11 +98,12 @@ public static Page getPageFromObject(Object params, boolean required) { int pageNo; int pageSize; org.apache.ibatis.reflection.MetaObject paramsObject = null; - if (hasRequest && requestClass.isAssignableFrom(params.getClass())) { + if (HAS_REQUEST && REQUEST_CLASS.isAssignableFrom(params.getClass())) { try { - paramsObject = MetaObject.forObject(getParameterMap.invoke(params, new Object[]{})); + paramsObject = MetaObject.forObject(GET_PARAMETER_MAP.invoke(params)); } catch (Exception e) { - //忽略 + // 忽略 + Logger.warn(e.getMessage()); } } else { paramsObject = MetaObject.forObject(params); @@ -132,21 +134,21 @@ public static Page getPageFromObject(Object params, boolean required) { throw new PageException("分页参数不是合法的数字类型!", e); } Page page = new Page(pageNo, pageSize); - //count查询 + // count查询 Object _count = getParamValue(paramsObject, "count", false); if (_count != null) { page.setCount(Boolean.valueOf(String.valueOf(_count))); } - //排序 + // 排序 if (hasOrderBy) { page.setOrderBy(orderBy.toString()); } - //分页合理化 + // 分页合理化 Object reasonable = getParamValue(paramsObject, "reasonable", false); if (reasonable != null) { page.setReasonable(Boolean.valueOf(String.valueOf(reasonable))); } - //查询全部 + // 查询全部 Object pageSizeZero = getParamValue(paramsObject, "pageSizeZero", false); if (pageSizeZero != null) { page.setPageSizeZero(Boolean.valueOf(String.valueOf(pageSizeZero))); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java index bca3e6d2f8..0257de3b5c 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/PageInterceptor.java @@ -46,7 +46,7 @@ * Mybatis - 通用分页拦截器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Intercepts( @@ -73,35 +73,35 @@ public Object intercept(Invocation invocation) throws Throwable { Executor executor = (Executor) invocation.getTarget(); CacheKey cacheKey; BoundSql boundSql; - //由于逻辑关系,只会进入一次 + // 由于逻辑关系,只会进入一次 if (args.length == 4) { - //4 个参数时 + // 4 个参数时 boundSql = ms.getBoundSql(parameter); cacheKey = executor.createCacheKey(ms, parameter, rowBounds, boundSql); } else { - //6 个参数时 + // 6 个参数时 cacheKey = (CacheKey) args[4]; boundSql = (BoundSql) args[5]; } checkDialectExists(); List resultList; - //调用方法判断是否需要进行分页,如果不需要,直接返回结果 + // 调用方法判断是否需要进行分页,如果不需要,直接返回结果 if (!dialect.skip(ms, parameter, rowBounds)) { - //判断是否需要进行 count 查询 + // 判断是否需要进行 count 查询 if (dialect.beforeCount(ms, parameter, rowBounds)) { - //查询总数 + // 查询总数 Long count = count(executor, ms, parameter, rowBounds, resultHandler, boundSql); - //处理查询总数,返回 true 时继续分页查询,false 时直接返回 + // 处理查询总数,返回 true 时继续分页查询,false 时直接返回 if (!dialect.afterCount(count, parameter, rowBounds)) { - //当查询总数为 0 时,直接返回空的结果 + // 当查询总数为 0 时,直接返回空的结果 return dialect.afterPage(new ArrayList(), parameter, rowBounds); } } resultList = CountExecutor.pageQuery(dialect, executor, ms, parameter, rowBounds, resultHandler, boundSql, cacheKey); } else { - //rowBounds用参数值,不使用分页插件处理时,仍然支持默认的内存分页 + // rowBounds用参数值,不使用分页插件处理时,仍然支持默认的内存分页 resultList = executor.query(ms, parameter, rowBounds, resultHandler, cacheKey, boundSql); } return dialect.afterPage(resultList, parameter, rowBounds); @@ -132,15 +132,15 @@ private Long count(Executor executor, MappedStatement ms, Object parameter, BoundSql boundSql) throws SQLException { String countMsId = ms.getId() + countSuffix; Long count; - //先判断是否存在手写的 count 查询 + // 先判断是否存在手写的 count 查询 MappedStatement countMs = CountExecutor.getExistedMappedStatement(ms.getConfiguration(), countMsId); if (countMs != null) { count = CountExecutor.executeManualCount(executor, countMs, parameter, boundSql, resultHandler); } else { countMs = msCountMap.get(countMsId); - //自动创建 + // 自动创建 if (countMs == null) { - //根据当前的 ms 创建一个返回值为 Long 类型的 ms + // 根据当前的 ms 创建一个返回值为 Long 类型的 ms countMs = CountMappedStatement.newCountMappedStatement(ms, countMsId); msCountMap.put(countMsId, countMs); } @@ -156,7 +156,7 @@ public Object plugin(Object target) { @Override public void setProperties(Properties properties) { - //缓存 count ms + // 缓存 count ms msCountMap = CacheFactory.createCache(properties.getProperty("msCountCache"), "ms", properties); String dialectClass = properties.getProperty("dialect"); if (PageFromObject.isEmpty(dialectClass)) { diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java index c996effb2c..66d6b6ee36 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/plugin/QueryInterceptor.java @@ -39,7 +39,7 @@ * QueryInterceptor 规范 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Intercepts( @@ -60,18 +60,17 @@ public Object intercept(Invocation invocation) throws Throwable { Executor executor = (Executor) invocation.getTarget(); CacheKey cacheKey; BoundSql boundSql; - //由于逻辑关系,只会进入一次 + // 由于逻辑关系,只会进入一次 if (args.length == 4) { - //4 个参数时 + // 4 个参数时 boundSql = ms.getBoundSql(parameter); cacheKey = executor.createCacheKey(ms, parameter, rowBounds, boundSql); } else { - //6 个参数时 + // 6 个参数时 cacheKey = (CacheKey) args[4]; boundSql = (BoundSql) args[5]; } - //TODO 自己要进行的各种处理 - //注:下面的方法可以根据自己的逻辑调用多次,在分页插件中,count 和 proxy 各调用了一次 + // 注:下面的方法可以根据自己的逻辑调用多次,在分页插件中,count 和 proxy 各调用了一次 return executor.query(ms, parameter, rowBounds, resultHandler, cacheKey, boundSql); } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java index a663ca8f99..2533b62b3a 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageAutoDialect.java @@ -46,12 +46,12 @@ * 基础方言信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageAutoDialect { - private static Map> dialectAliasMap = new HashMap<>(); + private static final Map> DIALECT_ALIAS_MAP = new HashMap<>(); static { registerDialectAlias("db2", Db2Dialect.class); @@ -84,23 +84,36 @@ public class PageAutoDialect { registerDialectAlias("derby", SqlServer2012Dialect.class); } - // 缓存 + /** + * 缓存 + */ private final Map urlDialectMap = new ConcurrentHashMap<>(); private final ThreadLocal dialectThreadLocal = new ThreadLocal<>(); - // 自动获取dialect,如果没有setProperties或setSqlUtilConfig,也可以正常进行 + // + private final ReentrantLock lock = new ReentrantLock(); + /** + * 自动获取dialect,如果没有setProperties或setSqlUtilConfig,也可以正常进行 + */ private boolean autoDialect = true; - // 多数据源时,获取jdbcurl后是否关闭数据源 + /** + * 多数据源时,获取jdbcurl后是否关闭数据源 + */ private boolean closeConn = true; - private ReentrantLock lock = new ReentrantLock(); - // 属性配置 + /** + * 属性配置 + */ private Properties properties; private AbstractSqlDialect delegate; public static void registerDialectAlias(String alias, Class dialectClass) { - dialectAliasMap.put(alias, dialectClass); + DIALECT_ALIAS_MAP.put(alias, dialectClass); } - // 多数据动态获取时,每次需要初始化 + /** + * 多数据动态获取时,每次需要初始化 + * + * @param ms 执行映射的语句 + */ public void initDelegateDialect(MappedStatement ms) { if (delegate == null) { if (autoDialect) { @@ -125,7 +138,7 @@ public void clearDelegate() { } private String fromJdbcUrl(String jdbcUrl) { - for (String dialect : dialectAliasMap.keySet()) { + for (String dialect : DIALECT_ALIAS_MAP.keySet()) { if (jdbcUrl.indexOf(Symbol.COLON + dialect + Symbol.COLON) != -1) { return dialect; } @@ -141,8 +154,8 @@ private String fromJdbcUrl(String jdbcUrl) { * @throws Exception 异常 */ private Class resloveDialectClass(String className) throws Exception { - if (dialectAliasMap.containsKey(className.toLowerCase())) { - return dialectAliasMap.get(className.toLowerCase()); + if (DIALECT_ALIAS_MAP.containsKey(className.toLowerCase())) { + return DIALECT_ALIAS_MAP.get(className.toLowerCase()); } else { return Class.forName(className); } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java index fc99caded1..91955e44f2 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageMethod.java @@ -25,8 +25,8 @@ ********************************************************************************/ package org.aoju.bus.pager.proxy; -import org.aoju.bus.pager.ISelect; import org.aoju.bus.pager.Page; +import org.aoju.bus.pager.Querying; import org.aoju.bus.pager.plugin.PageFromObject; import java.util.Properties; @@ -35,7 +35,7 @@ * 基础分页方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class PageMethod { @@ -75,7 +75,7 @@ public static void clearPage() { * @param select 查询对象 * @return the long */ - public static long count(ISelect select) { + public static long count(Querying select) { Page page = startPage(1, -1, true); select.doSelect(); return page.getTotal(); @@ -90,7 +90,7 @@ public static long count(ISelect select) { */ public static Page startPage(Object params) { Page page = PageFromObject.getPageFromObject(params, true); - //当已经执行过orderBy的时候 + // 当已经执行过orderBy的时候 Page oldPage = getLocalPage(); if (oldPage != null && oldPage.isOrderByOnly()) { page.setOrderBy(oldPage.getOrderBy()); @@ -154,7 +154,7 @@ public static Page startPage(int pageNo, int pageSize, boolean count, Boo Page page = new Page<>(pageNo, pageSize, count); page.setReasonable(reasonable); page.setPageSizeZero(pageSizeZero); - //当已经执行过orderBy的时候 + // 当已经执行过orderBy的时候 Page oldPage = getLocalPage(); if (oldPage != null && oldPage.isOrderByOnly()) { page.setOrderBy(oldPage.getOrderBy()); @@ -186,7 +186,7 @@ public static Page offsetPage(int offset, int limit) { */ public static Page offsetPage(int offset, int limit, boolean count) { Page page = new Page<>(new int[]{offset, limit}, count); - //当已经执行过orderBy的时候 + // 当已经执行过orderBy的时候 Page oldPage = getLocalPage(); if (oldPage != null && oldPage.isOrderByOnly()) { page.setOrderBy(oldPage.getOrderBy()); @@ -218,7 +218,7 @@ public static void orderBy(String orderBy) { * @param properties 插件属性 */ protected static void setStaticProperties(Properties properties) { - //defaultCount,这是一个全局生效的参数,多数据源时也是统一的行为 + // defaultCount,这是一个全局生效的参数,多数据源时也是统一的行为 if (properties != null) { DEFAULT_COUNT = Boolean.valueOf(properties.getProperty("defaultCount", "true")); } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java index c2d3bd8e50..4a81a88f86 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/proxy/PageParams.java @@ -26,12 +26,11 @@ package org.aoju.bus.pager.proxy; import org.aoju.bus.core.lang.Symbol; -import org.aoju.bus.pager.IPage; import org.aoju.bus.pager.Page; import org.aoju.bus.pager.PageContext; -import org.aoju.bus.pager.PageRowBounds; +import org.aoju.bus.pager.Paging; +import org.aoju.bus.pager.RowBounds; import org.aoju.bus.pager.plugin.PageFromObject; -import org.apache.ibatis.session.RowBounds; import java.util.Properties; @@ -39,22 +38,34 @@ * Page 参数信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageParams { - //RowBounds参数offset作为PageNo使用 - 默认不使用 + /** + * RowBounds参数offset作为PageNo使用 - 默认不使用 + */ protected boolean offsetAsPageNo = false; - //RowBounds是否进行count查询 - 默认不查询 + /** + * RowBounds是否进行count查询 - 默认不查询 + */ protected boolean rowBoundsWithCount = false; - //当设置为true的时候,如果pagesize设置为0(或RowBounds的limit=0),就不执行分页,返回全部结果 + /** + * 当设置为true的时候,如果pagesize设置为0(或RowBounds的limit=0),就不执行分页,返回全部结果 + */ protected boolean pageSizeZero = false; - //分页合理化 + /** + * 分页合理化 + */ protected boolean reasonable = false; - //是否支持接口参数来传递分页参数,默认false + /** + * 是否支持接口参数来传递分页参数,默认false + */ protected boolean supportMethodsArguments = false; - //默认count(0) + /** + * 默认count(0) + */ protected String countColumn = Symbol.ZERO; /** @@ -64,22 +75,22 @@ public class PageParams { * @param rowBounds rowBounds对象 * @return the page */ - public Page getPage(Object parameterObject, RowBounds rowBounds) { + public Page getPage(Object parameterObject, org.apache.ibatis.session.RowBounds rowBounds) { Page page = PageContext.getLocalPage(); if (page == null) { - if (rowBounds != RowBounds.DEFAULT) { + if (rowBounds != org.apache.ibatis.session.RowBounds.DEFAULT) { if (offsetAsPageNo) { page = new Page(rowBounds.getOffset(), rowBounds.getLimit(), rowBoundsWithCount); } else { page = new Page(new int[]{rowBounds.getOffset(), rowBounds.getLimit()}, rowBoundsWithCount); - //offsetAsPageNo=false的时候,由于PageNo问题,不能使用reasonable,这里会强制为false + // offsetAsPageNo=false的时候,由于PageNo问题,不能使用reasonable,这里会强制为false page.setReasonable(false); } - if (rowBounds instanceof PageRowBounds) { - PageRowBounds pageRowBounds = (PageRowBounds) rowBounds; + if (rowBounds instanceof RowBounds) { + RowBounds pageRowBounds = (RowBounds) rowBounds; page.setCount(pageRowBounds.getCount() == null || pageRowBounds.getCount()); } - } else if (parameterObject instanceof IPage || supportMethodsArguments) { + } else if (parameterObject instanceof Paging || supportMethodsArguments) { try { page = PageFromObject.getPageFromObject(parameterObject, false); } catch (Exception e) { @@ -91,11 +102,11 @@ public Page getPage(Object parameterObject, RowBounds rowBounds) { } PageContext.setLocalPage(page); } - //分页合理化 + // 分页合理化 if (page.getReasonable() == null) { page.setReasonable(reasonable); } - //当设置为true的时候,如果pagesize设置为0(或RowBounds的limit=0),就不执行分页,返回全部结果 + // 当设置为true的时候,如果pagesize设置为0(或RowBounds的limit=0),就不执行分页,返回全部结果 if (page.getPageSizeZero() == null) { page.setPageSizeZero(pageSizeZero); } @@ -103,28 +114,27 @@ public Page getPage(Object parameterObject, RowBounds rowBounds) { } public void setProperties(Properties properties) { - //offset作为PageNum使用 + // offset作为PageNo使用 String offsetAsPageNo = properties.getProperty("offsetAsPageNo"); this.offsetAsPageNo = Boolean.parseBoolean(offsetAsPageNo); - //RowBounds方式是否做count查询 + // RowBounds方式是否做count查询 String rowBoundsWithCount = properties.getProperty("rowBoundsWithCount"); this.rowBoundsWithCount = Boolean.parseBoolean(rowBoundsWithCount); - //当设置为true的时候,如果pagesize设置为0(或RowBounds的limit=0),就不执行分页 + // 当设置为true的时候,如果pagesize设置为0(或RowBounds的limit=0),就不执行分页 String pageSizeZero = properties.getProperty("pageSizeZero"); this.pageSizeZero = Boolean.parseBoolean(pageSizeZero); - //分页合理化,true开启,如果分页参数不合理会自动修正 默认false不启用 + // 分页合理化,true开启,如果分页参数不合理会自动修正 默认false不启用 String reasonable = properties.getProperty("reasonable"); this.reasonable = Boolean.parseBoolean(reasonable); - //是否支持接口参数来传递分页参数,默认false + // 是否支持接口参数来传递分页参数,默认false String supportMethodsArguments = properties.getProperty("supportMethodsArguments"); this.supportMethodsArguments = Boolean.parseBoolean(supportMethodsArguments); - //默认count列 + // 默认count列 String countColumn = properties.getProperty("countColumn"); if (PageFromObject.isNotEmpty(countColumn)) { this.countColumn = countColumn; } - //当offsetAsPageNo=false的时候,不能 - //参数映射 + // 当offsetAsPageNo=false的时候,不能参数映射 PageFromObject.setParams(properties.getProperty("params")); } diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java index 051c1ace91..9d90dbe3ab 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObject.java @@ -33,7 +33,7 @@ * 反射工具 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MetaObject { @@ -43,7 +43,7 @@ public class MetaObject { static { try { // 高版本中的 MetaObject.forObject 有 4 个参数,低版本是 1 个 - //先判断当前使用的是否为高版本 + // 先判断当前使用的是否为高版本 Class.forName("org.apache.ibatis.reflection.ReflectorFactory"); // 下面这个 MetaObjectWithCache 带反射的缓存信息 Class metaClass = Class.forName("org.aoju.bus.pager.reflect.MetaObjectWithCache"); diff --git a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java index fa0d94c8d9..b51806d21f 100755 --- a/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java +++ b/bus-pager/src/main/java/org/aoju/bus/pager/reflect/MetaObjectWithCache.java @@ -38,7 +38,7 @@ * 反射带缓存,提高反射性能 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MetaObjectWithCache { diff --git a/bus-proxy/pom.xml b/bus-proxy/pom.xml index d092f84526..87a6c95997 100755 --- a/bus-proxy/pom.xml +++ b/bus-proxy/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-proxy - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java index 7732d1f369..b458d3e3f2 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Builder.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java index 068fe876c4..2986e49712 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Factory.java @@ -38,7 +38,7 @@ * {@link CglibFactory}或 {@link JavassistFactory}代替 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Factory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java index e34583df6c..488f5a7a54 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Interceptor.java @@ -29,7 +29,7 @@ * "拦截"方法调用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java index d5dcda2c90..d23f77fa10 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invocation.java @@ -31,7 +31,7 @@ * 调用者方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Invocation { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java index ff93f69914..9dc83414f9 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Invoker.java @@ -31,7 +31,7 @@ * 调用程序负责处理方法调用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java index 63b865ee1b..1cf5ab59a6 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/Provider.java @@ -29,7 +29,7 @@ * 为委托代理提供对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java index a35bc450e6..80f66ebdcd 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/Aspectj.java @@ -31,7 +31,7 @@ * 切面接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Aspectj { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java index 6260ea0adf..9c007b590c 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjSimple.java @@ -33,7 +33,7 @@ * 可以继承此类实现自己需要的方法即可 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AspectjSimple implements Aspectj, Serializable { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java index 797a08edc8..e22d7de8bf 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/aspects/AspectjTimes.java @@ -34,7 +34,7 @@ * 通过日志打印方法的执行时间的切面 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AspectjTimes extends AspectjSimple { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java index 61cb8ef444..793b9d566d 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractFactory.java @@ -45,7 +45,7 @@ * 超类为{@link Factory},它支持子类化而不仅仅是实现接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractFactory extends Factory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java index 12643dedd5..073199c960 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/AbstractProxyClass.java @@ -33,7 +33,7 @@ * 用于{@link ProxyClass}实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProxyClass implements ProxyClass { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java index bf8b65be19..4d8e052b6b 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/MethodSignature.java @@ -33,7 +33,7 @@ * 用于捕获方法签名的类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MethodSignature { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java index ebde6dc5a7..53549d9d5c 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClass.java @@ -29,7 +29,7 @@ * 代理类生成器生成特定类型的代理(拦截器、调用程序等) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ProxyClass { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java index 5eb95ba436..04345bd907 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/ProxyClassCache.java @@ -37,7 +37,7 @@ * 代理类缓存确保每个{@link AbstractProxyClass}/{@link ClassLoader}/代理类数组组合只有一个类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProxyClassCache { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java index e894b49552..e40ed38d38 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/cglib/CglibFactory.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CglibFactory extends AbstractFactory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java index 5b1a2228e8..b517d1e051 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistFactory.java @@ -45,7 +45,7 @@ * Javassist 3.0或更高版本 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JavassistFactory extends AbstractFactory { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java index 0368908aa7..98c60c649b 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistInvocation.java @@ -45,7 +45,7 @@ * 动态创建子类来处理特定的接口方法(它们是硬连接的) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class JavassistInvocation implements Invocation { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java index 3cd66f6e8a..0ffb8a8046 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/factory/javassist/JavassistKit.java @@ -37,7 +37,7 @@ * 处理Javassist的实用方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ class JavassistKit { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java index 0bd5e4d2f9..644aa5ca44 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/CglibInterceptor.java @@ -36,7 +36,7 @@ * Cglib实现的动态代理切面 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CglibInterceptor implements MethodInterceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java index e24dc23c63..6b22e8d331 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/FilteredInterceptor.java @@ -33,7 +33,7 @@ * 只在方法被提供的MethodFilter接受的情况下调用它 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FilteredInterceptor implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java index 6f4a54e2d6..4d9845bebd 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/InterceptorChain.java @@ -35,7 +35,7 @@ * {@link Interceptor interceptors}的代理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InterceptorChain { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java index 8e74c99827..309ef14842 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/JavassistInterceptor.java @@ -38,7 +38,7 @@ * JDK实现的动态代理切面 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JavassistInterceptor implements InvocationHandler, Serializable { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java index b6214d7f6c..1726c629fd 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/LoggingInterceptor.java @@ -36,7 +36,7 @@ * 注意:这个类的实现是从HiveMind的日志拦截器中借来的 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LoggingInterceptor implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java index 41ab27e4f6..40c52111a1 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodAdapter.java @@ -38,7 +38,7 @@ * 接口适应于Proxy的{@link Interceptor}接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MethodAdapter implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java index cef85de3bf..c4791477a1 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/MethodFilter.java @@ -31,7 +31,7 @@ * 一个MethodFilter决定一个方法是否被接受 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java index 5e49beba90..e0c0346333 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/SerializingInterceptor.java @@ -35,7 +35,7 @@ * 这在测试远程服务以确保所有参数/返回类型实际上都是可序列化/反序列化的时候非常有用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SerializingInterceptor implements Interceptor { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java index c77a1de1d2..3c875a9ef1 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/PatternFilter.java @@ -33,7 +33,7 @@ * 如果方法的名称与提供的正则表达式(JDK regex)模式字符串匹配,则方法筛选器实现返回true * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PatternFilter implements MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java index 708b563972..493297ba76 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/ReturnTypeFilter.java @@ -37,7 +37,7 @@ * 基于返回类型的筛选器方法 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReturnTypeFilter implements MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java index 4fa37244dc..148218b5db 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/intercept/filter/SimpleFilter.java @@ -36,7 +36,7 @@ * 一个简单的方法筛选器实现,如果方法的名称在一组可接受的名称中,则该实现仅返回true * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SimpleFilter implements MethodFilter { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java index 58e80431f5..01735b8bff 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/DuckInvoker.java @@ -36,7 +36,7 @@ * 该类有助于将现有类调整为它没有实现的接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DuckInvoker implements Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java index 267cc11ff2..21cbc1851f 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/HandlerInvoker.java @@ -34,7 +34,7 @@ * 适配器类,将JDK的{@link InvocationHandler}接口调整为Commons Proxy的{@link Invoker}接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HandlerInvoker implements Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java index ced5819097..61ea0fe795 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/InvocationInvoker.java @@ -36,7 +36,7 @@ * 切面实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InvocationInvoker implements ProxyChain { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java index eaff657d01..ef0fb4f327 100644 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/JoinPointInvoker.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JoinPointInvoker implements ProxyChain { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java index 644d866984..184c23d4b1 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/NullInvoker.java @@ -36,7 +36,7 @@ * 这个类对于需要“空对象”设计模式的场景非常有用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NullInvoker implements Invoker { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java index da8f331e28..3d173a721e 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/invoker/ProxyChain.java @@ -31,7 +31,7 @@ * 拦截层 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ProxyChain extends Invocation { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java index ebac124fe1..78813e52a7 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/AlwaysProvider.java @@ -31,7 +31,7 @@ * 总是返回相同的对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AlwaysProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java index 2d479b5af4..532937fe67 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BeanProvider.java @@ -32,7 +32,7 @@ * 使用Class.newInstance()来实例化一个对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BeanProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java index 3df2c3c607..5461fcbb27 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/BurlapProvider.java @@ -35,7 +35,7 @@ * burlap 服务提供 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BurlapProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java index d2512a3e9c..53b268f4a2 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/CloningProvider.java @@ -36,7 +36,7 @@ * 仅对给定的{@link Cloneable}对象调用clone()(反射性地) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CloningProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java index 7f33427358..e7d282f879 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/DecoratorProvider.java @@ -34,7 +34,7 @@ * 例如,通过{@link SingletonProvider 高速缓存它} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DecoratorProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java index 817da282c6..4ec10cabf9 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/HessianProvider.java @@ -35,7 +35,7 @@ * Hessian 服务提供 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HessianProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java index b4028ce84d..18181cfa7a 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/NullProvider.java @@ -29,7 +29,7 @@ * 总是返回null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NullProvider extends AlwaysProvider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java index 6aa97ca8eb..754eb7fd79 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/RmiProvider.java @@ -40,7 +40,7 @@ * 通过在RMI注册表中查找来提供对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RmiProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java index d19f5a6208..b841d694ab 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SessionBeanProvider.java @@ -42,7 +42,7 @@ * 这对本地和远程会话bean都有效 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SessionBeanProvider implements Provider { diff --git a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java index 4fb66d5c68..4065f79b08 100755 --- a/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java +++ b/bus-proxy/src/main/java/org/aoju/bus/proxy/provider/SingletonProvider.java @@ -32,7 +32,7 @@ * 在所有后续调用时返回包装提供程序返回的值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SingletonProvider extends DecoratorProvider { diff --git a/bus-sensitive/pom.xml b/bus-sensitive/pom.xml index cd6bdfd56a..01fbd6372c 100755 --- a/bus-sensitive/pom.xml +++ b/bus-sensitive/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-sensitive - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java index 0497d175f4..b29e9f5fc3 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Builder.java @@ -42,7 +42,7 @@ * 2.主要供单独的字符串处理使用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java index c1ad9ab06e..93105b5c4d 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Condition.java @@ -31,7 +31,7 @@ * 返回真条件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Condition implements ConditionProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java index 063e276b4f..64f0bfa901 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Context.java @@ -37,7 +37,7 @@ * 脱敏的执行上下文 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java index a023dd942f..ab0474f556 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Filter.java @@ -49,7 +49,7 @@ * 因为 FastJSON 本身的转换问题,如果对象中存储的是集合对象列表,会导致显示不是信息本身 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Filter implements com.alibaba.fastjson.serializer.ContextValueFilter { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java index e1ccf7f459..23e14b2157 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Provider.java @@ -48,7 +48,7 @@ * * @param 参数类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Provider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java index 54d9bbf9a7..90d2919549 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/Registry.java @@ -41,7 +41,7 @@ * 注解和实现之间映射 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Registry { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java index b11f84987c..724cd10072 100644 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/StopChar.java @@ -33,7 +33,7 @@ * 过滤词及一些简单处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StopChar { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java index b3a4d2ec8b..c7aa9eeb4a 100644 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/WordTree.java @@ -39,7 +39,7 @@ * 单词树使用树状结构表示一组单词 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class WordTree extends HashMap { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java index 19cbabfcd3..210730edb6 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Condition.java @@ -33,7 +33,7 @@ * 用于自定义策略生效条件的注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java index 3f762d9d94..d44efcc461 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Entry.java @@ -34,7 +34,7 @@ * 3. 如果是普通字段/MAP,则不做处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java index fdc93c44ef..8ec23bae59 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/NShield.java @@ -33,7 +33,7 @@ * 对json内的key_value进行脱敏/过滤 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java index 2cb2ba4249..bbb68ea519 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Privacy.java @@ -33,7 +33,7 @@ * 隐私数据加解密 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.TYPE, ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER}) diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java index 9d73e9ba4a..3b4f3731e5 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Sensitive.java @@ -39,7 +39,7 @@ * ResponseBodyAdvice 脱敏加密 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java index 38ec3884bd..da9a395254 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Shield.java @@ -45,7 +45,7 @@ * 在 Strategy 注解中,可以指定策略 默认是全部,如果指定,则只针对其中的某个策略生效 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java index eb8abc698e..f6ad35408b 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/annotation/Strategy.java @@ -36,7 +36,7 @@ * 2.如果有多个策略, 则优先执行一次满足条件的策略 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java index d0156c5588..787d54b222 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/AbstractProvider.java @@ -32,7 +32,7 @@ * 脱敏策略 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProvider implements StrategyProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java index 1c821b8cf9..58de037c22 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/ConditionProvider.java @@ -31,7 +31,7 @@ * 执行上下文接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ConditionProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java index e126663aee..72f550ea10 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/provider/StrategyProvider.java @@ -31,7 +31,7 @@ * 脱敏策略 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface StrategyProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java index 6be2a96b6f..e02c3a902d 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/AddressStrategy.java @@ -39,7 +39,7 @@ * 例子:北京市海淀区**** * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AddressStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java index 9f71d4aea2..5a9217b245 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BandCardStrategy.java @@ -37,7 +37,7 @@ * 6227 0383 3938 3938 393 脱敏结果: 6227 **** **** ***8 393 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BandCardStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java index 286dae3120..79a63175b8 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/BuiltInStrategy.java @@ -37,7 +37,7 @@ * 明明是数组,实现却只能是一个 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BuiltInStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java index e10db98f59..16c28ea7d7 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CitizenIdStrategy.java @@ -40,7 +40,7 @@ * 只保留前6位和后2位,其他用*代替 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CitizenIdStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java index 6a5a19069f..31e0fc17d3 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/CnapsStrategy.java @@ -36,7 +36,7 @@ * 前四位明文,后面脱敏 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CnapsStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java index 2cbec2bc8e..c0a57b8891 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/DafaultStrategy.java @@ -36,7 +36,7 @@ * 默认脱敏处理类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DafaultStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java index ba19b2aaab..42820497cb 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/EmailStrategy.java @@ -39,7 +39,7 @@ * 保留前三位,中间隐藏4位 其他正常显示 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EmailStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java index a5c1ae527a..7c4ac74960 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/MobileStrategy.java @@ -36,7 +36,7 @@ * 18233583070 脱敏后: 182****3030 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MobileStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java index b8c23e213d..aec24629c5 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NameStrategy.java @@ -42,7 +42,7 @@ * 2. 三个及其以上 只保留第一个和最后一个 其他用星号代替 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NameStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java index 665124dc9c..ca5cf96e20 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/NoneStrategy.java @@ -33,7 +33,7 @@ * 不脱敏 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NoneStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java index 976016feca..a7b265e770 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PasswordStrategy.java @@ -34,7 +34,7 @@ * 直接返回 null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PasswordStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java index f7304a222b..5e7c713f63 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PayStrategy.java @@ -37,7 +37,7 @@ * 签约协议号脱敏格式为前6位后6位保留明文,中间脱敏 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PayStrategy extends AbstractProvider { diff --git a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java index 32583c7dd5..8577736f43 100755 --- a/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java +++ b/bus-sensitive/src/main/java/org/aoju/bus/sensitive/strategy/PhoneStrategy.java @@ -37,7 +37,7 @@ * 脱敏规则:180****1120 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PhoneStrategy extends AbstractProvider { diff --git a/bus-setting/README.md b/bus-setting/README.md index 4382895da1..8973967613 100755 --- a/bus-setting/README.md +++ b/bus-setting/README.md @@ -35,29 +35,29 @@ ### 创建/输出 ini ```java - Builder b = new Builder() + Builder b=new Builder() .plusComment("this is a test ini") .skipLine(2) - .plusSection("sec1", "this is a section") - .plusProperty("key1", "value") - .plusProperty("key2", "value") - .plusProperty("key3", "value") - .plusProperty("key4", "value") - .plusProperty("key5", "value") - .plusProperty("key6", "value") + .plusSection("sec1","this is a section") + .plusProperty("key1","value") + .plusProperty("key2","value") + .plusProperty("key3","value") + .plusProperty("key4","value") + .plusProperty("key5","value") + .plusProperty("key6","value") .plusSection("sec2") - .plusProperty("key1", "value") - .plusProperty("key2", "value") - .plusProperty("key3", "value") - .plusProperty("key4", "value") - .plusProperty("key5", "value") - .plusProperty("key6", "value"); - - final Builder ini = b.build(); - - System.out.println(ini); + .plusProperty("key1","value") + .plusProperty("key2","value") + .plusProperty("key3","value") + .plusProperty("key4","value") + .plusProperty("key5","value") + .plusProperty("key6","value"); + +final Builder ini=b.build(); + + System.out.println(ini); - ini.write(Paths.get("F:\\test.ini"), true); + ini.write(Paths.get("F:\\test.ini"),true); ``` ## 特性 diff --git a/bus-setting/pom.xml b/bus-setting/pom.xml index 825ea47f99..1053b1cfab 100755 --- a/bus-setting/pom.xml +++ b/bus-setting/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-setting - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java b/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java index 70a86e1137..af30a409ea 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Builder.java @@ -39,7 +39,7 @@ * 非线程安全 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java b/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java index 60abc82fb7..dc3f95eb93 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Factory.java @@ -38,7 +38,7 @@ * {@link IniProperty} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Factory { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Format.java b/bus-setting/src/main/java/org/aoju/bus/setting/Format.java index 52491128cf..e6379d6785 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Format.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Format.java @@ -33,7 +33,7 @@ * ini formatter. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Format extends Closeable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java b/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java index 548257118e..fb5a43194e 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/Readers.java @@ -49,7 +49,7 @@ * Setting文件加载器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Readers { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java index 68e05bcfe6..3635bd9688 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/AbstractFormatter.java @@ -32,7 +32,7 @@ * 除了CommentElementFormatter之外,所有元素格式化程序都还需要注释元素格式化程序 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractFormatter implements ElementFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java index eefa6c9803..4556352201 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/CommentFormatter.java @@ -33,7 +33,7 @@ * 将字符串值格式设置为{@link IniComment} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CommentFormatter extends AbstractFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java index b2cc3351af..78f23b4fd9 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/DefaultFormatter.java @@ -42,7 +42,7 @@ * {@link IniProperty } * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DefaultFormatter implements Format { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java index dc579202d2..8cea1101dd 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/ElementFormatter.java @@ -31,7 +31,7 @@ * 将字符串值格式设置为{@link IniElement} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ElementFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java index 40b5b5b92b..11e01002c0 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/PropertyFormatter.java @@ -33,7 +33,7 @@ * 将字符串值格式设置为{@link IniProperty} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PropertyFormatter extends AbstractFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java b/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java index 257876d559..896cda6e3d 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/format/SectionFormatter.java @@ -35,7 +35,7 @@ * 将字符串值格式设置为{@link IniSection} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SectionFormatter extends AbstractFormatter { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java index e6201a2108..9c9164681d 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractElement.java @@ -31,7 +31,7 @@ * an abstract class for {@link IniElement}. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractElement implements IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java index 23f7ac0e81..24769cdb1a 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/AbstractSetting.java @@ -42,7 +42,7 @@ * Setting抽象类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSetting implements OptNullString, Serializable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java index f21253965c..17a4b7d158 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniComment.java @@ -29,7 +29,7 @@ * Ini file's comment. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IniComment extends IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java index af60005583..1bfd7a42d1 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniCommentImpl.java @@ -31,7 +31,7 @@ * Ini file's comment. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IniCommentImpl extends AbstractElement implements IniComment { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java index feb03a766a..0ecc5a2840 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniElement.java @@ -33,7 +33,7 @@ * they all can be like {@link String} . * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IniElement extends CharSequence, java.io.Serializable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java index 46bbb37afa..ed77a43964 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniProperty.java @@ -31,7 +31,7 @@ * Ini file's parameters, like {@code property1=value1 } * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IniProperty extends Map.Entry, IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java index e46f5b47c6..fe765a8817 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniPropertyImpl.java @@ -33,7 +33,7 @@ * Ini file's parameters, like {@code property1=value1 } * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IniPropertyImpl extends AbstractElement implements IniProperty { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java index 06a7841b22..764d876684 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSection.java @@ -34,7 +34,7 @@ * Ini file's Section * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface IniSection extends ProxyList, IniElement { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java index 71dd980af6..274dab200b 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSectionImpl.java @@ -37,7 +37,7 @@ * Ini file's Section * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IniSectionImpl extends AbstractElement implements IniSection { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java index 5c2f3a6c2f..91c698c26b 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/IniSetting.java @@ -44,7 +44,7 @@ * 如果您想创建Ini,则可以{@link Builder} * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IniSetting extends ArrayList { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java index 36c723071b..ec6307f2fe 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/PopSetting.java @@ -60,7 +60,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PopSetting extends AbstractSetting implements Map { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/magic/Properties.java b/bus-setting/src/main/java/org/aoju/bus/setting/magic/Properties.java index 99cf1a4038..862cdf4ccd 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/magic/Properties.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/magic/Properties.java @@ -57,7 +57,7 @@ * Properties文件读取封装类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Properties extends java.util.Properties implements BasicType, OptBasicType { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java index 1ad8116db6..cfe876b9e3 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GlobalProfile.java @@ -32,7 +32,7 @@ * 全局的Profile配置中心 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GlobalProfile { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java index 3069b3b382..4801875056 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupMap.java @@ -35,7 +35,7 @@ * 基于分组的Map * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GroupMap extends LinkedHashMap> { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java index 3192ec178c..651c7e6af9 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/GroupSet.java @@ -44,7 +44,7 @@ * 分组配置文件如下: * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GroupSet extends HashMap> { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java index 149d17da7c..77d7acef79 100755 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/Profile.java @@ -47,7 +47,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Profile implements Serializable { diff --git a/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java b/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java index 321ca9412f..44ad117705 100644 --- a/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java +++ b/bus-setting/src/main/java/org/aoju/bus/setting/metric/ProxyList.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ProxyList extends List { diff --git a/bus-shade/README.md b/bus-shade/README.md index 4f4ddaa586..78b55b5ece 100755 --- a/bus-shade/README.md +++ b/bus-shade/README.md @@ -17,7 +17,7 @@ org.aoju bus-shade - 6.1.5 + 6.1.6 ``` diff --git a/bus-shade/pom.xml b/bus-shade/pom.xml index 7d70f99d1e..66470cd571 100755 --- a/bus-shade/pom.xml +++ b/bus-shade/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-shade - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java b/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java index c30588556d..04440bba92 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/Builder.java @@ -42,7 +42,7 @@ * 默认常量 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/Config.java b/bus-shade/src/main/java/org/aoju/bus/shade/Config.java index 6e7895bbf7..b9c23f747d 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/Config.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/Config.java @@ -39,7 +39,7 @@ * 配置入口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java index 35d7068502..cdf383844a 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/ColumnType.java @@ -29,7 +29,7 @@ * 获取实体类字段属性类信息接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ColumnType { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java index 690ad0d4de..fc91d9b8fc 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/DateType.java @@ -29,7 +29,7 @@ * 数据库时间类型 到 实体类时间类型 对应策略 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum DateType { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java index 53e5a15458..442e7e8003 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLColumnType.java @@ -29,7 +29,7 @@ * 表字段类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum MySQLColumnType implements ColumnType { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java index 45dee88587..0cddad94bd 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/MySQLTypeConvert.java @@ -31,7 +31,7 @@ * MYSQL 数据库字段类型转换 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MySQLTypeConvert implements TypeConvert { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java index 68c95da7be..d0d5c2d4c5 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/NamingRules.java @@ -31,7 +31,7 @@ * 获奖java中需要的驼峰命名 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NamingRules { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java index b177143f69..22013cf38d 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/PropertyInfo.java @@ -33,7 +33,7 @@ * 获取到数据库的信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java index 6e45b3a468..c8b6261fa2 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TableEntity.java @@ -37,7 +37,7 @@ * 自动生成需要的基本信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java index 15a168d294..38f3cc0849 100755 --- a/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/beans/TypeConvert.java @@ -29,7 +29,7 @@ * 该类的功能描述 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TypeConvert { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java index e0346d4ffe..c8bd27e2c8 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/AbstractDatabaseQuery.java @@ -44,7 +44,7 @@ * 抽象查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractDatabaseQuery implements DatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java index 90b0b8754b..0475764954 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQuery.java @@ -38,7 +38,7 @@ * 查询数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface DatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java index 92ca463516..a5155026b7 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseQueryFactory.java @@ -38,7 +38,7 @@ * 数据库查询工厂 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java index 4e8a2213cb..12f2fe1036 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/DatabaseType.java @@ -41,7 +41,7 @@ * 数据库类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum DatabaseType implements Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java index 9864f9d484..99af377e0c 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/OtherDataBaseQuery.java @@ -40,7 +40,7 @@ * 其他数据库 暂未支持系列 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OtherDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java index 418d747fb4..df5c62b1ad 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbColumn.java @@ -33,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java index 9649fdfece..7dac13244f 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDataBaseQuery.java @@ -48,7 +48,7 @@ * CacheDB 数据库查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CacheDbDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java index baf214c2c5..2a96d65eb8 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbDatabase.java @@ -32,7 +32,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java index fae9038d5f..74a1b2899f 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbPrimaryKey.java @@ -33,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java index 4d6370d917..f1d8ac34be 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/cachedb/CacheDbTable.java @@ -33,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java index 4dbbb6b5c5..50ccf1bb0d 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/db2/Db2DataBaseQuery.java @@ -42,7 +42,7 @@ * db2 数据库查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Db2DataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java index c0026114b7..375c45b273 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/h2/H2DataBaseQuery.java @@ -42,7 +42,7 @@ * H2 数据库查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class H2DataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java index c88d8aaec7..829468b200 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariaDbDataBaseQuery.java @@ -46,7 +46,7 @@ * mariadb 数据库查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MariaDbDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java index 94bca5da0a..02af8a1b8a 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbColumn.java @@ -33,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java index a8fe743f1e..668cfd3e7b 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbDatabase.java @@ -33,7 +33,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java index b148b24019..6b60bb9df7 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbPrimaryKey.java @@ -33,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java index bdb78dccf5..3a0aacd28c 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mariadb/MariadbTable.java @@ -33,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java index eb8aac347c..bc66033664 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlColumn.java @@ -33,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java index dad552348d..7c3bfc9ffe 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDataBaseQuery.java @@ -49,7 +49,7 @@ * 元数据查询,查询的数据库表为INFORMATION_SCHEMA * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MySqlDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java index dc866dbce1..4c8e7dc8a5 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlDatabase.java @@ -32,7 +32,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java index 9c0897f374..35f60c0b1b 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlPrimaryKey.java @@ -33,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java index 96b17935e4..601517ac67 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/mysql/MySqlTable.java @@ -33,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java index 029dc52831..9805eafdfb 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleColumn.java @@ -33,7 +33,7 @@ * Oracle table column * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java index 8a3763266c..b5a2df6427 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDataBaseQuery.java @@ -53,7 +53,7 @@ * 所以,只能够通过自定义SQL来了 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class OracleDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java index 006cd4ff11..1a6863c696 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleDatabase.java @@ -33,7 +33,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java index 6a8699069c..fee4ccedfa 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OraclePrimaryKey.java @@ -33,7 +33,7 @@ * Oracle table primary * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java index f794d44ace..83f70ef344 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/oracle/OracleTable.java @@ -33,7 +33,7 @@ * Oracle table * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java index df9318b65b..900d18deca 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlColumn.java @@ -33,7 +33,7 @@ * 表字段信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java index 2f7a0f3cbb..cfc8d2a668 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDataBaseQuery.java @@ -46,7 +46,7 @@ * PostgreSql 查询 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PostgreSqlDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java index 8aed65ec11..4119a3fd36 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlDatabase.java @@ -32,7 +32,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java index 8fa6acf68b..1364d78e4d 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlPrimaryKey.java @@ -33,7 +33,7 @@ * 表主键 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java index f24d0ac8ed..626dd94120 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/postgresql/PostgreSqlTable.java @@ -33,7 +33,7 @@ * 表信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java index ef9c86a181..892ccff721 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerColumn.java @@ -33,7 +33,7 @@ * sqlserver table column * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java index f372fddd39..9da8ca7d67 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDataBaseQuery.java @@ -49,7 +49,7 @@ * 通过文档发现,查询列和查询表的 REMARKS 字段SQL Server 不会为此列返回值。所以对于SQL server 自己写SQL语句了,差缺补全 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SqlServerDataBaseQuery extends AbstractDatabaseQuery { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java index e4cecaaf73..2596db16ce 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerDatabase.java @@ -33,7 +33,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java index e693250ed1..586052fbfd 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerPrimaryKey.java @@ -33,7 +33,7 @@ * sqlserver table primary * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java index ec1e285aad..a0c1678166 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/dialect/sqlserver/SqlServerTable.java @@ -33,7 +33,7 @@ * sqlserver table * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java index 2394bc2ae1..355f28d237 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/AbstractEngine.java @@ -38,7 +38,7 @@ * 模板引擎抽象类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java index 3ae6395987..728d2fe9de 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineConfig.java @@ -34,7 +34,7 @@ * 文件生成配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java index 65044663a4..02554b0164 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFactory.java @@ -37,7 +37,7 @@ * 生成构造工厂 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java index e2cc51b136..70b10ce59b 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/EngineFileType.java @@ -34,7 +34,7 @@ * 文件类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java index 1a4701c272..737c4b1325 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/FreemarkerEngine.java @@ -45,7 +45,7 @@ * freemarker * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FreemarkerEngine extends AbstractEngine { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java index d1128eaa03..33c5205e8d 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateEngine.java @@ -34,7 +34,7 @@ * 文件产生接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TemplateEngine extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java index c20784a865..dbc13b3265 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/engine/TemplateType.java @@ -34,7 +34,7 @@ * 模板类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum TemplateType implements Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java index c26d9cad46..72e634785e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/AbstractExecute.java @@ -35,7 +35,7 @@ * 抽象执行 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractExecute implements Execute { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java index b78b03dcd6..4d051d7bc2 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/Execute.java @@ -29,7 +29,7 @@ * 执行文档生成 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Execute { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java index 8c0e05aa8f..e09a72e00e 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/execute/ProduceExecute.java @@ -37,7 +37,7 @@ * 文档生成 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ProduceExecute extends AbstractExecute { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java index 39ddf6f75a..6443ba70db 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/FieldMethod.java @@ -32,7 +32,7 @@ * FieldMethod * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FieldMethod { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java index 3e39063252..b0408878d2 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/Mapping.java @@ -42,7 +42,7 @@ * 映射器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Mapping { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java index 555e0cc6e1..05bd3cbb12 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingField.java @@ -36,7 +36,7 @@ * 数据结构属性注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java index 08e9199c34..e51d15a880 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/mapping/MappingListField.java @@ -36,7 +36,7 @@ * 数据结构列表属性注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Retention(RetentionPolicy.RUNTIME) diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java index 0a83e12120..381d58bde1 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Column.java @@ -29,7 +29,7 @@ * 表列接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Column { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java index 3be9ff9a90..77696b7664 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnLength.java @@ -31,7 +31,7 @@ * 列长度 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface ColumnLength extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java index 7b190f502b..7c4421be18 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/ColumnSchema.java @@ -31,7 +31,7 @@ * 表列领域对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java index 1ac67c0786..98247e6291 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DataSchema.java @@ -32,7 +32,7 @@ * DataModel * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java index c974347f7d..c442a825d4 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Database.java @@ -29,7 +29,7 @@ * 数据库接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Database { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java index d26f640611..883370bee1 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/DatabaseSchema.java @@ -34,7 +34,7 @@ * 数据库信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java index a60847b6b1..bc703dc25d 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/PrimaryKey.java @@ -31,7 +31,7 @@ * 主键 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface PrimaryKey extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java index 3a60ae50ba..80f529fe92 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/Table.java @@ -29,7 +29,7 @@ * 表接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Table { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java index 20f3da82b9..136b73e92f 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/metadata/TableSchema.java @@ -34,7 +34,7 @@ * 表信息领域对象 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java index d980315fdb..56730e3cc6 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/AbstractProcess.java @@ -43,7 +43,7 @@ * AbstractBuilder * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProcess implements Process { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java index 7675920ad6..14cfd00726 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/DataModelProcess.java @@ -42,7 +42,7 @@ * 数据模型处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DataModelProcess extends AbstractProcess { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java index e22b5d3f39..7914df3c14 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/Process.java @@ -33,7 +33,7 @@ * 构建 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Process extends Serializable { diff --git a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java index 3f16bfab8f..a7f302828c 100644 --- a/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java +++ b/bus-shade/src/main/java/org/aoju/bus/shade/screw/process/ProcessConfig.java @@ -35,7 +35,7 @@ * 数据处理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-socket/README.md b/bus-socket/README.md index 89e2d456e7..5a05244d57 100755 --- a/bus-socket/README.md +++ b/bus-socket/README.md @@ -7,7 +7,7 @@ bus-socket是一款开源的Java AIO框架,支持 TCP、UDP、SSL/TLS,追求 要求JDK1.8+ * -* 通常情况下仅需实现{@link org.aoju.bus.socket.Protocol}、{@link org.aoju.bus.socket.MessageProcessor}即可 +* 通常情况下仅需实现{@link org.aoju.bus.socket.Protocol}、{@link org.aoju.bus.socket.process.MessageProcessor}即可 * 如需仅需通讯层面的监控,bus-socket提供了接口{@link org.aoju.bus.socket.NetMonitor}以供使用 * * 完成本package的接口开发后,便可使用{@link org.aoju.bus.socket.QuickAioClient} / {@link @@ -22,78 +22,78 @@ MessageProcessor,消息处理器,对Protocol解析出来的消息进行业 ```java public class AioServer { - public static void main(String[] args) { - AioQuickServer server = new AioQuickServer(8080, new DemoProtocol(), new DemoService() { - public void process(AioSession session, String msg) { - System.out.println("接受到客户端消息:" + msg); - - byte[] response = "Hi Client!".getBytes(); - byte[] head = {(byte) response.length}; - try { - session.writeBuffer().write(head); - session.writeBuffer().write(response); - } catch (IOException e) { - e.printStackTrace(); - } - } + public static void main(String[] args) { + AioQuickServer server = new AioQuickServer(8080, new DemoProtocol(), new DemoService() { + public void process(AioSession session, String msg) { + System.out.println("接受到客户端消息:" + msg); + + byte[] response = "Hi Client!".getBytes(); + byte[] head = {(byte) response.length}; + try { + session.writeBuffer().write(head); + session.writeBuffer().write(response); + } catch (IOException e) { + e.printStackTrace(); + } + } - public void stateEvent(AioSession session, SocketStatus SocketStatus, Throwable throwable) { - } - }); - server.start(); - } + public void stateEvent(AioSession session, SocketStatus SocketStatus, Throwable throwable) { + } + }); + server.start(); + } - class DemoProtocol implements Protocol { + class DemoProtocol implements Protocol { - public byte[] decode(ByteBuffer readBuffer, AioSession session) { - if (readBuffer.remaining() > 0) { - byte[] data = new byte[readBuffer.remaining()]; - readBuffer.get(data); - return data; - } - return null; - } + public byte[] decode(ByteBuffer readBuffer, AioSession session) { + if (readBuffer.remaining() > 0) { + byte[] data = new byte[readBuffer.remaining()]; + readBuffer.get(data); + return data; + } + return null; + } - public ByteBuffer encode(byte[] msg, AioSession session) { - ByteBuffer buffer = ByteBuffer.allocate(msg.length); - buffer.put(msg); - buffer.flip(); - return buffer; + public ByteBuffer encode(byte[] msg, AioSession session) { + ByteBuffer buffer = ByteBuffer.allocate(msg.length); + buffer.put(msg); + buffer.flip(); + return buffer; + } } - } - class DemoService implements MessageProcessor, Runnable { - private HashMap> clients = new HashMap>(); - private ScheduledExecutorService executorService = Executors.newScheduledThreadPool(12); + class DemoService implements MessageProcessor, Runnable { + private HashMap> clients = new HashMap>(); + private ScheduledExecutorService executorService = Executors.newScheduledThreadPool(12); - public DemoService() { - executorService.scheduleAtFixedRate(this, 2, 2, TimeUnit.SECONDS); - } + public DemoService() { + executorService.scheduleAtFixedRate(this, 2, 2, TimeUnit.SECONDS); + } - public void run() { - if (this.clients.isEmpty()) return; - for (AioSession session : this.clients.values()) { - try { - session.write("Hey! bus-socket it's work...".getBytes()); - } catch (IOException e) { - e.printStackTrace(); + public void run() { + if (this.clients.isEmpty()) return; + for (AioSession session : this.clients.values()) { + try { + session.write("Hey! bus-socket it's work...".getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } + } } - } - } - public void process(AioSession session, byte[] msg) { - JSONObject jsonObject = JSON.parseObject(msg, JSONObject.class); - System.out.println(jsonObject.getString("content")); + public void process(AioSession session, byte[] msg) { + JSONObject jsonObject = JSON.parseObject(msg, JSONObject.class); + System.out.println(jsonObject.getString("content")); try { session.write("{\"result\": \"OK\"}".getBytes()); } catch (IOException e) { e.printStackTrace(); } - } + } - public void stateEvent(AioSession session, SocketStatus SocketStatus, Throwable throwable) { - switch (SocketStatus) { + public void stateEvent(AioSession session, SocketStatus SocketStatus, Throwable throwable) { + switch (SocketStatus) { case NEW_SESSION: System.out.println("SocketStatus.NEW_SESSION"); break; @@ -113,22 +113,22 @@ MessageProcessor,消息处理器,对Protocol解析出来的消息进行业 System.out.println("SocketStatus.OUTPUT_EXCEPTION"); break; case SESSION_CLOSING: - System.out.println("SocketStatus.SESSION_CLOSING"); - break; - case SESSION_CLOSED: - System.out.println("SocketStatus.SESSION_CLOSED"); - break; - case FLOW_LIMIT: - System.out.println("SocketStatus.FLOW_LIMIT"); - break; - case RELEASE_FLOW_LIMIT: - System.out.println("SocketStatus.RELEASE_FLOW_LIMIT"); - break; - default: - System.out.println("SocketStatus.default"); - } + System.out.println("SocketStatus.SESSION_CLOSING"); + break; + case SESSION_CLOSED: + System.out.println("SocketStatus.SESSION_CLOSED"); + break; + case FLOW_LIMIT: + System.out.println("SocketStatus.FLOW_LIMIT"); + break; + case RELEASE_FLOW_LIMIT: + System.out.println("SocketStatus.RELEASE_FLOW_LIMIT"); + break; + default: + System.out.println("SocketStatus.default"); + } + } } - } } ``` @@ -136,51 +136,51 @@ MessageProcessor,消息处理器,对Protocol解析出来的消息进行业 ```java public class AioClient { - public static void main(String[] args) throws Exception { - AioQuickClient aioQuickClient = new AioQuickClient<>("localhost", 8888, new ClientProtocol(), new ClientProcessor()); - AioSession session = aioQuickClient.start(); - session.writeBuffer().writeInt(1); - aioQuickClient.shutdownNow(); - } + public static void main(String[] args) throws Exception { + AioQuickClient aioQuickClient = new AioQuickClient<>("localhost", 8888, new ClientProtocol(), new ClientProcessor()); + AioSession session = aioQuickClient.start(); + session.writeBuffer().writeInt(1); + aioQuickClient.shutdownNow(); + } - static class ClientProcessor implements MessageProcessor { + static class ClientProcessor implements MessageProcessor { - @Override - public void process(AioSession session, String msg) { - System.out.println("Receive data from server:" + msg); - } + @Override + public void process(AioSession session, String msg) { + System.out.println("Receive data from server:" + msg); + } - @Override - public void stateEvent(AioSession session, StateMachineEnum stateMachineEnum, Throwable throwable) { - System.out.println("State:" + stateMachineEnum); - if (stateMachineEnum == StateMachineEnum.OUTPUT_EXCEPTION) { - throwable.printStackTrace(); - } + @Override + public void stateEvent(AioSession session, StateMachineEnum stateMachineEnum, Throwable throwable) { + System.out.println("State:" + stateMachineEnum); + if (stateMachineEnum == StateMachineEnum.OUTPUT_EXCEPTION) { + throwable.printStackTrace(); + } + } } - } - static class ClientProtocol implements Protocol { + static class ClientProtocol implements Protocol { - @Override - public String decode(ByteBuffer data, AioSession session) { - int remaining = data.remaining(); - if (remaining < 4) { - return null; - } - data.mark(); - int length = data.getInt(); - if (length > data.remaining()) { - data.reset(); - System.out.println("reset"); - return null; - } - byte[] b = new byte[length]; - data.get(b); - data.mark(); - return new String(b); - } + @Override + public String decode(ByteBuffer data, AioSession session) { + int remaining = data.remaining(); + if (remaining < 4) { + return null; + } + data.mark(); + int length = data.getInt(); + if (length > data.remaining()) { + data.reset(); + System.out.println("reset"); + return null; + } + byte[] b = new byte[length]; + data.get(b); + data.mark(); + return new String(b); + } - } + } } ``` diff --git a/bus-socket/pom.xml b/bus-socket/pom.xml index 9b5e3e095f..3508c25a62 100755 --- a/bus-socket/pom.xml +++ b/bus-socket/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-socket - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/AioSession.java b/bus-socket/src/main/java/org/aoju/bus/socket/AioSession.java index 528693bdb1..96ce543edd 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/AioSession.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/AioSession.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AioSession { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/BufferFactory.java b/bus-socket/src/main/java/org/aoju/bus/socket/BufferFactory.java index 5daa2ced4f..6275c55903 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/BufferFactory.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/BufferFactory.java @@ -31,7 +31,7 @@ * 内存池工厂 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface BufferFactory { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/GroupIo.java b/bus-socket/src/main/java/org/aoju/bus/socket/GroupIo.java index 44c6ed1140..50d4755277 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/GroupIo.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/GroupIo.java @@ -27,7 +27,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface GroupIo { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/NetMonitor.java b/bus-socket/src/main/java/org/aoju/bus/socket/NetMonitor.java index 680a4e5366..4032daaff6 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/NetMonitor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/NetMonitor.java @@ -47,7 +47,7 @@ * 非必要情况下请勿使用该接口,未来可能会调整接口设计 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface NetMonitor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/Protocol.java b/bus-socket/src/main/java/org/aoju/bus/socket/Protocol.java index 891adf3457..795393c96c 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/Protocol.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/Protocol.java @@ -34,7 +34,7 @@ * * @param 消息对象实体类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Protocol { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioClient.java b/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioClient.java index 4c4d040b8c..61ae0a38b6 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioClient.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioClient.java @@ -27,6 +27,9 @@ import org.aoju.bus.core.io.ByteBuffer; import org.aoju.bus.core.toolkit.IoKit; +import org.aoju.bus.socket.handler.CompletionReadHandler; +import org.aoju.bus.socket.handler.CompletionWriteHandler; +import org.aoju.bus.socket.process.MessageProcessor; import java.io.IOException; import java.net.InetSocketAddress; @@ -138,7 +141,7 @@ public AioSession start(AsynchronousChannelGroup asynchronousChannelGroup) throw throw new RuntimeException("NetMonitor refuse channel"); } // 连接成功则构造AIOSession对象 - session = new TcpAioSession<>(connectedChannel, config, new CompletionReadHandler<>(), new CompletionWriteHandler<>(), bufferPool.allocateBufferPage()); + session = new TcpAioSession<>(connectedChannel, config, new CompletionReadHandler<>(), new CompletionWriteHandler<>(), bufferPool.allocatePageBuffer()); session.initSession(); return session; } catch (Exception e) { @@ -251,7 +254,7 @@ public final QuickAioClient bindLocal(String local, int port) { * @param bufferPool 内存池对象 * @return 当前客户端实例 */ - public final QuickAioClient setBufferPagePool(ByteBuffer bufferPool) { + public final QuickAioClient setPageBufferPool(ByteBuffer bufferPool) { this.bufferPool = bufferPool; this.config.setBufferFactory(BufferFactory.DISABLED_BUFFER_FACTORY); return this; diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioServer.java b/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioServer.java index 1f60438bc9..cab9ffc08b 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioServer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/QuickAioServer.java @@ -27,6 +27,10 @@ import org.aoju.bus.core.io.ByteBuffer; import org.aoju.bus.core.toolkit.IoKit; +import org.aoju.bus.socket.handler.CompletionReadHandler; +import org.aoju.bus.socket.handler.CompletionWriteHandler; +import org.aoju.bus.socket.handler.ConcurrentReadHandler; +import org.aoju.bus.socket.process.MessageProcessor; import java.io.IOException; import java.net.InetSocketAddress; @@ -48,12 +52,12 @@ * * @param 消息对象类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QuickAioServer { - private static final String BUS_ASYNCHRONOUS_CHANNEL_PROVIDER = "org.aoju.bus.socket.AsynchronousChannelProvider"; + private static final String BUS_ASYNCHRONOUS_CHANNEL_PROVIDER = "org.aoju.bus.socket.channel.AsynchronousChannelProvider"; private static final String AIO_ASYNCHRONOUS_CHANNEL_PROVIDER = "java.nio.channels.spi.AsynchronousChannelProvider"; /** @@ -119,7 +123,7 @@ public QuickAioServer(String host, int port, Protocol protocol, MessageProces * @throws IOException IO异常 */ public void start() throws IOException { - start0(channel -> new TcpAioSession<>(channel, config, aioCompletionReadHandler, aioCompletionWriteHandler, bufferPool.allocateBufferPage())); + start0(channel -> new TcpAioSession<>(channel, config, aioCompletionReadHandler, aioCompletionWriteHandler, bufferPool.allocatePageBuffer())); } /** @@ -341,7 +345,7 @@ public final QuickAioServer setBacklog(int backlog) { * @param bufferPool 内存池对象 * @return 当前AioQuickServer对象 */ - public final QuickAioServer setBufferPagePool(ByteBuffer bufferPool) { + public final QuickAioServer setPageBufferPool(ByteBuffer bufferPool) { this.bufferPool = bufferPool; this.config.setBufferFactory(BufferFactory.DISABLED_BUFFER_FACTORY); return this; diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioClient.java b/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioClient.java index a7bbfe9299..4a7eccb6c1 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioClient.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioClient.java @@ -28,6 +28,7 @@ import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.toolkit.IoKit; import org.aoju.bus.core.toolkit.ThreadKit; +import org.aoju.bus.socket.handler.ChannelSocketHandler; import java.io.Closeable; import java.io.IOException; @@ -42,7 +43,7 @@ * NIO客户端 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QuickNioClient implements Closeable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioServer.java b/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioServer.java index 0fe9948cdd..4c6a45a51c 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioServer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/QuickNioServer.java @@ -28,6 +28,8 @@ import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.core.toolkit.IoKit; import org.aoju.bus.logger.Logger; +import org.aoju.bus.socket.handler.ChannelSocketHandler; +import org.aoju.bus.socket.handler.CompletionAcceptHandler; import java.io.Closeable; import java.io.IOException; @@ -42,7 +44,7 @@ * 基于NIO的Socket服务端实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QuickNioServer implements Closeable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/QuickTimer.java b/bus-socket/src/main/java/org/aoju/bus/socket/QuickTimer.java index 67672d53a2..cf94fc9dff 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/QuickTimer.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/QuickTimer.java @@ -36,7 +36,7 @@ * 服务器定时任务 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class QuickTimer implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/ServerConfig.java b/bus-socket/src/main/java/org/aoju/bus/socket/ServerConfig.java index 5818e4f206..bb514bcde5 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/ServerConfig.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/ServerConfig.java @@ -25,6 +25,8 @@ ********************************************************************************/ package org.aoju.bus.socket; +import org.aoju.bus.socket.process.MessageProcessor; + import java.net.SocketOption; import java.util.HashMap; import java.util.Map; @@ -33,7 +35,7 @@ * Quickly服务端/客户端配置信息 T:解码后生成的对象类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ServerConfig { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/SocketDecoder.java b/bus-socket/src/main/java/org/aoju/bus/socket/SocketDecoder.java index 65ca3f49bf..8623b982b3 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/SocketDecoder.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/SocketDecoder.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface SocketDecoder { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/SocketStatus.java b/bus-socket/src/main/java/org/aoju/bus/socket/SocketStatus.java index d1ea9e8439..e32e44f58a 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/SocketStatus.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/SocketStatus.java @@ -25,6 +25,8 @@ ********************************************************************************/ package org.aoju.bus.socket; +import org.aoju.bus.socket.process.MessageProcessor; + import java.nio.ByteBuffer; /** @@ -37,7 +39,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum SocketStatus { @@ -98,6 +100,6 @@ public enum SocketStatus { /** * 服务端接受连接异常 */ - ACCEPT_EXCEPTION, + ACCEPT_EXCEPTION } diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/TcpAioSession.java b/bus-socket/src/main/java/org/aoju/bus/socket/TcpAioSession.java index 548f98f536..c159bda562 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/TcpAioSession.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/TcpAioSession.java @@ -29,6 +29,9 @@ import org.aoju.bus.core.io.VirtualBuffer; import org.aoju.bus.core.io.WriteBuffer; import org.aoju.bus.core.toolkit.IoKit; +import org.aoju.bus.socket.handler.CompletionReadHandler; +import org.aoju.bus.socket.handler.CompletionWriteHandler; +import org.aoju.bus.socket.process.MessageProcessor; import java.io.IOException; import java.io.InputStream; @@ -58,7 +61,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TcpAioSession extends AioSession { @@ -106,15 +109,15 @@ public class TcpAioSession extends AioSession { * @param config 配置项 * @param completionReadHandler 读回调 * @param completionWriteHandler 写回调 - * @param bufferPage 绑定内存页 + * @param pageBuffer 绑定内存页 */ - TcpAioSession(AsynchronousSocketChannel channel, final ServerConfig config, CompletionReadHandler completionReadHandler, CompletionWriteHandler completionWriteHandler, PageBuffer bufferPage) { + TcpAioSession(AsynchronousSocketChannel channel, final ServerConfig config, CompletionReadHandler completionReadHandler, CompletionWriteHandler completionWriteHandler, PageBuffer pageBuffer) { this.channel = channel; this.completionReadHandler = completionReadHandler; this.completionWriteHandler = completionWriteHandler; this.serverConfig = config; - this.readBuffer = bufferPage.allocate(config.getReadBufferSize()); + this.readBuffer = pageBuffer.allocate(config.getReadBufferSize()); Function flushFunction = var -> { if (!semaphore.tryAcquire()) { @@ -128,7 +131,7 @@ public class TcpAioSession extends AioSession { } return null; }; - byteBuf = new WriteBuffer(bufferPage, flushFunction, serverConfig.getWriteBufferSize(), serverConfig.getWriteBufferCapacity()); + byteBuf = new WriteBuffer(pageBuffer, flushFunction, serverConfig.getWriteBufferSize(), serverConfig.getWriteBufferCapacity()); //触发状态机 config.getProcessor().stateEvent(this, SocketStatus.NEW_SESSION, null); } @@ -144,7 +147,7 @@ void initSession() { * 触发AIO的写操作, * 需要调用控制同步 */ - void writeCompleted() { + public void writeCompleted() { if (writeBuffer == null) { writeBuffer = byteBuf.poll(); } else if (!writeBuffer.buffer().hasRemaining()) { @@ -225,7 +228,7 @@ public final boolean isInvalid() { * * @param eof 输入流是否已关闭 */ - void readCompleted(boolean eof) { + public void readCompleted(boolean eof) { if (status == SESSION_STATUS_CLOSED) { return; } @@ -345,7 +348,7 @@ private void assertChannel() throws IOException { } } - ServerConfig getServerConfig() { + public ServerConfig getServerConfig() { return this.serverConfig; } diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/UdpAioSession.java b/bus-socket/src/main/java/org/aoju/bus/socket/UdpAioSession.java index 140d2b8491..5b0a10152a 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/UdpAioSession.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/UdpAioSession.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UdpAioSession extends AioSession { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/UdpBootstrap.java b/bus-socket/src/main/java/org/aoju/bus/socket/UdpBootstrap.java index 13e250bc5f..0af9510ff5 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/UdpBootstrap.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/UdpBootstrap.java @@ -28,6 +28,7 @@ import org.aoju.bus.core.io.PageBuffer; import org.aoju.bus.core.io.VirtualBuffer; import org.aoju.bus.core.lang.exception.InstrumentException; +import org.aoju.bus.socket.process.MessageProcessor; import java.io.IOException; import java.net.InetSocketAddress; @@ -44,7 +45,7 @@ * * @param 请求信息 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UdpBootstrap { @@ -61,7 +62,7 @@ public class UdpBootstrap { /** * 缓存页 */ - private final PageBuffer bufferPage = new org.aoju.bus.core.io.ByteBuffer(1024, 1, -1, true).allocateBufferPage(); + private final PageBuffer pageBuffer = new org.aoju.bus.core.io.ByteBuffer(1024, 1, -1, true).allocatePageBuffer(); /** * 服务配置 */ @@ -140,7 +141,7 @@ public UdpChannel open(String host, int port) throws IOException { selector.wakeup(); } SelectionKey selectionKey = channel.register(selector, SelectionKey.OP_READ); - UdpChannel udpChannel = new UdpChannel<>(channel, selectionKey, config, bufferPage); + UdpChannel udpChannel = new UdpChannel<>(channel, selectionKey, config, pageBuffer); selectionKey.attach(udpChannel); //启动线程服务 @@ -170,7 +171,7 @@ private synchronized void initThreadServer() { // 启动Boss线程组 new Thread(() -> { // 读缓冲区 - VirtualBuffer readBuffer = bufferPage.allocate(config.getReadBufferSize()); + VirtualBuffer readBuffer = pageBuffer.allocate(config.getReadBufferSize()); try { while (true) { Set selectionKeys = selector.selectedKeys(); diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/UdpChannel.java b/bus-socket/src/main/java/org/aoju/bus/socket/UdpChannel.java index caebc86cae..fac50a312e 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/UdpChannel.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/UdpChannel.java @@ -47,12 +47,12 @@ * 封装UDP底层真实渠道对象,并提供通信及会话管理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UdpChannel { - private final PageBuffer bufferPage; + private final PageBuffer pageBuffer; /** * 与当前UDP通道对接的会话 */ @@ -70,11 +70,11 @@ public class UdpChannel { private SelectionKey selectionKey; private ResponseTask failWriteEvent; - UdpChannel(final DatagramChannel channel, SelectionKey selectionKey, ServerConfig config, PageBuffer bufferPage) { + UdpChannel(final DatagramChannel channel, SelectionKey selectionKey, ServerConfig config, PageBuffer pageBuffer) { this.channel = channel; responseTasks = new ConcurrentLinkedQueue<>(); this.selectionKey = selectionKey; - this.bufferPage = bufferPage; + this.pageBuffer = pageBuffer; this.config = config; } @@ -169,7 +169,7 @@ UdpAioSession createAndCacheSession(final SocketAddress remote) { return null; }; - WriteBuffer writeBuffer = new WriteBuffer(bufferPage, function, config.getWriteBufferSize(), 1); + WriteBuffer writeBuffer = new WriteBuffer(pageBuffer, function, config.getWriteBufferSize(), 1); return new UdpAioSession(UdpChannel.this, remote, writeBuffer); }); return session; diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/UdpDispatcher.java b/bus-socket/src/main/java/org/aoju/bus/socket/UdpDispatcher.java index 8af4a9c276..fb5f15f311 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/UdpDispatcher.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/UdpDispatcher.java @@ -26,6 +26,7 @@ package org.aoju.bus.socket; import org.aoju.bus.logger.Logger; +import org.aoju.bus.socket.process.MessageProcessor; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; @@ -34,7 +35,7 @@ * UDP消息分发器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UdpDispatcher implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/UdpSelectionKey.java b/bus-socket/src/main/java/org/aoju/bus/socket/UdpSelectionKey.java index 978eab2c74..1dd58d45e1 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/UdpSelectionKey.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/UdpSelectionKey.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UdpSelectionKey extends SelectionKey { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/WorkerRegister.java b/bus-socket/src/main/java/org/aoju/bus/socket/WorkerRegister.java index c154bc8ed7..e147a78462 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/WorkerRegister.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/WorkerRegister.java @@ -31,7 +31,7 @@ * selector register callback * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface WorkerRegister { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousChannelGroup.java b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousChannelGroup.java similarity index 99% rename from bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousChannelGroup.java rename to bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousChannelGroup.java index abba18f075..1fb744415b 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousChannelGroup.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousChannelGroup.java @@ -23,7 +23,9 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.channel; + +import org.aoju.bus.socket.WorkerRegister; import java.io.IOException; import java.nio.channels.SelectionKey; @@ -36,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AsynchronousChannelGroup extends java.nio.channels.AsynchronousChannelGroup { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousChannelProvider.java b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousChannelProvider.java similarity index 98% rename from bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousChannelProvider.java rename to bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousChannelProvider.java index 4e9aa6fed7..ea71c92403 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousChannelProvider.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousChannelProvider.java @@ -23,7 +23,7 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.channel; import org.aoju.bus.core.lang.exception.InstrumentException; @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AsynchronousChannelProvider extends java.nio.channels.spi.AsynchronousChannelProvider { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousServerSocketChannel.java b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousServerSocketChannel.java similarity index 98% rename from bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousServerSocketChannel.java rename to bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousServerSocketChannel.java index cc1baa620a..979fbecc0d 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousServerSocketChannel.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousServerSocketChannel.java @@ -23,7 +23,9 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.channel; + +import org.aoju.bus.socket.handler.FutureCompletionHandler; import java.io.IOException; import java.net.SocketAddress; @@ -34,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AsynchronousServerSocketChannel extends java.nio.channels.AsynchronousServerSocketChannel { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousSocketChannel.java b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousSocketChannel.java similarity index 99% rename from bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousSocketChannel.java rename to bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousSocketChannel.java index 36d100a9b3..50c46483ec 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/AsynchronousSocketChannel.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/channel/AsynchronousSocketChannel.java @@ -23,7 +23,9 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.channel; + +import org.aoju.bus.socket.handler.FutureCompletionHandler; import java.io.IOException; import java.net.SocketAddress; @@ -38,7 +40,7 @@ * 模拟JDK7的AIO处理方式 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AsynchronousSocketChannel extends java.nio.channels.AsynchronousSocketChannel { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/DelimiterFrameDecoder.java b/bus-socket/src/main/java/org/aoju/bus/socket/convert/DelimiterFrameDecoder.java similarity index 98% rename from bus-socket/src/main/java/org/aoju/bus/socket/DelimiterFrameDecoder.java rename to bus-socket/src/main/java/org/aoju/bus/socket/convert/DelimiterFrameDecoder.java index 6b39827038..3ede07c19f 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/DelimiterFrameDecoder.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/convert/DelimiterFrameDecoder.java @@ -23,7 +23,9 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.convert; + +import org.aoju.bus.socket.SocketDecoder; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -33,7 +35,7 @@ * 指定结束标识的解码器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DelimiterFrameDecoder implements SocketDecoder { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/FixedLengthDecoder.java b/bus-socket/src/main/java/org/aoju/bus/socket/convert/FixedLengthDecoder.java similarity index 97% rename from bus-socket/src/main/java/org/aoju/bus/socket/FixedLengthDecoder.java rename to bus-socket/src/main/java/org/aoju/bus/socket/convert/FixedLengthDecoder.java index 4de6051955..96bb982a69 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/FixedLengthDecoder.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/convert/FixedLengthDecoder.java @@ -23,7 +23,9 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.convert; + +import org.aoju.bus.socket.SocketDecoder; import java.nio.ByteBuffer; @@ -31,7 +33,7 @@ * 指定长度的解码器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FixedLengthDecoder implements SocketDecoder { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/ChannelSocketHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/handler/ChannelSocketHandler.java similarity index 97% rename from bus-socket/src/main/java/org/aoju/bus/socket/ChannelSocketHandler.java rename to bus-socket/src/main/java/org/aoju/bus/socket/handler/ChannelSocketHandler.java index 0c73d371f5..1d32c04b50 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/ChannelSocketHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/handler/ChannelSocketHandler.java @@ -23,7 +23,7 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.handler; import java.nio.channels.SocketChannel; @@ -31,7 +31,7 @@ * NIO数据处理接口,通过实现此接口,可以从{@link SocketChannel}中读写数据 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/CompletionAcceptHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionAcceptHandler.java similarity index 97% rename from bus-socket/src/main/java/org/aoju/bus/socket/CompletionAcceptHandler.java rename to bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionAcceptHandler.java index d7c57a6323..440ad7c39a 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/CompletionAcceptHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionAcceptHandler.java @@ -23,10 +23,11 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.handler; import org.aoju.bus.core.lang.exception.InstrumentException; import org.aoju.bus.logger.Logger; +import org.aoju.bus.socket.QuickNioServer; import java.io.IOException; import java.nio.channels.*; @@ -35,7 +36,7 @@ * 接入完成回调,单例使用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompletionAcceptHandler implements CompletionHandler { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/CompletionReadHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionReadHandler.java similarity index 95% rename from bus-socket/src/main/java/org/aoju/bus/socket/CompletionReadHandler.java rename to bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionReadHandler.java index 49f0389675..28a37b8583 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/CompletionReadHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionReadHandler.java @@ -23,7 +23,11 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.handler; + +import org.aoju.bus.socket.NetMonitor; +import org.aoju.bus.socket.SocketStatus; +import org.aoju.bus.socket.TcpAioSession; import java.nio.channels.CompletionHandler; @@ -31,7 +35,7 @@ * 读写事件回调处理类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompletionReadHandler implements CompletionHandler> { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/CompletionWriteHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionWriteHandler.java similarity index 94% rename from bus-socket/src/main/java/org/aoju/bus/socket/CompletionWriteHandler.java rename to bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionWriteHandler.java index 967feea63d..3cd3d51fa2 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/CompletionWriteHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/handler/CompletionWriteHandler.java @@ -23,7 +23,11 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.handler; + +import org.aoju.bus.socket.NetMonitor; +import org.aoju.bus.socket.SocketStatus; +import org.aoju.bus.socket.TcpAioSession; import java.nio.channels.CompletionHandler; @@ -31,7 +35,7 @@ * 读写事件回调处理类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompletionWriteHandler implements CompletionHandler> { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/ConcurrentReadHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/handler/ConcurrentReadHandler.java similarity index 95% rename from bus-socket/src/main/java/org/aoju/bus/socket/ConcurrentReadHandler.java rename to bus-socket/src/main/java/org/aoju/bus/socket/handler/ConcurrentReadHandler.java index 8b9ba679d5..3757785f88 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/ConcurrentReadHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/handler/ConcurrentReadHandler.java @@ -23,7 +23,9 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.handler; + +import org.aoju.bus.socket.TcpAioSession; import java.util.concurrent.*; @@ -31,7 +33,7 @@ * 读写事件回调处理类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ConcurrentReadHandler extends CompletionReadHandler { @@ -47,7 +49,7 @@ public class ConcurrentReadHandler extends CompletionReadHandler { private final ExecutorService executorService = new ThreadPoolExecutor(1, 1, 60L, TimeUnit.SECONDS, taskQueue); - ConcurrentReadHandler(final Semaphore semaphore) { + public ConcurrentReadHandler(final Semaphore semaphore) { this.semaphore = semaphore; } diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/FutureCompletionHandler.java b/bus-socket/src/main/java/org/aoju/bus/socket/handler/FutureCompletionHandler.java similarity index 98% rename from bus-socket/src/main/java/org/aoju/bus/socket/FutureCompletionHandler.java rename to bus-socket/src/main/java/org/aoju/bus/socket/handler/FutureCompletionHandler.java index 9323f0fea5..8babf0be14 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/FutureCompletionHandler.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/handler/FutureCompletionHandler.java @@ -23,7 +23,7 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.handler; import java.nio.channels.CompletionHandler; import java.util.concurrent.ExecutionException; @@ -35,7 +35,7 @@ * @param 泛型对象 * @param 泛型对象 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FutureCompletionHandler implements CompletionHandler, Future, Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/AbstractPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/AbstractPlugin.java index f462f0884f..ca4a98e5f6 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/AbstractPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/AbstractPlugin.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractPlugin implements Plugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/BlackListPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/BlackListPlugin.java index 1fc13eba4d..d3c413204e 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/BlackListPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/BlackListPlugin.java @@ -36,7 +36,7 @@ * 黑名单插件,bus-socket会拒绝与黑名单中的IP建立连接 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BlackListPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/HeartPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/HeartPlugin.java index af0c150659..cd48fb6b32 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/HeartPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/HeartPlugin.java @@ -40,7 +40,7 @@ * 心跳插件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class HeartPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/MonitorPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/MonitorPlugin.java index 7ed3f31ea2..5634e157e1 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/MonitorPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/MonitorPlugin.java @@ -37,7 +37,7 @@ * 服务器运行状态监控插件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MonitorPlugin extends AbstractPlugin implements Runnable { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/PageBufferPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/PageBufferPlugin.java index 5e4b678ead..7edd643070 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/PageBufferPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/PageBufferPlugin.java @@ -39,7 +39,7 @@ * 内存页监测插件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PageBufferPlugin extends AbstractPlugin { @@ -75,7 +75,7 @@ private void init() { shutdown(); return; } - Field field = ByteBuffer.class.getDeclaredField("bufferPages"); + Field field = ByteBuffer.class.getDeclaredField("pageBuffers"); field.setAccessible(true); PageBuffer[] pages = (PageBuffer[]) field.get(pagePool); String logger = ""; diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/Plugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/Plugin.java index 6eafefd44f..166e44659c 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/Plugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/Plugin.java @@ -26,13 +26,13 @@ package org.aoju.bus.socket.plugins; import org.aoju.bus.socket.AioSession; -import org.aoju.bus.socket.MessageProcessor; import org.aoju.bus.socket.NetMonitor; import org.aoju.bus.socket.SocketStatus; +import org.aoju.bus.socket.process.MessageProcessor; /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Plugin extends NetMonitor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/ReconnectPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/ReconnectPlugin.java index 125aefd939..f93b8aa11c 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/ReconnectPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/ReconnectPlugin.java @@ -35,7 +35,7 @@ * 断链重连插件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReconnectPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SocketOptionPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SocketOptionPlugin.java index 2a0970ce82..429dab7200 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SocketOptionPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SocketOptionPlugin.java @@ -38,7 +38,7 @@ * 用于设置Socket Option的插件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SocketOptionPlugin extends AbstractPlugin { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SslPlugin.java b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SslPlugin.java index f681092ec2..4e8889e435 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SslPlugin.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/plugins/SslPlugin.java @@ -27,9 +27,9 @@ import org.aoju.bus.core.io.ByteBuffer; import org.aoju.bus.socket.BufferFactory; -import org.aoju.bus.socket.secure.ClientAuth; -import org.aoju.bus.socket.secure.SslService; -import org.aoju.bus.socket.secure.SslSocketChannel; +import org.aoju.bus.socket.security.ClientAuth; +import org.aoju.bus.socket.security.SslService; +import org.aoju.bus.socket.security.SslSocketChannel; import java.io.InputStream; import java.nio.channels.AsynchronousSocketChannel; @@ -38,7 +38,7 @@ * SSL/TLS通信插件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SslPlugin extends AbstractPlugin { @@ -80,7 +80,7 @@ private void initCheck() { @Override public final AsynchronousSocketChannel shouldAccept(AsynchronousSocketChannel channel) { - return new SslSocketChannel(channel, sslService, bufferPool.allocateBufferPage()); + return new SslSocketChannel(channel, sslService, bufferPool.allocatePageBuffer()); } } diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/AbstractProcessor.java b/bus-socket/src/main/java/org/aoju/bus/socket/process/AbstractProcessor.java similarity index 96% rename from bus-socket/src/main/java/org/aoju/bus/socket/AbstractProcessor.java rename to bus-socket/src/main/java/org/aoju/bus/socket/process/AbstractProcessor.java index 05481e7356..53dfe050ae 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/AbstractProcessor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/process/AbstractProcessor.java @@ -23,8 +23,11 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.process; +import org.aoju.bus.socket.AioSession; +import org.aoju.bus.socket.NetMonitor; +import org.aoju.bus.socket.SocketStatus; import org.aoju.bus.socket.plugins.Plugin; import java.nio.channels.AsynchronousSocketChannel; @@ -33,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProcessor implements MessageProcessor, NetMonitor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/GroupMessageProcessor.java b/bus-socket/src/main/java/org/aoju/bus/socket/process/GroupMessageProcessor.java similarity index 96% rename from bus-socket/src/main/java/org/aoju/bus/socket/GroupMessageProcessor.java rename to bus-socket/src/main/java/org/aoju/bus/socket/process/GroupMessageProcessor.java index e1c6d052bc..4eed93bc20 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/GroupMessageProcessor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/process/GroupMessageProcessor.java @@ -23,7 +23,10 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.process; + +import org.aoju.bus.socket.AioSession; +import org.aoju.bus.socket.GroupIo; import java.io.IOException; import java.util.HashSet; @@ -33,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class GroupMessageProcessor implements MessageProcessor, GroupIo { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/MessageProcessor.java b/bus-socket/src/main/java/org/aoju/bus/socket/process/MessageProcessor.java similarity index 95% rename from bus-socket/src/main/java/org/aoju/bus/socket/MessageProcessor.java rename to bus-socket/src/main/java/org/aoju/bus/socket/process/MessageProcessor.java index 29d711fa3f..ed2ee4415e 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/MessageProcessor.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/process/MessageProcessor.java @@ -23,7 +23,10 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket; +package org.aoju.bus.socket.process; + +import org.aoju.bus.socket.AioSession; +import org.aoju.bus.socket.SocketStatus; /** * 消息处理器。 @@ -34,7 +37,7 @@ * * @param 消息对象实体类型 * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface MessageProcessor { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/secure/ClientAuth.java b/bus-socket/src/main/java/org/aoju/bus/socket/security/ClientAuth.java similarity index 97% rename from bus-socket/src/main/java/org/aoju/bus/socket/secure/ClientAuth.java rename to bus-socket/src/main/java/org/aoju/bus/socket/security/ClientAuth.java index 2a6a752680..8b82bed326 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/secure/ClientAuth.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/security/ClientAuth.java @@ -23,13 +23,13 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket.secure; +package org.aoju.bus.socket.security; /** * 配置引擎请求客户端验证 此选项只对服务器模式的引擎有用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum ClientAuth { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/secure/HandshakeCallback.java b/bus-socket/src/main/java/org/aoju/bus/socket/security/HandshakeCallback.java similarity index 97% rename from bus-socket/src/main/java/org/aoju/bus/socket/secure/HandshakeCallback.java rename to bus-socket/src/main/java/org/aoju/bus/socket/security/HandshakeCallback.java index 278e8f4161..7c10982000 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/secure/HandshakeCallback.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/security/HandshakeCallback.java @@ -23,11 +23,11 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket.secure; +package org.aoju.bus.socket.security; /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ interface HandshakeCallback { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/secure/HandshakeModel.java b/bus-socket/src/main/java/org/aoju/bus/socket/security/HandshakeModel.java similarity index 98% rename from bus-socket/src/main/java/org/aoju/bus/socket/secure/HandshakeModel.java rename to bus-socket/src/main/java/org/aoju/bus/socket/security/HandshakeModel.java index 214018a69c..e65815c435 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/secure/HandshakeModel.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/security/HandshakeModel.java @@ -23,7 +23,7 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket.secure; +package org.aoju.bus.socket.security; import org.aoju.bus.core.io.VirtualBuffer; @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HandshakeModel { diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/secure/SslService.java b/bus-socket/src/main/java/org/aoju/bus/socket/security/SslService.java similarity index 97% rename from bus-socket/src/main/java/org/aoju/bus/socket/secure/SslService.java rename to bus-socket/src/main/java/org/aoju/bus/socket/security/SslService.java index cedfa84d6f..06f3a9aed1 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/secure/SslService.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/security/SslService.java @@ -23,7 +23,7 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket.secure; +package org.aoju.bus.socket.security; import org.aoju.bus.core.io.PageBuffer; import org.aoju.bus.logger.Logger; @@ -43,7 +43,7 @@ * keytool -genkey -validity 36000 -alias www.aoju.org -keyalg RSA -keystore server.keystore * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SslService { @@ -124,7 +124,7 @@ public X509Certificate[] getAcceptedIssuers() { } } - HandshakeModel createSSLEngine(AsynchronousSocketChannel socketChannel, PageBuffer bufferPage) { + HandshakeModel createSSLEngine(AsynchronousSocketChannel socketChannel, PageBuffer pageBuffer) { try { HandshakeModel handshakeModel = new HandshakeModel(); SSLEngine sslEngine = sslContext.createSSLEngine(); @@ -145,11 +145,11 @@ HandshakeModel createSSLEngine(AsynchronousSocketChannel socketChannel, PageBuff } } handshakeModel.setSslEngine(sslEngine); - handshakeModel.setAppWriteBuffer(bufferPage.allocate(session.getApplicationBufferSize())); - handshakeModel.setNetWriteBuffer(bufferPage.allocate(session.getPacketBufferSize())); + handshakeModel.setAppWriteBuffer(pageBuffer.allocate(session.getApplicationBufferSize())); + handshakeModel.setNetWriteBuffer(pageBuffer.allocate(session.getPacketBufferSize())); handshakeModel.getNetWriteBuffer().buffer().flip(); - handshakeModel.setAppReadBuffer(bufferPage.allocate(session.getApplicationBufferSize())); - handshakeModel.setNetReadBuffer(bufferPage.allocate(session.getPacketBufferSize())); + handshakeModel.setAppReadBuffer(pageBuffer.allocate(session.getApplicationBufferSize())); + handshakeModel.setNetReadBuffer(pageBuffer.allocate(session.getPacketBufferSize())); sslEngine.beginHandshake(); handshakeModel.setSocketChannel(socketChannel); diff --git a/bus-socket/src/main/java/org/aoju/bus/socket/secure/SslSocketChannel.java b/bus-socket/src/main/java/org/aoju/bus/socket/security/SslSocketChannel.java similarity index 98% rename from bus-socket/src/main/java/org/aoju/bus/socket/secure/SslSocketChannel.java rename to bus-socket/src/main/java/org/aoju/bus/socket/security/SslSocketChannel.java index bf2989e1fc..e9d89d1b8c 100644 --- a/bus-socket/src/main/java/org/aoju/bus/socket/secure/SslSocketChannel.java +++ b/bus-socket/src/main/java/org/aoju/bus/socket/security/SslSocketChannel.java @@ -23,7 +23,7 @@ * THE SOFTWARE. * * * ********************************************************************************/ -package org.aoju.bus.socket.secure; +package org.aoju.bus.socket.security; import org.aoju.bus.core.io.PageBuffer; import org.aoju.bus.core.io.VirtualBuffer; @@ -44,7 +44,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SslSocketChannel extends AsynchronousSocketChannel { @@ -68,9 +68,9 @@ public class SslSocketChannel extends AsynchronousSocketChannel { */ private int adaptiveWriteSize = -1; - public SslSocketChannel(AsynchronousSocketChannel asynchronousSocketChannel, SslService sslService, PageBuffer bufferPage) { + public SslSocketChannel(AsynchronousSocketChannel asynchronousSocketChannel, SslService sslService, PageBuffer pageBuffer) { super(null); - this.handshakeModel = sslService.createSSLEngine(asynchronousSocketChannel, bufferPage); + this.handshakeModel = sslService.createSSLEngine(asynchronousSocketChannel, pageBuffer); this.sslService = sslService; this.asynchronousSocketChannel = asynchronousSocketChannel; this.sslEngine = handshakeModel.getSslEngine(); diff --git a/bus-starter/README.md b/bus-starter/README.md index de813c38ff..0fecafdab7 100755 --- a/bus-starter/README.md +++ b/bus-starter/README.md @@ -78,16 +78,16 @@ public class TestController { //以下三个请求路径都是/c, //通过header里的客户端类型(如果是从url参数取,修改TerminalVersionExpression即可)以及版本号路由到不同方法 @GetMapping("/c") - @ClientVersion(expression = {"1>6.1.5"}) - public String cvcheck1(){return "6.1.5以上版本的1类型";} + @ClientVersion(expression = {"1>6.1.6"}) + public String cvcheck1(){return "6.1.6以上版本的1类型";} @GetMapping("/c") - @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.GT,version = "6.1.5")}) - public String cvcheck2(){return "6.1.5以上版本的2类型";} + @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.GT,version = "6.1.6")}) + public String cvcheck2(){return "6.1.6以上版本的2类型";} @GetMapping("/c") - @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.LTE,version = "6.1.5")}) - public String cvcheck3(){return "6.1.5以下版本的2类型";} + @ClientVersion({@TerminalVersion(terminals = 2,op= VersionOperator.LTE,version = "6.1.6")}) + public String cvcheck3(){return "6.1.6以下版本的2类型";} public String c(){ return "aaaa"; diff --git a/bus-starter/pom.xml b/bus-starter/pom.xml index 4de972b1fe..414763c156 100755 --- a/bus-starter/pom.xml +++ b/bus-starter/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-starter - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java index efa08bfc11..82a1e521b9 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/BusXBuilder.java @@ -29,7 +29,7 @@ * 全局常量配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BusXBuilder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java b/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java index 6114704e21..bc9900d223 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/BusXExtend.java @@ -29,7 +29,7 @@ * 全局扩展配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BusXExtend { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java b/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java index 9f6de0fa8a..4894ca79a9 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/BusXHolder.java @@ -33,7 +33,7 @@ * 扫描包配置项及其他属性等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ComponentScan("org.aoju.**") diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java b/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java index a8f1a53b0f..b1ef899fd1 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/Configurable.java @@ -41,7 +41,7 @@ * 将作为一个名为PropertiesPropertySource的属性源添加 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Order(Ordered.LOWEST_PRECEDENCE - 100) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java index 7efa0893af..ec21f8c00d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/GenieBuilder.java @@ -45,7 +45,7 @@ * 启动监听器,初始化相关配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class GenieBuilder implements diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java index 4627633748..d9c74bb267 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceBinder.java @@ -29,7 +29,7 @@ * 返回值信息处理. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface PlaceBinder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java index 793876a0fc..5359151b40 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/PlaceHandler.java @@ -36,7 +36,7 @@ * 拦截响应的代理 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PlaceHandler implements InvocationHandler { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java b/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java index 28a4f7fc75..e5c70da02a 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/SpringAware.java @@ -46,7 +46,7 @@ * * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java index a98c9edc10..76564c980c 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/SpringBuilder.java @@ -57,7 +57,7 @@ * 设置相关系统参数信息. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java b/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java index 3f40cd51c9..a7198d9a9e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/SpringHolder.java @@ -29,7 +29,7 @@ * 上下文等信息持有者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SpringHolder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java index c95b2e4deb..0eca2b6954 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCache.java @@ -34,7 +34,7 @@ * 启用缓存支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java index 14f437a450..61e28ab2a7 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableCors.java @@ -34,7 +34,7 @@ * 启用跨域支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java index 682ce4c3b8..f4498a69cd 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruid.java @@ -34,7 +34,7 @@ * 启用Druid 支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java index 5678bca5ae..799ffbae95 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDruids.java @@ -35,7 +35,7 @@ * 启用Druid监控 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java index 804239ed4c..bc48f6294a 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableDubbo.java @@ -37,7 +37,7 @@ * 启用Dubbo支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java index 3c5a2a3792..e4d439bcbc 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableGoalie.java @@ -34,7 +34,7 @@ * 启用路由匹配 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java index c1557b45b6..df3c3e781d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableI18n.java @@ -35,7 +35,7 @@ * 启用国际化支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java index 75a60efe94..ef1f3b1a33 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableImage.java @@ -34,7 +34,7 @@ * 启用图像解析 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java index 8eaa69d860..ecdb655cdb 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableLimiter.java @@ -36,7 +36,7 @@ * 启用限流降级 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java index 43fde001f1..56046b495b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableMapper.java @@ -36,7 +36,7 @@ * 开启 Mybatis/Mapper * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java index d8d81c79dc..ab27241477 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableNotify.java @@ -34,7 +34,7 @@ * 启用消息通知 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java index dec9041ee8..d24537999d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOAuth2.java @@ -34,7 +34,7 @@ * 启用第三方授权 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java index a09598ee72..e3107f71e3 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableOffice.java @@ -34,7 +34,7 @@ * 启用在线预览 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java index 2c2b1f94ae..c647212d11 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSensitive.java @@ -34,7 +34,7 @@ * 启用数据脱敏 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java index aea5b5d66c..b8890958a9 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableSocket.java @@ -34,7 +34,7 @@ * 启用WebSocket * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java index d60d0f50ed..28a611ef31 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableStorage.java @@ -34,7 +34,7 @@ * 启用OSS存储 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java index 30f1ae52a6..abf44d4439 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableTracer.java @@ -34,7 +34,7 @@ * 启用链路追踪 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java index 66535803d4..3f513da34d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableValidate.java @@ -34,7 +34,7 @@ * 启用数据校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java index 13b5ebb86c..2f297685bb 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/annotation/EnableWrapper.java @@ -34,7 +34,7 @@ * 启用Request/Response请求包装 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Inherited diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java index b8f97548c2..8203ed4dba 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/AbstractBanner.java @@ -35,7 +35,7 @@ * 旗标生成器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractBanner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java index 176fdf1e89..2de13bfebc 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/BusBanner.java @@ -39,7 +39,7 @@ * 旗标生成器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BusBanner implements Banner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java index 7b2600209e..e9cca03c92 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/Description.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java index b791fc110e..0ca2547508 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/ImageBanner.java @@ -43,7 +43,7 @@ * ASCII艺术产生的图像文件 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ImageBanner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java index 3044af8ead..89afae76bc 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/banner/VersionBanner.java @@ -29,7 +29,7 @@ * 版本旗标生成 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class VersionBanner extends AbstractBanner { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java index 0759868a1a..5ad8e70d29 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/AspectjCacheProxy.java @@ -45,7 +45,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Aspect diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java index 4245ebc3c1..f8c85530b8 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheConfiguration.java @@ -38,7 +38,7 @@ * 缓存配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {CacheProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java index 47708e8568..ff286a1824 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheProperties.java @@ -37,7 +37,7 @@ * 缓存相关配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java index 9fed70560e..762c3f141b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cache/CacheXProxy.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CacheXProxy implements FactoryBean { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java index 97390acd6f..4bfcf3161a 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsConfiguration.java @@ -40,7 +40,7 @@ * Cors 跨域支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {CorsProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java index ca8c1990ba..2622f89261 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/cors/CorsProperties.java @@ -34,7 +34,7 @@ * Core 跨域相关配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java index 87ec074a3d..460eecf46b 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/AspectjDruidProxy.java @@ -40,7 +40,7 @@ * AOP切面切点 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Order(-1) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java index 15d75cc3e9..a6dae3bff5 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSource.java @@ -31,7 +31,7 @@ * 多数据源支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java index 458b94132e..888bbf963a 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DataSourceHolder.java @@ -44,7 +44,7 @@ * 数据源信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DataSourceHolder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java index 4c3063e7e0..3f05157aec 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidConfiguration.java @@ -60,7 +60,7 @@ * 数据源配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ConditionalOnClass(DruidDataSource.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java index 60e3825a5c..fb59e77e4b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorConfiguration.java @@ -43,7 +43,7 @@ * Druid 监控配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ConditionalOnClass(DruidDataSource.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java index 35eb6c66b7..aa790d93be 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidMonitorProperties.java @@ -33,7 +33,7 @@ * Druid 监控配置项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java index ea6c0ef6e0..67e61227d7 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DruidProperties.java @@ -35,7 +35,7 @@ * Druid 配置项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java index 8d1162774d..ead9eed4d0 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/druid/DynamicDataSource.java @@ -39,7 +39,7 @@ * 多数据源支持 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DynamicDataSource extends AbstractRoutingDataSource { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java index de155df04b..ceef3048c7 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboConfiguration.java @@ -31,7 +31,7 @@ * Dubbo自动配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {DubboProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java index 4358176366..0702ec82c1 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/dubbo/DubboProperties.java @@ -35,7 +35,7 @@ * Dubbo配置项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java index f27471ecb3..135c644232 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieConfiguration.java @@ -51,7 +51,7 @@ * 路由自动配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8++ */ @ConditionalOnWebApplication @@ -80,8 +80,8 @@ Athlete athlete() { ApiRouterHandler apiRouterHandler = new ApiRouterHandler(); RouterFunction routerFunction = RouterFunctions - .route(RequestPredicates.path(goalieProperties.getServer().getPath()) - .and(RequestPredicates.accept(MediaType.APPLICATION_FORM_URLENCODED)), apiRouterHandler::handle); + .route(RequestPredicates.path(goalieProperties.getServer().getPath()) + .and(RequestPredicates.accept(MediaType.APPLICATION_FORM_URLENCODED)), apiRouterHandler::handle); HandlerStrategies.Builder builder = HandlerStrategies.builder(); @@ -99,7 +99,7 @@ Athlete athlete() { HttpHandler handler = RouterFunctions.toHttpHandler(routerFunction, handlerStrategies); ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler); HttpServer server = HttpServer.create() - .port(goalieProperties.getServer().getPort()).handle(adapter); + .port(goalieProperties.getServer().getPort()).handle(adapter); return new Athlete(server, assetRegistries); } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java index e9d0f15ccd..9350352d70 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/GoalieProperties.java @@ -34,7 +34,7 @@ * 路由配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data @@ -60,6 +60,7 @@ public static class Encrypt { private boolean enabled; private String key; private String type; + private String offset; } @Data @@ -68,6 +69,7 @@ public static class Decrypt { private boolean enabled; private String key; private String type; + private String offset; } } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/AuthorizeFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/AuthorizeFilter.java index 6bb110c3b7..10f4c71640 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/AuthorizeFilter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/AuthorizeFilter.java @@ -40,6 +40,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; +import org.springframework.http.HttpMethod; +import org.springframework.http.server.reactive.ServerHttpRequest; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; @@ -55,7 +57,8 @@ * 访问鉴权 * * @author Justubborn - * @since 2020/11/7 + * @version 6.1.6 + * @since JDK 1.8+ */ @Component @ConditionalOnBean(GoalieConfiguration.class) @@ -71,36 +74,90 @@ public class AuthorizeFilter implements WebFilter { public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { Context context = Context.get(exchange); Map params = context.getRequestMap(); + + context.setFormat(Context.Format.valueOf(params.get(Consts.FORMAT))); + String method = params.get(Consts.METHOD); String version = params.get(Consts.VERSION); List assetsList = athlete.getAssets().parallelStream() - .filter(asset -> Objects.equals(method, asset.getMethod())).collect(Collectors.toList()); + .filter(asset -> Objects.equals(method, asset.getMethod())).collect(Collectors.toList()); if (assetsList.size() < 1) { return Mono.error(new BusinessException(ErrorCode.EM_100103)); } Assets assets = assetsList.parallelStream() - .filter(c -> Objects.equals(version, c.getVersion())).findFirst() - .orElseThrow(() -> new BusinessException(ErrorCode.EM_100102)); + .filter(c -> Objects.equals(version, c.getVersion())).findFirst() + .orElseThrow(() -> new BusinessException(ErrorCode.EM_100102)); + //校验方法 + checkMethod(exchange.getRequest(), assets); + //校验参数 + checkTokenIfNecessary(exchange.getRequest(), assets, params); + //填充Ip + fillXParam(exchange, params); + + //清理 method 和 version + cleanParam(params); context.setAssets(assets); + return chain.filter(exchange); + } + + /** + * 校验方法 + * + * @param request 请求 + * @param assets 路由 + */ + private void checkMethod(ServerHttpRequest request, Assets assets) { + if (!Objects.equals(request.getMethod(), assets.getHttpMethod())) { + if (Objects.equals(assets.getHttpMethod(), HttpMethod.GET)) { + throw new BusinessException(ErrorCode.EM_100200); + } else if (Objects.equals(assets.getHttpMethod(), HttpMethod.POST)) { + throw new BusinessException(ErrorCode.EM_100201); + } else { + throw new BusinessException(ErrorCode.EM_100508); + } + + } + } + + /** + * 校验 token 并 填充参数 + * + * @param request 请求 + * @param assets 路由 + * @param params 参数 + */ + private void checkTokenIfNecessary(ServerHttpRequest request, Assets assets, Map params) { // 访问授权校验 - Map requestMap = context.getRequestMap(); if (assets.isToken()) { - String token = exchange.getRequest().getHeaders().getFirst(Consts.X_ACCESS_TOKEN); + String token = request.getHeaders().getFirst(Consts.X_ACCESS_TOKEN); Delegate delegate = authorize.authorize(token); if (delegate.isOk()) { OAuth2 auth2 = delegate.getOAuth2(); Map map = BeanKit.beanToMap(auth2, false, true); - map.forEach((k, v) -> requestMap.put(k, v.toString())); + map.forEach((k, v) -> params.put(k, v.toString())); } else { - throw new BusinessException(ErrorCode.EM_FAILURE, delegate.getMessage().errmsg); + throw new BusinessException(delegate.getMessage().errcode, delegate.getMessage().errmsg); } } + } - return chain.filter(exchange); + /** + * 清理网关参数 + * + * @param params 参数 + */ + private void cleanParam(Map params) { + params.remove(Consts.METHOD); + params.remove(Consts.FORMAT); + params.remove(Consts.VERSION); + } + + private void fillXParam(ServerWebExchange exchange, Map requestParam) { + requestParam.put("x-remote-ip", exchange.getRequest().getHeaders().getFirst("x-real-ip")); } } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/DecryptFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/DecryptFilter.java index 31cf16e1f8..7fe91021b8 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/DecryptFilter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/DecryptFilter.java @@ -26,6 +26,11 @@ package org.aoju.bus.starter.goalie.filter; import org.aoju.bus.core.lang.Charset; +import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.crypto.Mode; +import org.aoju.bus.crypto.Padding; +import org.aoju.bus.crypto.symmetric.AES; +import org.aoju.bus.crypto.symmetric.Symmetric; import org.aoju.bus.goalie.Context; import org.aoju.bus.starter.goalie.GoalieConfiguration; import org.aoju.bus.starter.goalie.GoalieProperties; @@ -39,13 +44,15 @@ import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Mono; +import javax.annotation.PostConstruct; import java.util.Map; /** * 数据解密 * * @author Justubborn - * @since 2020/11/7 + * @version 6.1.6 + * @since JDK 1.8+ */ @Component @ConditionalOnBean(GoalieConfiguration.class) @@ -55,10 +62,19 @@ public class DecryptFilter implements WebFilter { @Autowired GoalieProperties.Server.Decrypt decrypt; + private Symmetric symmetric; + + @PostConstruct + public void init() { + if ("AES".equals(decrypt.getType())) { + symmetric = new AES(Mode.CBC, Padding.PKCS7Padding, decrypt.getKey().getBytes(), decrypt.getOffset().getBytes()); + } + } + @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { ServerWebExchange.Builder builder = exchange.mutate(); - if (decrypt.isEnabled()) { + if (decrypt.isEnabled() && Context.get(exchange).isNeedDecrypt()) { doDecrypt(Context.get(exchange).getRequestMap()); } @@ -71,7 +87,15 @@ public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { * @param map 参数 */ private void doDecrypt(Map map) { - map.forEach((k, v) -> map.put(k, org.aoju.bus.crypto.Builder.decrypt(decrypt.getType(), decrypt.getKey(), v, Charset.UTF_8))); + if (null == symmetric) { + return; + } + map.forEach((k, v) -> { + if(StringKit.isNotBlank(v)) { + map.put(k, symmetric.decryptStr(v, Charset.UTF_8)); + } + + }); } } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/EncryptFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/EncryptFilter.java index 9077fc0f81..df91e6a729 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/EncryptFilter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/EncryptFilter.java @@ -29,6 +29,10 @@ import org.aoju.bus.base.entity.Message; import org.aoju.bus.core.lang.Charset; import org.aoju.bus.core.toolkit.ObjectKit; +import org.aoju.bus.crypto.Mode; +import org.aoju.bus.crypto.Padding; +import org.aoju.bus.crypto.symmetric.AES; +import org.aoju.bus.crypto.symmetric.Symmetric; import org.aoju.bus.goalie.Context; import org.aoju.bus.starter.goalie.GoalieConfiguration; import org.aoju.bus.starter.goalie.GoalieProperties; @@ -47,6 +51,7 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import javax.annotation.PostConstruct; import java.nio.CharBuffer; import java.nio.charset.StandardCharsets; @@ -54,7 +59,8 @@ * 数据加密 * * @author Justubborn - * @since 2020/10/29 + * @version 6.1.6 + * @since JDK 1.8+ */ @Component @ConditionalOnBean(GoalieConfiguration.class) @@ -64,10 +70,19 @@ public class EncryptFilter implements WebFilter { @Autowired GoalieProperties.Server.Encrypt encrypt; + private Symmetric symmetric; + + @PostConstruct + public void init() { + if ("AES".equals(encrypt.getType())) { + symmetric = new AES(Mode.CBC, Padding.PKCS7Padding, encrypt.getKey().getBytes(), encrypt.getOffset().getBytes()); + } + } + @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - if (encrypt.isEnabled()) { + if (encrypt.isEnabled() && !Context.Format.binary.equals(Context.get(exchange).getFormat())) { exchange = exchange.mutate().response(process(exchange)).build(); } return chain.filter(exchange); @@ -80,7 +95,10 @@ public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { */ private void doEncrypt(Message message) { if (ObjectKit.isNotNull(message.getData())) { - message.setData(org.aoju.bus.crypto.Builder.encrypt(encrypt.getType(), encrypt.getKey(), JSON.toJSONString(message.getData()), Charset.UTF_8)); + if ("AES".equals(encrypt.getType())) { + message.setData(symmetric.encryptBase64(JSON.toJSONString(message.getData()), Charset.UTF_8)); + } + } } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FormatFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FormatFilter.java index da04a90edc..df63448410 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FormatFilter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/FormatFilter.java @@ -28,6 +28,7 @@ import org.aoju.bus.base.entity.Message; import org.aoju.bus.extra.json.JsonKit; import org.aoju.bus.goalie.Context; +import org.aoju.bus.logger.Logger; import org.aoju.bus.starter.goalie.GoalieConfiguration; import org.reactivestreams.Publisher; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -49,7 +50,8 @@ * 格式化 * * @author Justubborn - * @since 2020/11/26 + * @version 6.1.6 + * @since JDK 1.8+ */ @Component @ConditionalOnBean(GoalieConfiguration.class) @@ -77,6 +79,9 @@ public Mono writeWith(Publisher body) { String bodyString = Charset.defaultCharset().decode(dataBuffer.asByteBuffer()).toString(); Message message = JsonKit.toPojo(bodyString, Message.class); String formatBody = context.getFormat().getProvider().serialize(message); + if(Logger.get().isTrace()) { + Logger.trace("traceId:{},resp <= {}", exchange.getLogPrefix(), formatBody); + } return bufferFactory().wrap(formatBody.getBytes()); })); } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/PrimaryFilter.java b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/PrimaryFilter.java index 5b3070ea06..98a0e11f5b 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/PrimaryFilter.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/goalie/filter/PrimaryFilter.java @@ -28,18 +28,22 @@ import org.aoju.bus.base.consts.ErrorCode; import org.aoju.bus.core.lang.exception.BusinessException; import org.aoju.bus.core.toolkit.StringKit; +import org.aoju.bus.extra.json.JsonKit; import org.aoju.bus.goalie.Consts; import org.aoju.bus.goalie.Context; +import org.aoju.bus.logger.Logger; import org.aoju.bus.starter.goalie.GoalieConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; import org.springframework.http.codec.multipart.FilePart; import org.springframework.http.codec.multipart.FormFieldPart; import org.springframework.http.codec.multipart.Part; import org.springframework.http.server.reactive.ServerHttpRequest; +import org.springframework.http.server.reactive.ServerHttpRequestDecorator; import org.springframework.stereotype.Component; import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; @@ -55,7 +59,8 @@ * 参数过滤/校验 * * @author Justubborn - * @since 2020/10/29 + * @version 6.1.6 + * @since JDK 1.8+ */ @Component @ConditionalOnBean(GoalieConfiguration.class) @@ -64,21 +69,22 @@ public class PrimaryFilter implements WebFilter { @Override public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { - ServerHttpRequest request = exchange.getRequest(); + + ServerWebExchange mutate = setDefaultContentTypeIfNecessary(exchange); + + Context context = Context.get(mutate); + context.setStartTime(System.currentTimeMillis()); + ServerHttpRequest request = mutate.getRequest(); if (Objects.equals(request.getMethod(), HttpMethod.GET)) { MultiValueMap params = request.getQueryParams(); - Context.get(exchange).setRequestMap(params.toSingleValueMap()); - doParams(exchange); - return chain.filter(exchange); + context.setRequestMap(params.toSingleValueMap()); + doParams(mutate); + return chain.filter(mutate) + .then(Mono.fromRunnable(() -> Logger.info("traceId:{},exec time :{} ms", mutate.getLogPrefix(), System.currentTimeMillis() - context.getStartTime()))); } else { - MediaType mediaType = request.getHeaders().getContentType(); - if (null == mediaType) { - mediaType = MediaType.APPLICATION_FORM_URLENCODED; - } - String contentType = mediaType.toString().toLowerCase(); //文件 - if (contentType.contains(MediaType.MULTIPART_FORM_DATA_VALUE)) { - return exchange.getMultipartData().flatMap(params -> { + if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(mutate.getRequest().getHeaders().getContentType())) { + return mutate.getMultipartData().flatMap(params -> { Map formMap = new LinkedHashMap<>(); Map fileMap = new LinkedHashMap<>(); @@ -91,17 +97,19 @@ public Mono filter(ServerWebExchange exchange, WebFilterChain chain) { fileMap.put(k, v); } }); - Context.get(exchange).setRequestMap(formMap); - Context.get(exchange).setFilePartMap(fileMap); - doParams(exchange); - return chain.filter(exchange); + context.setRequestMap(formMap); + context.setFilePartMap(fileMap); + doParams(mutate); + return chain.filter(mutate) + .doOnTerminate(() -> Logger.info("traceId:{},exec time :{}ms", mutate.getLogPrefix(), System.currentTimeMillis() - context.getStartTime())); }); } else { - return exchange.getFormData().flatMap(params -> { - Context.get(exchange).setRequestMap(params.toSingleValueMap()); - doParams(exchange); - return chain.filter(exchange); + return mutate.getFormData().flatMap(params -> { + context.setRequestMap(params.toSingleValueMap()); + doParams(mutate); + return chain.filter(mutate) + .doOnTerminate(() -> Logger.info("traceId:{},exec time :{}ms", mutate.getLogPrefix(), System.currentTimeMillis() - context.getStartTime())); }); } @@ -123,11 +131,39 @@ private void doParams(ServerWebExchange exchange) { if (StringKit.isBlank(params.get(Consts.VERSION))) { throw new BusinessException(ErrorCode.EM_100107); } - String format = params.get(Consts.FORMAT); - if (StringKit.isBlank(format)) { + if (StringKit.isBlank(params.get(Consts.FORMAT))) { throw new BusinessException(ErrorCode.EM_100111); } - context.setFormat(Context.Format.valueOf(format)); + + if (StringKit.isNotBlank(params.get(Consts.SIGN))) { + context.setNeedDecrypt(true); + } + Logger.info("traceId:{},method:{},req =>{}", exchange.getLogPrefix(), params.get(Consts.METHOD), JsonKit.toJsonString(context.getRequestMap())); + } + + /** + * 设置默认值 + * + * @param exchange 消息 + */ + private ServerWebExchange setDefaultContentTypeIfNecessary(ServerWebExchange exchange) { + ServerHttpRequest request = exchange.getRequest(); + MediaType mediaType = request.getHeaders().getContentType(); + if (null == mediaType) { + mediaType = MediaType.APPLICATION_FORM_URLENCODED; + HttpHeaders headers = new HttpHeaders(); + headers.putAll(exchange.getRequest().getHeaders()); + headers.setContentType(mediaType); + //变异 + ServerHttpRequest requestDecorator = new ServerHttpRequestDecorator(request) { + @Override + public HttpHeaders getHeaders() { + return headers; + } + }; + return exchange.mutate().request(requestDecorator).build(); + } + return exchange; } } diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java index e684e37543..ec5b90758b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nConfiguration.java @@ -39,7 +39,7 @@ * 国际化配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {I18nProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java index 19827edc48..462a30c32c 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/I18nProperties.java @@ -33,7 +33,7 @@ * 国际化资源配置属性 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java index fcae0de2a0..1424ee7318 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/i18n/LocaleMessage.java @@ -35,7 +35,7 @@ * key = value * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java index f46e96dcf4..bd3ddcf096 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageConfiguration.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {ImageProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java index 87fe868e06..345217ad7c 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/image/ImageProperties.java @@ -33,7 +33,7 @@ * 影像解析配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java index d075ac59a4..7450c7c20c 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/AbstractLimiterAware.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractLimiterAware implements ImportAware { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java index 097cf2af3f..9fabfd5f59 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterAwareHandler.java @@ -49,7 +49,7 @@ * 限流配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Role(BeanDefinition.ROLE_INFRASTRUCTURE) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java index 145f5b883d..3546c20d06 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/limiter/LimiterConfiguration.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LimiterConfiguration extends AdviceModeImportSelector { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java index 308641378a..e6ec20c5b9 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/AbstractSqlParserHandler.java @@ -47,7 +47,7 @@ * 抽象 SQL 解析类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractSqlParserHandler extends AbstractSqlHandler { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java index 0a5590ed0e..eb64389e70 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/ExplainSQLHandler.java @@ -46,7 +46,7 @@ * 防止全表更新与删除 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java index 7f5c81c9f0..23a5488746 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/IllegalSQLHandler.java @@ -83,7 +83,7 @@ *

7.where条件使用了 使用子查询

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java index 8dcdc3bfa4..6e5f464c77 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperClassScanner.java @@ -39,7 +39,7 @@ * mapper 注册扫描 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapperClassScanner extends MapperScannerConfigurer { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java index a2770c9abe..f1f56d953c 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperConfiguration.java @@ -36,7 +36,7 @@ * mapper 扫描配置类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @AutoConfigureAfter(MybatisConfiguration.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java index 13bf18138c..2bca3d2e9f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MapperFactoryBean.java @@ -37,7 +37,7 @@ * 增加mapperBuilder * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MapperFactoryBean extends SqlSessionDaoSupport diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java index 14ee2ccede..ffdb15c1b5 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisConfiguration.java @@ -45,7 +45,7 @@ * mybatis 配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {MybatisProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java index b80280cadf..249ebcb245 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisPluginBuilder.java @@ -41,7 +41,7 @@ * mybatis 插件启用 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MybatisPluginBuilder { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java index 33ee0c16ef..d0b96c359e 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/MybatisProperties.java @@ -33,7 +33,7 @@ * mybatis配置项 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java index e4c7a65344..821d0879ec 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/NatureSQLHandler.java @@ -53,7 +53,7 @@ * 数据库操作性能拦截器,记录耗时 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Intercepts(value = { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java index a339bdb1f8..9e88f22a35 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/mapper/RecordTimeHandler.java @@ -59,7 +59,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Intercepts({ diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java index c743efa2cb..0b5d13240d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyConfiguration.java @@ -32,7 +32,7 @@ * 消息通知配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {NotifyProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java index 304a848c93..d9d379205d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProperties.java @@ -39,7 +39,7 @@ * 2. 通过set形式设置(动态/DB等) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java index 5362566770..faffa7ce79 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/notify/NotifyProviderService.java @@ -43,7 +43,7 @@ * 通知提供服务 * * @author Justubborn - * @version 6.1.5 + * @version 6.1.6 * @since JDK1.8+ */ public class NotifyProviderService { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java index 77852ab9db..81e52a1779 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthConfiguration.java @@ -37,7 +37,7 @@ * 授权配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {AuthProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java index 9429adf43a..d0ed313b9f 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProperties.java @@ -41,7 +41,7 @@ * 2. 通过set形式设置(动态/DB等) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java index 025fab3b89..2ba5bd8e79 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/oauth/AuthProviderService.java @@ -42,7 +42,7 @@ * 授权服务提供 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AuthProviderService { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java index 2b9a44841f..ef7b2a26ca 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeConfiguration.java @@ -47,7 +47,7 @@ * 文档在线预览配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ConditionalOnClass({LocalOfficeProvider.class, OnlineOfficeProvider.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java index 24a70678c1..086c153cef 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProperties.java @@ -38,7 +38,7 @@ * 文档预览配置类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java index 8f59ad7e21..de1212a3e5 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/office/OfficeProviderService.java @@ -38,7 +38,7 @@ * 文档在线预览服务提供 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java index f63a60c408..58830fc1ff 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/RequestBodyAdvice.java @@ -50,7 +50,7 @@ * 对加了@P的方法的数据进行解密密操作 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RequestBodyAdvice extends BaseAdvice diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java index 918104eb33..00b3ee9f7a 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/ResponseBodyAdvice.java @@ -57,7 +57,7 @@ * 对加了@Encrypt的方法的数据进行加密操作 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ResponseBodyAdvice extends BaseAdvice diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java index eca47a588b..3f17ec33c8 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveConfiguration.java @@ -32,7 +32,7 @@ * 脱敏配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {SensitiveProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java index 8e74be1cf4..de5d28d952 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/sensitive/SensitiveProperties.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java index 7ef1066a8f..9067e17f96 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketConfiguration.java @@ -33,7 +33,7 @@ * Socket配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(SocketProperties.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java index ad0dd44b58..3f9a53272d 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketProperties.java @@ -35,7 +35,7 @@ * 2. 可以自己从写部分类等 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketQuickService.java b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketQuickService.java index 9c232e6bb4..86ff653507 100644 --- a/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketQuickService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/socket/SocketQuickService.java @@ -1,15 +1,15 @@ package org.aoju.bus.starter.socket; -import org.aoju.bus.socket.MessageProcessor; import org.aoju.bus.socket.Protocol; import org.aoju.bus.socket.QuickAioServer; +import org.aoju.bus.socket.process.MessageProcessor; import org.springframework.beans.factory.annotation.Autowired; import java.io.IOException; /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SocketQuickService { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java index c67f30d878..4cc1798aba 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageConfiguration.java @@ -37,7 +37,7 @@ * 授权配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties(value = {StorageProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java index d3bee0b7ee..dc78ba5d71 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProperties.java @@ -41,7 +41,7 @@ * 2. 通过set形式设置(动态/DB等) * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java index c8ec73e4e4..6549b5e1b6 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/storage/StorageProviderService.java @@ -42,7 +42,7 @@ * 存储服务提供 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class StorageProviderService { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java index f7d97cb6b5..e04d7c65ce 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/MethodExecuteCostHandler.java @@ -32,7 +32,7 @@ * 方法执行耗时统计 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java index 811ec02067..b000410df3 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerConfiguration.java @@ -55,7 +55,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ConditionalOnWebApplication diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java index ac78191620..8fe0c84246 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/tracer/TracerProperties.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TracerProperties { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java index 793d94aed3..6e90bd8bf6 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AspectjValidateProxy.java @@ -36,7 +36,7 @@ * AOP切面切点 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Order(99) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java index 6f56e4e24b..914b8daf08 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/validate/AutoValidateAdvice.java @@ -38,7 +38,7 @@ * 自动进行参数处理实现类 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AutoValidateAdvice { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java index 8c5c0ad1a1..2efa9564f2 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/validate/ValidateConfiguration.java @@ -31,7 +31,7 @@ * 数据校验配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Import(value = AspectjValidateProxy.class) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java index 4a4a394245..cb36c4dda4 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheRequestWrapper.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CacheRequestWrapper extends HttpServletRequestWrapper { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java index d388888f7f..1b8095846b 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/CacheResponseWrapper.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CacheResponseWrapper extends HttpServletResponseWrapper { diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java index 958dfec202..fb8be376a5 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/GenieWrapperHandler.java @@ -45,7 +45,7 @@ * 对于某些处理程序组,添加常见的预处理行为不需要修改每个处理程序实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Component diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java index 62466b881c..d0a0d3f381 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperConfiguration.java @@ -46,7 +46,7 @@ * Xss/重复读取等配置 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @EnableConfigurationProperties({WrapperProperties.class}) diff --git a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java index 22cd74f3cf..64a370c149 100755 --- a/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java +++ b/bus-starter/src/main/java/org/aoju/bus/starter/wrapper/WrapperProperties.java @@ -39,7 +39,7 @@ * 配置信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-storage/pom.xml b/bus-storage/pom.xml index 5e5e08fd34..22725397c4 100755 --- a/bus-storage/pom.xml +++ b/bus-storage/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-storage - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java b/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java index f8505d4893..2a03aeba67 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Builder.java @@ -34,7 +34,7 @@ * 框架内预定义的存储信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Builder { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Context.java b/bus-storage/src/main/java/org/aoju/bus/storage/Context.java index 35614ddf9d..500e157413 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Context.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Context.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java b/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java index 50febf8d73..aec4e581bd 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Provider.java @@ -35,7 +35,7 @@ * 文件存储提供者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Provider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java b/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java index 9e101f2435..632bf9fff8 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/Registry.java @@ -29,7 +29,7 @@ * 平台类型 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum Registry { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java index 1a66fdbff9..4430c08eeb 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Attachs.java @@ -36,7 +36,7 @@ * 附件信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java index a2e79cbc72..178092ccfb 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/magic/Message.java @@ -32,7 +32,7 @@ * 响应结果 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Getter diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java b/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java index 59a7444fc9..5a58697042 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/metric/StorageCache.java @@ -33,7 +33,7 @@ * 默认缓存实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public enum StorageCache implements ExtendCache { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java index bbfb10decd..4034c52f2f 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AbstractProvider.java @@ -43,7 +43,7 @@ * 预定义存储实现 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractProvider implements Provider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java index 8ab3bcea8e..d7ae735094 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/AliYunOssProvider.java @@ -48,7 +48,7 @@ * 存储服务-阿里云 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class AliYunOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java index 21283fe7f7..d3e1ec7a26 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/BaiduYunBosProvider.java @@ -49,7 +49,7 @@ * 存储服务-百度云 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BaiduYunBosProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java index dfeb0171ac..86e9434a28 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/HuaweiObsProvider.java @@ -47,7 +47,7 @@ * 存储服务-华为云 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HuaweiObsProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java index 1d4ca7bee6..e9f6815090 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/JdYunOssProvider.java @@ -54,7 +54,7 @@ * 存储服务-京东云 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class JdYunOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java index 214e06dbba..95bfb997ff 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/LocalFileProvider.java @@ -44,7 +44,7 @@ * 本地文件上传 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LocalFileProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java index 103d79e3cd..c664590306 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/MinioOssProvider.java @@ -55,7 +55,7 @@ * 存储服务-MinIO * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MinioOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java index 51aac50e97..df0b4fb5cf 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/QiniuYunOssProvider.java @@ -53,7 +53,7 @@ * 存储服务-七牛 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class QiniuYunOssProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java index 94e2babefc..2b584ab0f0 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/TencentCosProvider.java @@ -51,7 +51,7 @@ * 存储服务-腾讯云 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TencentCosProvider extends AbstractProvider { diff --git a/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java b/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java index 2b1bd718f1..e86f4a5c44 100755 --- a/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java +++ b/bus-storage/src/main/java/org/aoju/bus/storage/provider/UpaiYunOssProvider.java @@ -47,7 +47,7 @@ * 存储服务-又拍云 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class UpaiYunOssProvider extends AbstractProvider { diff --git a/bus-tracer/pom.xml b/bus-tracer/pom.xml index 3b3be890d6..49d9962000 100755 --- a/bus-tracer/pom.xml +++ b/bus-tracer/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-tracer - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java index 25a71f9cb3..173643b93e 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Backend.java @@ -33,7 +33,7 @@ * 后端应该是线程安全的(读写被委托给线程本地状态). * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface Backend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java index 7a011acd1d..e2d00935de 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Builder.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class Builder { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java index 3da7a42fd6..2ea3122f26 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Provider.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Provider extends AbstractSet { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java index 6e9d363b93..897ee7f5fc 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Resolver.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Resolver { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java index 49fd88a808..de1370cc01 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/Tracer.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Tracer { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java index 4925589566..3d5d0e793f 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/AbstractBackend.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public abstract class AbstractBackend implements Backend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java index eb002ecd30..4f606531c1 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4JAbstractBackend.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ class Slf4JAbstractBackend extends AbstractBackend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java index 58dedbc5f1..dc3ed3e0dd 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/Slf4jTraceBackendProvider.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Slf4jTraceBackendProvider implements TraceBackendProvider { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java index 2b72bbb6e8..6d0a558691 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/ThreadLocalHashSet.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class ThreadLocalHashSet extends InheritableThreadLocal> { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java index 7f0cb7c2d0..324e906ebe 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/backend/TraceBackendProvider.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TraceBackendProvider { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java index 1b335a6732..e339375105 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/TraceCxfFeature.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceCxfFeature extends AbstractFeature { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java index 923ffeb928..c0f55783fa 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceInInterceptor.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ abstract class AbstractTraceInInterceptor extends AbstractPhaseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java index ab43ffee4f..89416090dc 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/AbstractTraceOutInterceptor.java @@ -46,7 +46,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ abstract class AbstractTraceOutInterceptor extends AbstractPhaseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java index 16e2620b56..91c6d1687a 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestInInterceptor.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceRequestInInterceptor extends AbstractTraceInInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java index 506f0cea5a..b38050ff4c 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceRequestOutInterceptor.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceRequestOutInterceptor extends AbstractTraceOutInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java index f87c9acfbb..04dfbb3490 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseInInterceptor.java @@ -34,7 +34,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceResponseInInterceptor extends AbstractTraceInInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java index a6d0218ce9..1995099a06 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/cxf/interceptor/TraceResponseOutInterceptor.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceResponseOutInterceptor extends AbstractTraceOutInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java index 0da2e87e1d..d1d1d62d42 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpRequestInterceptor.java @@ -38,7 +38,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceHttpRequestInterceptor implements HttpRequestInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java index 57ae91d606..b50e4bff95 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient/TraceHttpResponseInterceptor.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceHttpResponseInterceptor implements HttpResponseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java index 94ae4aa04f..572fe594cf 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpRequestInterceptor.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceHttpRequestInterceptor implements HttpRequestInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java index f7ba0ec572..070138cf86 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/apache/httpclient5/TraceHttpResponseInterceptor.java @@ -42,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceHttpResponseInterceptor implements HttpResponseInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java index a62079d7f3..197007581f 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageListener.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TraceMessageListener { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java index 60ac5cd07a..dc03177d40 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageProducer.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceMessageProducer implements MessageProducer { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java index a6fe059967..77ebd0d25b 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceMessageWriter.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TraceMessageWriter { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java index 6f8aec8208..7e6b954997 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceQueueSender.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TraceQueueSender implements QueueSender { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java index c047c5981f..31670f4ffa 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/jms/TraceTopicPublisher.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TraceTopicPublisher implements TopicPublisher { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java index 4fb0953913..ef4453fcfb 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceContextInjector.java @@ -35,7 +35,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceContextInjector { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java index b179b6adfb..c08fa58055 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/quartz/TraceJobListener.java @@ -37,7 +37,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceJobListener extends JobListenerSupport { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java index 3b85a663d9..cfe8a21d05 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceFilter.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @WebFilter(filterName = "TraceFilter", urlPatterns = "/*", dispatcherTypes = DispatcherType.REQUEST) diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java index 1ca84bdeb3..e6e166a508 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceServletRequestListener.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @WebListener("TraceServletRequestListener to read incoming TPICs into Builder backend") diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java index 33f0fad2f9..93414f0d1a 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/servlet/TraceSessionListener.java @@ -39,7 +39,7 @@ * It should at least work for the following containers: * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @WebListener("TraceSessionListener to create sessionIds on session creation and remove it instead from the Builder backend on session termination.") diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java index 72ce370abb..3aa0b86e59 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/amqp/TraceMessagePropertiesConverter.java @@ -39,7 +39,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TraceMessagePropertiesConverter extends DefaultMessagePropertiesConverter { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java index e28d083d1d..97f6e489cd 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/http/TraceClientHttpRequestInterceptor.java @@ -41,7 +41,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TraceClientHttpRequestInterceptor implements ClientHttpRequestInterceptor { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java index 95ab5a1548..6317c1b165 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceInterceptor.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Component diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java index 3a311320f6..9915d5c510 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/binding/spring/web/TraceResponseBodyAdvice.java @@ -42,7 +42,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @ControllerAdvice diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java index e6fb7c4a85..72dc62fe63 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertiesBasedTraceFilter.java @@ -41,7 +41,7 @@ * The default property chain may be obtained by the {@link #loadPropertyChain()} method. * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class PropertiesBasedTraceFilter implements TraceFilterConfig { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java index 20bcefd115..c6efee250d 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/PropertyChain.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PropertyChain { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java index ddf305f749..dec390b4d1 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TraceFilterConfig.java @@ -29,7 +29,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public interface TraceFilterConfig { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java index 6dfa56df84..397f77295d 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/config/TracePropertiesFileLoader.java @@ -33,7 +33,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class TracePropertiesFileLoader { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java index 43279152be..9f77897a76 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ClazzEntity.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java index 4025262352..a3610cb3a8 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ExecCmd.java @@ -43,7 +43,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ExecCmd { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java index 4b5cd7aed0..9d0ac10532 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/GcEntity.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java index 22ffff8c67..c52a0499d7 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/StackEntity.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java index 2a5433955f..37b31e04e7 100644 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/monitor/ThreadEntity.java @@ -31,7 +31,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java index 9c5c772bc9..b338e2932e 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalBackend.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ class ThreadLocalBackend extends AbstractBackend { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java index 2b73ea2fd9..b42b288bf2 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalMap.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ class ThreadLocalMap extends InheritableThreadLocal> { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java index 2280f2b6f3..528bf064a1 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/thread/ThreadLocalTraceBackendProvider.java @@ -30,7 +30,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ThreadLocalTraceBackendProvider implements TraceBackendProvider { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java index 70e21dd571..c0ec29d4b0 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/HttpHeaderTransport.java @@ -36,7 +36,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class HttpHeaderTransport { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java index a044668a2b..87cda2d614 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/SoapHeaderTransport.java @@ -40,7 +40,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class SoapHeaderTransport { diff --git a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java index 13d20c1d01..1a89e54233 100755 --- a/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java +++ b/bus-tracer/src/main/java/org/aoju/bus/tracer/transport/jaxb/TpicMap.java @@ -32,7 +32,7 @@ /** * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @XmlRootElement(name = Builder.TPIC_HEADER) diff --git a/bus-validate/pom.xml b/bus-validate/pom.xml index 140cacc8ea..af0401b7ee 100755 --- a/bus-validate/pom.xml +++ b/bus-validate/pom.xml @@ -6,7 +6,7 @@ org.aoju bus-validate - 6.1.5 + 6.1.6 jar ${project.artifactId} diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java b/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java index afb3fdbfe0..41ba303574 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Builder.java @@ -34,7 +34,7 @@ * 当前框架内预定义的校验器名称 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Builder extends Validator { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java b/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java index c4b3a42114..1508f387ff 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Collector.java @@ -35,7 +35,7 @@ * 校验结果收集器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Context.java b/bus-validate/src/main/java/org/aoju/bus/validate/Context.java index 436850f746..cee9ccdd05 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Context.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Context.java @@ -39,7 +39,7 @@ * 当前校验的上下文信息 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java b/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java index 74d615505f..4252c43a70 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Provider.java @@ -44,7 +44,7 @@ * 服务提供者 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Provider { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java b/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java index efae57fa31..b9468a36cb 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Registry.java @@ -36,7 +36,7 @@ * 校验器注册中心 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Registry { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java b/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java index a3996942ff..a33f7669ab 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/Validated.java @@ -49,7 +49,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java index edad8e34c9..f0bda016a5 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Array.java @@ -36,7 +36,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java index ef494f2147..9c06d01736 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Blank.java @@ -34,7 +34,7 @@ * 字符串为空或为null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java index 4b9b12af3c..45f28b3549 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Chinese.java @@ -34,7 +34,7 @@ * 判断是否为中文 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java index b61338a5b7..48e8237d65 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/CitizenId.java @@ -34,7 +34,7 @@ * 判断是否为身份证号码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java index e837e721fb..072622779a 100644 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Compare.java @@ -33,7 +33,7 @@ * 参数值比较验证注解 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Target({ElementType.FIELD, ElementType.PARAMETER}) diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java index 8dfb79a22f..7bde676ada 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Complex.java @@ -38,7 +38,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java index ecd9807148..1fefde1a2c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Date.java @@ -35,7 +35,7 @@ * 判断是否为日期 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java index 31484d451d..b73cd3ff4a 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Each.java @@ -42,7 +42,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java index 37e063ded4..2ec0bdcf72 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Email.java @@ -34,7 +34,7 @@ * 判断是否为邮箱 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java index de3fb6b4f3..170d7dd79d 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/English.java @@ -34,7 +34,7 @@ * 判断是否为英文 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java index 7b065224f2..cc5504e36c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Equals.java @@ -37,7 +37,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java index 7f76a809fc..67d1cb68f1 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/False.java @@ -34,7 +34,7 @@ * boolean校验, 当校验值为false时通过校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java index f58873f5f7..add17d3603 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Filler.java @@ -35,7 +35,7 @@ * 在校验注解内部提供的方法上标记该注解,表示可以在校验注解的errmsg中使用该字符串插值 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java index a014688485..3fb9936e38 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Group.java @@ -31,7 +31,7 @@ * 校验组注解,标记当前位置被激活的校验组 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java index 0c43e562b6..2ac476aef2 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IPAddress.java @@ -34,7 +34,7 @@ * 判断是否为IP地址 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java index 3ec4ae4330..7b9dc325ea 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/In.java @@ -39,7 +39,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java index d3f605dbff..80980f3d35 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/InEnum.java @@ -38,7 +38,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java index 645a22cd01..172d6d4911 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Inside.java @@ -34,7 +34,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java index e71309a292..199475169a 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/IntRange.java @@ -38,7 +38,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java index 23da6ddece..94e3849057 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Length.java @@ -38,7 +38,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java index 02bb695c73..babb6b78cd 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Mobile.java @@ -34,7 +34,7 @@ * 判断是否为手机号码 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java index 8196933799..2c6e069ca8 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Multi.java @@ -35,7 +35,7 @@ * 多重校验器, 可以配置多个校验器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java index 198a376e0c..1b5da1b3c4 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotBlank.java @@ -34,7 +34,7 @@ * 字符串不为空,不为null校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java index 54f9a7c7d8..f6ee32b4eb 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotIn.java @@ -38,7 +38,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java index 6f4c74a9c1..46351d1d10 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/NotNull.java @@ -34,7 +34,7 @@ * 对象不能为null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java index 56ebc5bb3e..a7932e9988 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Null.java @@ -34,7 +34,7 @@ * 校验对象只能为null * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java index 57b343edef..d2fbe2c402 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Phone.java @@ -34,7 +34,7 @@ * 判断是否为固定电话 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java index 8fbfccf068..9b846f8e1c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Reflect.java @@ -38,7 +38,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java index 961962156e..9441fd5bf4 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Regex.java @@ -38,7 +38,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java index 8753582685..ca0429669a 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/True.java @@ -34,7 +34,7 @@ * boolean校验, 当校验值为true时通过校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java index 2eddc3b75b..8a67c6182c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/Valid.java @@ -31,7 +31,7 @@ * 标记注解,标明要被拦截的类或方法或者参数 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java index c62c0540ef..3a1fd9126c 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/annotation/ValidEx.java @@ -43,7 +43,7 @@ *

* * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Documented diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java index 31fa1553d6..ab1d9e0378 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/AlwaysStrategy.java @@ -32,7 +32,7 @@ * 这个校验器的结果永远为true * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public final class AlwaysStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java index 4a467b7bb1..d77ca1c9bd 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/BlankStrategy.java @@ -35,7 +35,7 @@ * BLANK 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class BlankStrategy implements Validator, Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java index 0bc936a042..cba54d1c2d 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ChineseStrategy.java @@ -35,7 +35,7 @@ * 中文校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ChineseStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java index 07b695296e..634e8a6781 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CitizenIdStrategy.java @@ -35,7 +35,7 @@ * 身份证号码校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CitizenIdStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java index c482ab7293..906c65a691 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/CompareStrategy.java @@ -39,7 +39,7 @@ * 数据长度校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class CompareStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java index dd8c23fc69..e00ef45b11 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/DateStrategy.java @@ -37,7 +37,7 @@ * 日期校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class DateStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java index 4883f11795..0d11840fc2 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EachStrategy.java @@ -42,7 +42,7 @@ * 容器元素内部校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EachStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java index 98adab9f03..5a8898f35d 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EmailStrategy.java @@ -35,7 +35,7 @@ * 邮箱校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EmailStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java index 879949a751..b5648ee56f 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EnglishStrategy.java @@ -35,7 +35,7 @@ * 英文校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EnglishStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java index 1393c0a0a8..ef0ac78f15 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/EqualsStrategy.java @@ -36,7 +36,7 @@ * EQUALS 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class EqualsStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java index 7472e66883..c158b79022 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/FalseStrategy.java @@ -34,7 +34,7 @@ * FALSE 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class FalseStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java index a2b4097413..6bf91282eb 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IPAddressStrategy.java @@ -35,7 +35,7 @@ * IP地址校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IPAddressStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java index 7d4c65a055..172e161522 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InEnumStrategy.java @@ -39,7 +39,7 @@ * int enum 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InEnumStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java index 3c49b7775e..78c34164e4 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/InStrategy.java @@ -35,7 +35,7 @@ * IN 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class InStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java index f5670a11a9..8565fdf56f 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/IntRangeStrategy.java @@ -40,7 +40,7 @@ * INT RANGE 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class IntRangeStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java index 975bfc8168..a6841f5a15 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/LengthStrategy.java @@ -37,7 +37,7 @@ * 数据长度校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class LengthStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java index 0254f9ee14..5c931263cb 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MobileStrategy.java @@ -35,7 +35,7 @@ * 移动电话校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MobileStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java index 87adcc5fec..30075f2f1d 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/MultiStrategy.java @@ -38,7 +38,7 @@ * 多规则匹配校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class MultiStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java index da1cee24fc..5b61254bb2 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotBlankStrategy.java @@ -35,7 +35,7 @@ * NOT blank 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotBlankStrategy implements Validator, Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java index 0cecc13b9f..02226ded38 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotInStrategy.java @@ -35,7 +35,7 @@ * NOT IN 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotInStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java index 32c3a66cc9..4be5dca41b 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NotNullStrategy.java @@ -34,7 +34,7 @@ * NOT NUll 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NotNullStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java index 999acf6cc0..62260a6447 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/NullStrategy.java @@ -35,7 +35,7 @@ * NULL校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class NullStrategy implements Validator, Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java index 7157c6f382..9f5e52eed6 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/PhoneStrategy.java @@ -35,7 +35,7 @@ * 移动电话校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class PhoneStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java index b8a37b7ae4..010b6171c8 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/ReflectStrategy.java @@ -41,7 +41,7 @@ * 反射信息校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class ReflectStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java index 1390658089..1f3a3358d9 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/RegexStrategy.java @@ -36,7 +36,7 @@ * 正则匹配校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class RegexStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java index 1afd69bbcf..762134e64f 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/strategy/TrueStrategy.java @@ -34,7 +34,7 @@ * Boolean true 校验 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class TrueStrategy implements Matcher { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java index d1aa22cf4f..e4202ea370 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Checker.java @@ -46,7 +46,7 @@ * 校验检查器 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ public class Checker { diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java index 32715ab9f6..bb5aa51c39 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Matcher.java @@ -31,7 +31,7 @@ * 校验器接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java index e4b1d514a5..7805a177f2 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Property.java @@ -41,7 +41,7 @@ * 校验注解所包含的通用属性 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @Data diff --git a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java index da195ea7f2..472970d0ca 100755 --- a/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java +++ b/bus-validate/src/main/java/org/aoju/bus/validate/validators/Validator.java @@ -31,7 +31,7 @@ * 校验器接口 * * @author Kimi Liu - * @version 6.1.5 + * @version 6.1.6 * @since JDK 1.8+ */ @FunctionalInterface