diff --git a/youchain-common/src/main/java/com/youchain/config/RsaProperties.java b/youchain-common/src/main/java/com/youchain/config/RsaProperties.java index 98d83f7..bf4a0e2 100644 --- a/youchain-common/src/main/java/com/youchain/config/RsaProperties.java +++ b/youchain-common/src/main/java/com/youchain/config/RsaProperties.java @@ -28,11 +28,19 @@ import org.springframework.stereotype.Component; @Data @Component public class RsaProperties { - public static String privateKey; + public static String licenseKey; + @Value("${rsa.private_key}") public void setPrivateKey(String privateKey) { RsaProperties.privateKey = privateKey; } + + @Value("${rsa.licenseKey}") + public void setLicenseKey(String privateKey) { + RsaProperties.licenseKey = privateKey; + } + + } \ No newline at end of file diff --git a/youchain-common/target/classes/com/youchain/annotation/AnonymousAccess.class b/youchain-common/target/classes/com/youchain/annotation/AnonymousAccess.class index 4f753da..d166344 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/AnonymousAccess.class and b/youchain-common/target/classes/com/youchain/annotation/AnonymousAccess.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/DataPermission.class b/youchain-common/target/classes/com/youchain/annotation/DataPermission.class index 2406e66..66e38a6 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/DataPermission.class and b/youchain-common/target/classes/com/youchain/annotation/DataPermission.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/Limit.class b/youchain-common/target/classes/com/youchain/annotation/Limit.class index 6b45bab..9ec6476 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/Limit.class and b/youchain-common/target/classes/com/youchain/annotation/Limit.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/Query$Join.class b/youchain-common/target/classes/com/youchain/annotation/Query$Join.class index cd8099e..bb720dc 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/Query$Join.class and b/youchain-common/target/classes/com/youchain/annotation/Query$Join.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/Query$Type.class b/youchain-common/target/classes/com/youchain/annotation/Query$Type.class index d6432bc..02a80ae 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/Query$Type.class and b/youchain-common/target/classes/com/youchain/annotation/Query$Type.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/Query.class b/youchain-common/target/classes/com/youchain/annotation/Query.class index df9127b..41675c0 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/Query.class and b/youchain-common/target/classes/com/youchain/annotation/Query.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousDeleteMapping.class b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousDeleteMapping.class index b8f85fd..2aad21b 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousDeleteMapping.class and b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousDeleteMapping.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousGetMapping.class b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousGetMapping.class index 42bfd1a..8209404 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousGetMapping.class and b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousGetMapping.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPatchMapping.class b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPatchMapping.class index 0c97cce..98c0145 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPatchMapping.class and b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPatchMapping.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPostMapping.class b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPostMapping.class index 26a830e..4debb39 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPostMapping.class and b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPostMapping.class differ diff --git a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPutMapping.class b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPutMapping.class index c64eebf..e201ab3 100644 Binary files a/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPutMapping.class and b/youchain-common/target/classes/com/youchain/annotation/rest/AnonymousPutMapping.class differ diff --git a/youchain-common/target/classes/com/youchain/aspect/LimitAspect.class b/youchain-common/target/classes/com/youchain/aspect/LimitAspect.class index e81080b..438eb70 100644 Binary files a/youchain-common/target/classes/com/youchain/aspect/LimitAspect.class and b/youchain-common/target/classes/com/youchain/aspect/LimitAspect.class differ diff --git a/youchain-common/target/classes/com/youchain/aspect/LimitType.class b/youchain-common/target/classes/com/youchain/aspect/LimitType.class index 28d424e..2ce6c8e 100644 Binary files a/youchain-common/target/classes/com/youchain/aspect/LimitType.class and b/youchain-common/target/classes/com/youchain/aspect/LimitType.class differ diff --git a/youchain-common/target/classes/com/youchain/base/BaseDTO.class b/youchain-common/target/classes/com/youchain/base/BaseDTO.class index 88bbcac..21f89b0 100644 Binary files a/youchain-common/target/classes/com/youchain/base/BaseDTO.class and b/youchain-common/target/classes/com/youchain/base/BaseDTO.class differ diff --git a/youchain-common/target/classes/com/youchain/base/BaseEntity$Create.class b/youchain-common/target/classes/com/youchain/base/BaseEntity$Create.class index 64847df..328e569 100644 Binary files a/youchain-common/target/classes/com/youchain/base/BaseEntity$Create.class and b/youchain-common/target/classes/com/youchain/base/BaseEntity$Create.class differ diff --git a/youchain-common/target/classes/com/youchain/base/BaseEntity$Update.class b/youchain-common/target/classes/com/youchain/base/BaseEntity$Update.class index 1ef179c..5778d0a 100644 Binary files a/youchain-common/target/classes/com/youchain/base/BaseEntity$Update.class and b/youchain-common/target/classes/com/youchain/base/BaseEntity$Update.class differ diff --git a/youchain-common/target/classes/com/youchain/base/BaseEntity.class b/youchain-common/target/classes/com/youchain/base/BaseEntity.class index aae81df..f7bfba9 100644 Binary files a/youchain-common/target/classes/com/youchain/base/BaseEntity.class and b/youchain-common/target/classes/com/youchain/base/BaseEntity.class differ diff --git a/youchain-common/target/classes/com/youchain/base/BaseMapper.class b/youchain-common/target/classes/com/youchain/base/BaseMapper.class index 65c737c..6177608 100644 Binary files a/youchain-common/target/classes/com/youchain/base/BaseMapper.class and b/youchain-common/target/classes/com/youchain/base/BaseMapper.class differ diff --git a/youchain-common/target/classes/com/youchain/config/AuditorConfig.class b/youchain-common/target/classes/com/youchain/config/AuditorConfig.class index 4e5e4db..6070058 100644 Binary files a/youchain-common/target/classes/com/youchain/config/AuditorConfig.class and b/youchain-common/target/classes/com/youchain/config/AuditorConfig.class differ diff --git a/youchain-common/target/classes/com/youchain/config/ElAdminProperties.class b/youchain-common/target/classes/com/youchain/config/ElAdminProperties.class index c07b032..2e7744b 100644 Binary files a/youchain-common/target/classes/com/youchain/config/ElAdminProperties.class and b/youchain-common/target/classes/com/youchain/config/ElAdminProperties.class differ diff --git a/youchain-common/target/classes/com/youchain/config/ElPermissionConfig.class b/youchain-common/target/classes/com/youchain/config/ElPermissionConfig.class index ad837e1..0d62b7e 100644 Binary files a/youchain-common/target/classes/com/youchain/config/ElPermissionConfig.class and b/youchain-common/target/classes/com/youchain/config/ElPermissionConfig.class differ diff --git a/youchain-common/target/classes/com/youchain/config/FastJsonRedisSerializer.class b/youchain-common/target/classes/com/youchain/config/FastJsonRedisSerializer.class index 5293f90..157b476 100644 Binary files a/youchain-common/target/classes/com/youchain/config/FastJsonRedisSerializer.class and b/youchain-common/target/classes/com/youchain/config/FastJsonRedisSerializer.class differ diff --git a/youchain-common/target/classes/com/youchain/config/FileProperties$ElPath.class b/youchain-common/target/classes/com/youchain/config/FileProperties$ElPath.class index 55e4cd0..2ab7f98 100644 Binary files a/youchain-common/target/classes/com/youchain/config/FileProperties$ElPath.class and b/youchain-common/target/classes/com/youchain/config/FileProperties$ElPath.class differ diff --git a/youchain-common/target/classes/com/youchain/config/FileProperties.class b/youchain-common/target/classes/com/youchain/config/FileProperties.class index 80dfa7c..a36b2dd 100644 Binary files a/youchain-common/target/classes/com/youchain/config/FileProperties.class and b/youchain-common/target/classes/com/youchain/config/FileProperties.class differ diff --git a/youchain-common/target/classes/com/youchain/config/RedisConfig$1.class b/youchain-common/target/classes/com/youchain/config/RedisConfig$1.class index c36fbeb..24ae0aa 100644 Binary files a/youchain-common/target/classes/com/youchain/config/RedisConfig$1.class and b/youchain-common/target/classes/com/youchain/config/RedisConfig$1.class differ diff --git a/youchain-common/target/classes/com/youchain/config/RedisConfig.class b/youchain-common/target/classes/com/youchain/config/RedisConfig.class index c8ea8c6..f722fc4 100644 Binary files a/youchain-common/target/classes/com/youchain/config/RedisConfig.class and b/youchain-common/target/classes/com/youchain/config/RedisConfig.class differ diff --git a/youchain-common/target/classes/com/youchain/config/RsaProperties.class b/youchain-common/target/classes/com/youchain/config/RsaProperties.class index 105d4b4..ee0b9eb 100644 Binary files a/youchain-common/target/classes/com/youchain/config/RsaProperties.class and b/youchain-common/target/classes/com/youchain/config/RsaProperties.class differ diff --git a/youchain-common/target/classes/com/youchain/config/StringRedisSerializer.class b/youchain-common/target/classes/com/youchain/config/StringRedisSerializer.class index 03ee871..25fb2ad 100644 Binary files a/youchain-common/target/classes/com/youchain/config/StringRedisSerializer.class and b/youchain-common/target/classes/com/youchain/config/StringRedisSerializer.class differ diff --git a/youchain-common/target/classes/com/youchain/config/SwaggerConfig.class b/youchain-common/target/classes/com/youchain/config/SwaggerConfig.class index f194605..4938e4c 100644 Binary files a/youchain-common/target/classes/com/youchain/config/SwaggerConfig.class and b/youchain-common/target/classes/com/youchain/config/SwaggerConfig.class differ diff --git a/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$1.class b/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$1.class index cecfc4e..dde2ec7 100644 Binary files a/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$1.class and b/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$1.class differ diff --git a/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$Page.class b/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$Page.class index 08fd533..1dd234a 100644 Binary files a/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$Page.class and b/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig$Page.class differ diff --git a/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig.class b/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig.class index 3e04bfb..530c7b7 100644 Binary files a/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig.class and b/youchain-common/target/classes/com/youchain/config/SwaggerDataConfig.class differ diff --git a/youchain-common/target/classes/com/youchain/exception/BadConfigurationException.class b/youchain-common/target/classes/com/youchain/exception/BadConfigurationException.class index 726f0e4..49ee6a1 100644 Binary files a/youchain-common/target/classes/com/youchain/exception/BadConfigurationException.class and b/youchain-common/target/classes/com/youchain/exception/BadConfigurationException.class differ diff --git a/youchain-common/target/classes/com/youchain/exception/BadRequestException.class b/youchain-common/target/classes/com/youchain/exception/BadRequestException.class index 25f3518..8fd1743 100644 Binary files a/youchain-common/target/classes/com/youchain/exception/BadRequestException.class and b/youchain-common/target/classes/com/youchain/exception/BadRequestException.class differ diff --git a/youchain-common/target/classes/com/youchain/exception/EntityExistException.class b/youchain-common/target/classes/com/youchain/exception/EntityExistException.class index 99866ca..4704636 100644 Binary files a/youchain-common/target/classes/com/youchain/exception/EntityExistException.class and b/youchain-common/target/classes/com/youchain/exception/EntityExistException.class differ diff --git a/youchain-common/target/classes/com/youchain/exception/EntityNotFoundException.class b/youchain-common/target/classes/com/youchain/exception/EntityNotFoundException.class index 04de223..095e116 100644 Binary files a/youchain-common/target/classes/com/youchain/exception/EntityNotFoundException.class and b/youchain-common/target/classes/com/youchain/exception/EntityNotFoundException.class differ diff --git a/youchain-common/target/classes/com/youchain/exception/handler/ApiError.class b/youchain-common/target/classes/com/youchain/exception/handler/ApiError.class index 39047c6..6bbfa91 100644 Binary files a/youchain-common/target/classes/com/youchain/exception/handler/ApiError.class and b/youchain-common/target/classes/com/youchain/exception/handler/ApiError.class differ diff --git a/youchain-common/target/classes/com/youchain/exception/handler/ApiResult.class b/youchain-common/target/classes/com/youchain/exception/handler/ApiResult.class index 0627ac3..1b0fdcb 100644 Binary files a/youchain-common/target/classes/com/youchain/exception/handler/ApiResult.class and b/youchain-common/target/classes/com/youchain/exception/handler/ApiResult.class differ diff --git a/youchain-common/target/classes/com/youchain/exception/handler/GlobalExceptionHandler.class b/youchain-common/target/classes/com/youchain/exception/handler/GlobalExceptionHandler.class index 5660619..3865771 100644 Binary files a/youchain-common/target/classes/com/youchain/exception/handler/GlobalExceptionHandler.class and b/youchain-common/target/classes/com/youchain/exception/handler/GlobalExceptionHandler.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/CacheKey.class b/youchain-common/target/classes/com/youchain/utils/CacheKey.class index 76c93a9..d757e5d 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/CacheKey.class and b/youchain-common/target/classes/com/youchain/utils/CacheKey.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/CallBack.class b/youchain-common/target/classes/com/youchain/utils/CallBack.class index c9844f2..52c6beb 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/CallBack.class and b/youchain-common/target/classes/com/youchain/utils/CallBack.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/CloseUtil.class b/youchain-common/target/classes/com/youchain/utils/CloseUtil.class index 8bf61a9..0a8627a 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/CloseUtil.class and b/youchain-common/target/classes/com/youchain/utils/CloseUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/CodeForYmYtil.class b/youchain-common/target/classes/com/youchain/utils/CodeForYmYtil.class index 2c72888..fa86319 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/CodeForYmYtil.class and b/youchain-common/target/classes/com/youchain/utils/CodeForYmYtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/DateUtil.class b/youchain-common/target/classes/com/youchain/utils/DateUtil.class index 37aa9de..c37165e 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/DateUtil.class and b/youchain-common/target/classes/com/youchain/utils/DateUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/ElAdminConstant$Url.class b/youchain-common/target/classes/com/youchain/utils/ElAdminConstant$Url.class index c43c2e3..f98ef0f 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/ElAdminConstant$Url.class and b/youchain-common/target/classes/com/youchain/utils/ElAdminConstant$Url.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/ElAdminConstant.class b/youchain-common/target/classes/com/youchain/utils/ElAdminConstant.class index 72c121e..764e296 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/ElAdminConstant.class and b/youchain-common/target/classes/com/youchain/utils/ElAdminConstant.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/EncryptUtils.class b/youchain-common/target/classes/com/youchain/utils/EncryptUtils.class index bda897d..4d53aa6 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/EncryptUtils.class and b/youchain-common/target/classes/com/youchain/utils/EncryptUtils.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/FileUtil.class b/youchain-common/target/classes/com/youchain/utils/FileUtil.class index d2f413f..7809338 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/FileUtil.class and b/youchain-common/target/classes/com/youchain/utils/FileUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/HttpPostUtil.class b/youchain-common/target/classes/com/youchain/utils/HttpPostUtil.class index 168ccb2..723abc1 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/HttpPostUtil.class and b/youchain-common/target/classes/com/youchain/utils/HttpPostUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/MyExcelWriter.class b/youchain-common/target/classes/com/youchain/utils/MyExcelWriter.class index 4be7521..0f504dc 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/MyExcelWriter.class and b/youchain-common/target/classes/com/youchain/utils/MyExcelWriter.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/PageUtil.class b/youchain-common/target/classes/com/youchain/utils/PageUtil.class index f3759e9..5a31e19 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/PageUtil.class and b/youchain-common/target/classes/com/youchain/utils/PageUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/QueryHelp$1.class b/youchain-common/target/classes/com/youchain/utils/QueryHelp$1.class index 2d9871c..364f3fb 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/QueryHelp$1.class and b/youchain-common/target/classes/com/youchain/utils/QueryHelp$1.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/QueryHelp.class b/youchain-common/target/classes/com/youchain/utils/QueryHelp.class index 07c9f29..2a503c5 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/QueryHelp.class and b/youchain-common/target/classes/com/youchain/utils/QueryHelp.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/RedisUtils.class b/youchain-common/target/classes/com/youchain/utils/RedisUtils.class index 7cf34f6..b506185 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/RedisUtils.class and b/youchain-common/target/classes/com/youchain/utils/RedisUtils.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/RequestHolder.class b/youchain-common/target/classes/com/youchain/utils/RequestHolder.class index d09302e..08170f9 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/RequestHolder.class and b/youchain-common/target/classes/com/youchain/utils/RequestHolder.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/RsaUtils$RsaKeyPair.class b/youchain-common/target/classes/com/youchain/utils/RsaUtils$RsaKeyPair.class index 20a7f4a..3cebd65 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/RsaUtils$RsaKeyPair.class and b/youchain-common/target/classes/com/youchain/utils/RsaUtils$RsaKeyPair.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/RsaUtils.class b/youchain-common/target/classes/com/youchain/utils/RsaUtils.class index 4fd2222..ebd78d9 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/RsaUtils.class and b/youchain-common/target/classes/com/youchain/utils/RsaUtils.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/SecurityUtils.class b/youchain-common/target/classes/com/youchain/utils/SecurityUtils.class index 604545f..cbd2973 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/SecurityUtils.class and b/youchain-common/target/classes/com/youchain/utils/SecurityUtils.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/SpringContextHolder.class b/youchain-common/target/classes/com/youchain/utils/SpringContextHolder.class index 5e8b8f3..09bcbd9 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/SpringContextHolder.class and b/youchain-common/target/classes/com/youchain/utils/SpringContextHolder.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/StringUtils.class b/youchain-common/target/classes/com/youchain/utils/StringUtils.class index a771f6a..e7cab83 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/StringUtils.class and b/youchain-common/target/classes/com/youchain/utils/StringUtils.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/ThrowableUtil.class b/youchain-common/target/classes/com/youchain/utils/ThrowableUtil.class index 355aac7..ec4eee2 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/ThrowableUtil.class and b/youchain-common/target/classes/com/youchain/utils/ThrowableUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/TranslatorUtil.class b/youchain-common/target/classes/com/youchain/utils/TranslatorUtil.class index 95ce786..6ac3f26 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/TranslatorUtil.class and b/youchain-common/target/classes/com/youchain/utils/TranslatorUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/ValidationUtil.class b/youchain-common/target/classes/com/youchain/utils/ValidationUtil.class index f75c8d7..df9fafb 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/ValidationUtil.class and b/youchain-common/target/classes/com/youchain/utils/ValidationUtil.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/enums/CodeBiEnum.class b/youchain-common/target/classes/com/youchain/utils/enums/CodeBiEnum.class index 74a4d9c..29b2826 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/enums/CodeBiEnum.class and b/youchain-common/target/classes/com/youchain/utils/enums/CodeBiEnum.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/enums/CodeEnum.class b/youchain-common/target/classes/com/youchain/utils/enums/CodeEnum.class index 0dae94b..8383af0 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/enums/CodeEnum.class and b/youchain-common/target/classes/com/youchain/utils/enums/CodeEnum.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/enums/DataScopeEnum.class b/youchain-common/target/classes/com/youchain/utils/enums/DataScopeEnum.class index b1f7e0b..7b86c32 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/enums/DataScopeEnum.class and b/youchain-common/target/classes/com/youchain/utils/enums/DataScopeEnum.class differ diff --git a/youchain-common/target/classes/com/youchain/utils/enums/RequestMethodEnum.class b/youchain-common/target/classes/com/youchain/utils/enums/RequestMethodEnum.class index f39ab53..822c689 100644 Binary files a/youchain-common/target/classes/com/youchain/utils/enums/RequestMethodEnum.class and b/youchain-common/target/classes/com/youchain/utils/enums/RequestMethodEnum.class differ diff --git a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$1.class b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$1.class index cade9ac..c017670 100644 Binary files a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$1.class and b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$1.class differ diff --git a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$DocHelperErrorHandler.class b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$DocHelperErrorHandler.class index 9ddf843..388b21c 100644 Binary files a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$DocHelperErrorHandler.class and b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$DocHelperErrorHandler.class differ diff --git a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityFeature.class b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityFeature.class index 0ebc3ad..c86b9b3 100644 Binary files a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityFeature.class and b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityFeature.class differ diff --git a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityProperty.class b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityProperty.class index 351f8e3..09eb2ce 100644 Binary files a/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityProperty.class and b/youchain-common/target/classes/org/apache/poi/util/XMLHelper$SecurityProperty.class differ diff --git a/youchain-common/target/classes/org/apache/poi/util/XMLHelper.class b/youchain-common/target/classes/org/apache/poi/util/XMLHelper.class index 39edeca..733a7a3 100644 Binary files a/youchain-common/target/classes/org/apache/poi/util/XMLHelper.class and b/youchain-common/target/classes/org/apache/poi/util/XMLHelper.class differ diff --git a/youchain-common/target/classes/org/apache/poi/xssf/streaming/SXSSFCreationHelper.class b/youchain-common/target/classes/org/apache/poi/xssf/streaming/SXSSFCreationHelper.class index 4e47658..fef79f0 100644 Binary files a/youchain-common/target/classes/org/apache/poi/xssf/streaming/SXSSFCreationHelper.class and b/youchain-common/target/classes/org/apache/poi/xssf/streaming/SXSSFCreationHelper.class differ diff --git a/youchain-generator/target/classes/com/youchain/domain/ColumnInfo.class b/youchain-generator/target/classes/com/youchain/domain/ColumnInfo.class index 0c693ff..5819fcf 100644 Binary files a/youchain-generator/target/classes/com/youchain/domain/ColumnInfo.class and b/youchain-generator/target/classes/com/youchain/domain/ColumnInfo.class differ diff --git a/youchain-generator/target/classes/com/youchain/domain/GenConfig.class b/youchain-generator/target/classes/com/youchain/domain/GenConfig.class index e90a147..66b1377 100644 Binary files a/youchain-generator/target/classes/com/youchain/domain/GenConfig.class and b/youchain-generator/target/classes/com/youchain/domain/GenConfig.class differ diff --git a/youchain-generator/target/classes/com/youchain/domain/vo/TableInfo.class b/youchain-generator/target/classes/com/youchain/domain/vo/TableInfo.class index 3bcd991..13dbc16 100644 Binary files a/youchain-generator/target/classes/com/youchain/domain/vo/TableInfo.class and b/youchain-generator/target/classes/com/youchain/domain/vo/TableInfo.class differ diff --git a/youchain-generator/target/classes/com/youchain/repository/ColumnInfoRepository.class b/youchain-generator/target/classes/com/youchain/repository/ColumnInfoRepository.class index 81131b0..ce2af46 100644 Binary files a/youchain-generator/target/classes/com/youchain/repository/ColumnInfoRepository.class and b/youchain-generator/target/classes/com/youchain/repository/ColumnInfoRepository.class differ diff --git a/youchain-generator/target/classes/com/youchain/repository/GenConfigRepository.class b/youchain-generator/target/classes/com/youchain/repository/GenConfigRepository.class index 8c21854..de144d1 100644 Binary files a/youchain-generator/target/classes/com/youchain/repository/GenConfigRepository.class and b/youchain-generator/target/classes/com/youchain/repository/GenConfigRepository.class differ diff --git a/youchain-generator/target/classes/com/youchain/rest/GenConfigController.class b/youchain-generator/target/classes/com/youchain/rest/GenConfigController.class index 912c8cf..e87b4fa 100644 Binary files a/youchain-generator/target/classes/com/youchain/rest/GenConfigController.class and b/youchain-generator/target/classes/com/youchain/rest/GenConfigController.class differ diff --git a/youchain-generator/target/classes/com/youchain/rest/GeneratorController.class b/youchain-generator/target/classes/com/youchain/rest/GeneratorController.class index fe413b2..3160ec8 100644 Binary files a/youchain-generator/target/classes/com/youchain/rest/GeneratorController.class and b/youchain-generator/target/classes/com/youchain/rest/GeneratorController.class differ diff --git a/youchain-generator/target/classes/com/youchain/service/GenConfigService.class b/youchain-generator/target/classes/com/youchain/service/GenConfigService.class index bb4936d..9bf6c43 100644 Binary files a/youchain-generator/target/classes/com/youchain/service/GenConfigService.class and b/youchain-generator/target/classes/com/youchain/service/GenConfigService.class differ diff --git a/youchain-generator/target/classes/com/youchain/service/GeneratorService.class b/youchain-generator/target/classes/com/youchain/service/GeneratorService.class index 15b9878..d17893a 100644 Binary files a/youchain-generator/target/classes/com/youchain/service/GeneratorService.class and b/youchain-generator/target/classes/com/youchain/service/GeneratorService.class differ diff --git a/youchain-generator/target/classes/com/youchain/service/impl/GenConfigServiceImpl.class b/youchain-generator/target/classes/com/youchain/service/impl/GenConfigServiceImpl.class index 2de95f0..73ccd32 100644 Binary files a/youchain-generator/target/classes/com/youchain/service/impl/GenConfigServiceImpl.class and b/youchain-generator/target/classes/com/youchain/service/impl/GenConfigServiceImpl.class differ diff --git a/youchain-generator/target/classes/com/youchain/service/impl/GeneratorServiceImpl.class b/youchain-generator/target/classes/com/youchain/service/impl/GeneratorServiceImpl.class index d4427b1..8fca69e 100644 Binary files a/youchain-generator/target/classes/com/youchain/service/impl/GeneratorServiceImpl.class and b/youchain-generator/target/classes/com/youchain/service/impl/GeneratorServiceImpl.class differ diff --git a/youchain-generator/target/classes/com/youchain/utils/ColUtil.class b/youchain-generator/target/classes/com/youchain/utils/ColUtil.class index 27a33b9..38e676b 100644 Binary files a/youchain-generator/target/classes/com/youchain/utils/ColUtil.class and b/youchain-generator/target/classes/com/youchain/utils/ColUtil.class differ diff --git a/youchain-generator/target/classes/com/youchain/utils/GenUtil.class b/youchain-generator/target/classes/com/youchain/utils/GenUtil.class index a3565af..ac9e25e 100644 Binary files a/youchain-generator/target/classes/com/youchain/utils/GenUtil.class and b/youchain-generator/target/classes/com/youchain/utils/GenUtil.class differ diff --git a/youchain-system/src/main/java/com/youchain/AppRun.java b/youchain-system/src/main/java/com/youchain/AppRun.java index a519cea..e2e9610 100644 --- a/youchain-system/src/main/java/com/youchain/AppRun.java +++ b/youchain-system/src/main/java/com/youchain/AppRun.java @@ -15,9 +15,12 @@ */ package com.youchain; +import cn.hutool.json.JSONUtil; import com.youchain.annotation.rest.AnonymousGetMapping; +import com.youchain.modules.license.LicenseValidate; import com.youchain.utils.SpringContextHolder; import io.swagger.annotations.Api; +import lombok.extern.slf4j.Slf4j; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -46,7 +49,7 @@ import org.springframework.web.bind.annotation.RestController; @EnableTransactionManagement //@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class}) @EnableJpaAuditing(auditorAwareRef = "auditorAware") - +@Slf4j public class AppRun { public static void main(String[] args) { @@ -56,6 +59,7 @@ public class AppRun { springApplication.addListeners(new ApplicationPidFileWriter()); springApplication.run(args); + log.error(JSONUtil.toJsonStr(LicenseValidate.getDeviceInfo())); } diff --git a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java index d2f9dd3..f04b987 100644 --- a/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/basicdata/service/impl/PointServiceImpl.java @@ -25,7 +25,6 @@ import com.youchain.basicdata.service.dto.StockSmallDto; import com.youchain.businessdata.ReturnJson.RPTaskList; import com.youchain.businessdata.inputJson.IPTask; import com.youchain.utils.*; -import jdk.internal.dynalink.beans.StaticClass; import lombok.RequiredArgsConstructor; import com.youchain.basicdata.repository.PointRepository; import com.youchain.basicdata.service.PointService; diff --git a/youchain-system/src/main/java/com/youchain/modules/license/AGxServerInfos.java b/youchain-system/src/main/java/com/youchain/modules/license/AGxServerInfos.java new file mode 100644 index 0000000..0349b74 --- /dev/null +++ b/youchain-system/src/main/java/com/youchain/modules/license/AGxServerInfos.java @@ -0,0 +1,107 @@ +package com.youchain.modules.license; + +import com.youchain.modules.license.domain.LicenseCheck; +import lombok.extern.slf4j.Slf4j; + +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.SocketException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; + +@Slf4j +public abstract class AGxServerInfos { + + + /** + *
组装需要额外校验的License参数
+ */ + public LicenseCheck getServerInfos(){ + + LicenseCheck result = new LicenseCheck(); + try { + result.setIpAddress(this.getIpAddress()); + result.setMacAddress(this.getMacAddress()); + result.setCpuSerial(this.getCPUSerial()); + result.setMainBoardSerial(this.getMainBoardSerial()); + }catch (Exception e){ + log.error("获取服务器硬件信息失败",e); + } + + return result; + } + + /** + *获取IP地址
+ */ + protected abstract List获取Mac地址
+ */ + protected abstract List获取CPU序列号
+ */ + protected abstract String getCPUSerial() throws Exception; + + /** + *获取主板序列号
+ */ + protected abstract String getMainBoardSerial() throws Exception; + + /** + *获取当前服务器所有符合条件的InetAddress
+ */ + protected List获取某个网络地址对应的Mac地址
+ */ + protected String getMacByInetAddress(InetAddress inetAddr){ + + try { + byte[] mac = NetworkInterface.getByInetAddress(inetAddr).getHardwareAddress(); + StringBuffer sb = new StringBuffer(); + for(int i=0;i用于获取客户Windows服务器的基本信息
+ */ +public class WindowsServerInfos extends AGxServerInfos { + + @Override + protected List