From ac424005a873726a87c528cd7691dc1895706f7c Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Tue, 4 Jan 2022 16:47:31 +0800 Subject: [PATCH 1/4] deprecated --- .../kernel/core/constants/CoreConstants.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/constants/CoreConstants.java b/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/constants/CoreConstants.java index 808ba10..7820d36 100644 --- a/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/constants/CoreConstants.java +++ b/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/constants/CoreConstants.java @@ -17,8 +17,6 @@ package com.gitee.fubluesky.kernel.core.constants; -import com.gitee.fubluesky.kernel.core.enums.ErrorType; - /** * 常量 * @@ -28,24 +26,6 @@ */ public interface CoreConstants { - /** - * 用户端操作异常的错误码分类编号 建议使用 ErrorType {@link ErrorType} - */ - @Deprecated - String USER_OPERATION_ERROR_TYPE_CODE = "1"; - - /** - * 业务执行异常的错误码分类编号 建议使用 ErrorType {@link ErrorType} - */ - @Deprecated - String BUSINESS_ERROR_TYPE_CODE = "2"; - - /** - * 第三方调用异常的错误码分类编号 建议使用 ErrorType {@link ErrorType} - */ - @Deprecated - String THIRD_ERROR_TYPE_CODE = "3"; - /** * 一级宏观码标识，宏观码标识代表一类错误码的统称 */ From 5f10a58987cc42f44ff5b0497723467bfb028ba2 Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Tue, 4 Jan 2022 17:14:42 +0800 Subject: [PATCH 2/4] 1.6.3 preview --- kernel-all-spring-boot-starter/pom.xml | 8 +++- kernel-auth/auth-api/pom.xml | 2 +- kernel-auth/auth-sdk/pom.xml | 2 +- kernel-auth/auth-spring-boot-starter/pom.xml | 2 +- kernel-auth/pom.xml | 2 +- kernel-cache/cache-api/pom.xml | 2 +- .../cache-redis-spring-boot-starter/pom.xml | 2 +- kernel-cache/cache-sdk-redis/pom.xml | 2 +- kernel-cache/pom.xml | 2 +- kernel-core/pom.xml | 2 +- kernel-db/db-api/pom.xml | 2 +- kernel-db/db-sdk-mybatis-plus/pom.xml | 2 +- kernel-db/db-spring-boot-starter/pom.xml | 2 +- kernel-db/pom.xml | 2 +- kernel-dependencies/pom.xml | 44 +------------------ kernel-email/email-api/pom.xml | 2 +- kernel-email/email-sdk-java/pom.xml | 2 +- .../email-spring-boot-starter/pom.xml | 2 +- kernel-email/pom.xml | 2 +- kernel-excel/excel-api/pom.xml | 2 +- kernel-excel/excel-sdk-easy/pom.xml | 2 +- .../excel-spring-boot-starter/pom.xml | 2 +- kernel-excel/pom.xml | 2 +- .../file-ali-spring-boot-starter/pom.xml | 2 +- .../file-all-spring-boot-starter/pom.xml | 2 +- kernel-file/file-api/pom.xml | 2 +- kernel-file/file-expand-apk/pom.xml | 2 +- .../file-ftp-spring-boot-starter/pom.xml | 2 +- .../file-local-spring-boot-starter/pom.xml | 2 +- kernel-file/file-sdk-ali/pom.xml | 2 +- kernel-file/file-sdk-ftp/pom.xml | 2 +- kernel-file/file-sdk-local/pom.xml | 2 +- kernel-file/pom.xml | 2 +- kernel-jwt/jwt-api/pom.xml | 2 +- kernel-jwt/jwt-sdk/pom.xml | 2 +- kernel-jwt/jwt-spring-boot-starter/pom.xml | 2 +- kernel-jwt/pom.xml | 2 +- kernel-parent/pom.xml | 6 +-- kernel-push/pom.xml | 2 +- kernel-push/push-api/pom.xml | 2 +- kernel-push/push-sdk-jpush/pom.xml | 2 +- kernel-push/push-spring-boot-starter/pom.xml | 2 +- kernel-security/pom.xml | 2 +- kernel-security/security-api/pom.xml | 2 +- kernel-security/security-sdk-captcha/pom.xml | 2 +- kernel-security/security-sdk-cors/pom.xml | 2 +- kernel-security/security-sdk-jackson/pom.xml | 2 +- kernel-security/security-sdk-sign/pom.xml | 2 +- .../security-spring-boot-starter/pom.xml | 2 +- kernel-sms/pom.xml | 2 +- .../sms-ali-spring-boot-starter/pom.xml | 2 +- kernel-sms/sms-api/pom.xml | 2 +- kernel-sms/sms-sdk-ali/pom.xml | 2 +- kernel-validator/pom.xml | 2 +- kernel-validator/validator-api/pom.xml | 2 +- pom.xml | 4 +- 56 files changed, 64 insertions(+), 102 deletions(-) diff --git a/kernel-all-spring-boot-starter/pom.xml b/kernel-all-spring-boot-starter/pom.xml index 2d37b96..a8c9884 100644 --- a/kernel-all-spring-boot-starter/pom.xml +++ b/kernel-all-spring-boot-starter/pom.xml @@ -20,12 +20,12 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 kernel-all-spring-boot-starter - 1.6.2 + 1.6.3 spring-boot 依赖引用 2021-Now pom @@ -49,18 +49,22 @@ com.gitee.fubluesky.kernel security-spring-boot-starter + ${kernel.version} com.gitee.fubluesky.kernel auth-spring-boot-starter + ${kernel.version} com.gitee.fubluesky.kernel file-all-spring-boot-starter + ${kernel.version} com.gitee.fubluesky.kernel file-expand-apk + ${kernel.version} com.gitee.fubluesky.kernel diff --git a/kernel-auth/auth-api/pom.xml b/kernel-auth/auth-api/pom.xml index ae3cb06..96fb38e 100644 --- a/kernel-auth/auth-api/pom.xml +++ b/kernel-auth/auth-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-auth - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-auth/auth-sdk/pom.xml b/kernel-auth/auth-sdk/pom.xml index 7ea01f3..b228920 100644 --- a/kernel-auth/auth-sdk/pom.xml +++ b/kernel-auth/auth-sdk/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-auth - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-auth/auth-spring-boot-starter/pom.xml b/kernel-auth/auth-spring-boot-starter/pom.xml index 0344470..dabf7f8 100644 --- a/kernel-auth/auth-spring-boot-starter/pom.xml +++ b/kernel-auth/auth-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-auth - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-auth/pom.xml b/kernel-auth/pom.xml index c09a214..ea7e8f3 100644 --- a/kernel-auth/pom.xml +++ b/kernel-auth/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-cache/cache-api/pom.xml b/kernel-cache/cache-api/pom.xml index f2afd40..a9aa313 100644 --- a/kernel-cache/cache-api/pom.xml +++ b/kernel-cache/cache-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-cache - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-cache/cache-redis-spring-boot-starter/pom.xml b/kernel-cache/cache-redis-spring-boot-starter/pom.xml index 056e07d..863588a 100644 --- a/kernel-cache/cache-redis-spring-boot-starter/pom.xml +++ b/kernel-cache/cache-redis-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-cache - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-cache/cache-sdk-redis/pom.xml b/kernel-cache/cache-sdk-redis/pom.xml index 0dc7329..103fec2 100644 --- a/kernel-cache/cache-sdk-redis/pom.xml +++ b/kernel-cache/cache-sdk-redis/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-cache - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-cache/pom.xml b/kernel-cache/pom.xml index 960b105..2f59a81 100644 --- a/kernel-cache/pom.xml +++ b/kernel-cache/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-core/pom.xml b/kernel-core/pom.xml index 31ac22c..204403d 100644 --- a/kernel-core/pom.xml +++ b/kernel-core/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-db/db-api/pom.xml b/kernel-db/db-api/pom.xml index 6913c2a..99a688a 100644 --- a/kernel-db/db-api/pom.xml +++ b/kernel-db/db-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-db - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-db/db-sdk-mybatis-plus/pom.xml b/kernel-db/db-sdk-mybatis-plus/pom.xml index ea9080e..a2ffd8e 100644 --- a/kernel-db/db-sdk-mybatis-plus/pom.xml +++ b/kernel-db/db-sdk-mybatis-plus/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-db - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-db/db-spring-boot-starter/pom.xml b/kernel-db/db-spring-boot-starter/pom.xml index dca52e8..41f9dd8 100644 --- a/kernel-db/db-spring-boot-starter/pom.xml +++ b/kernel-db/db-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-db - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-db/pom.xml b/kernel-db/pom.xml index d852762..bbf31f3 100644 --- a/kernel-db/pom.xml +++ b/kernel-db/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-dependencies/pom.xml b/kernel-dependencies/pom.xml index bcc8839..1d27bc0 100644 --- a/kernel-dependencies/pom.xml +++ b/kernel-dependencies/pom.xml @@ -22,7 +22,7 @@ com.gitee.fubluesky.kernel kernel-dependencies kernel-dependencies - 1.6.2 + 1.6.3 依赖版本统一配置 2021-Now pom @@ -54,10 +54,6 @@ 3.4.7 - 1.6.2 - 1.6.2 - 1.6.2 - 3.1.0 3.0.0-M1 @@ -195,44 +191,6 @@ commons-compress ${commons-compress.version} - - - com.gitee.fubluesky.kernel - auth-api - ${kernel-auth.version} - - - com.gitee.fubluesky.kernel - auth-spring-boot-starter - ${kernel-auth.version} - - - - com.gitee.fubluesky.kernel - security-api - ${kernel-security.version} - - - com.gitee.fubluesky.kernel - security-spring-boot-starter - ${kernel-security.version} - - - - com.gitee.fubluesky.kernel - file-api - ${kernel-file.version} - - - com.gitee.fubluesky.kernel - file-all-spring-boot-starter - ${kernel-file.version} - - - com.gitee.fubluesky.kernel - file-expand-apk - ${kernel-file.version} - diff --git a/kernel-email/email-api/pom.xml b/kernel-email/email-api/pom.xml index 51288c0..3429636 100644 --- a/kernel-email/email-api/pom.xml +++ b/kernel-email/email-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-email - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-email/email-sdk-java/pom.xml b/kernel-email/email-sdk-java/pom.xml index fb3522b..14e0ed3 100644 --- a/kernel-email/email-sdk-java/pom.xml +++ b/kernel-email/email-sdk-java/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-email - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-email/email-spring-boot-starter/pom.xml b/kernel-email/email-spring-boot-starter/pom.xml index 6696362..f1ace9e 100644 --- a/kernel-email/email-spring-boot-starter/pom.xml +++ b/kernel-email/email-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-email - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-email/pom.xml b/kernel-email/pom.xml index 1ca4cf5..61d5305 100644 --- a/kernel-email/pom.xml +++ b/kernel-email/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-excel/excel-api/pom.xml b/kernel-excel/excel-api/pom.xml index 187bfe7..2a458d5 100644 --- a/kernel-excel/excel-api/pom.xml +++ b/kernel-excel/excel-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-excel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-excel/excel-sdk-easy/pom.xml b/kernel-excel/excel-sdk-easy/pom.xml index 4995316..abe41d5 100644 --- a/kernel-excel/excel-sdk-easy/pom.xml +++ b/kernel-excel/excel-sdk-easy/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-excel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-excel/excel-spring-boot-starter/pom.xml b/kernel-excel/excel-spring-boot-starter/pom.xml index 22ba691..7d00159 100644 --- a/kernel-excel/excel-spring-boot-starter/pom.xml +++ b/kernel-excel/excel-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-excel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-excel/pom.xml b/kernel-excel/pom.xml index dae1c30..52a9e98 100644 --- a/kernel-excel/pom.xml +++ b/kernel-excel/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-ali-spring-boot-starter/pom.xml b/kernel-file/file-ali-spring-boot-starter/pom.xml index 9a6eb15..49cfb32 100644 --- a/kernel-file/file-ali-spring-boot-starter/pom.xml +++ b/kernel-file/file-ali-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-all-spring-boot-starter/pom.xml b/kernel-file/file-all-spring-boot-starter/pom.xml index f2ae98e..0b3d0c9 100644 --- a/kernel-file/file-all-spring-boot-starter/pom.xml +++ b/kernel-file/file-all-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-api/pom.xml b/kernel-file/file-api/pom.xml index 516ab7e..a2ae19e 100644 --- a/kernel-file/file-api/pom.xml +++ b/kernel-file/file-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-expand-apk/pom.xml b/kernel-file/file-expand-apk/pom.xml index f23e2f6..ee81665 100644 --- a/kernel-file/file-expand-apk/pom.xml +++ b/kernel-file/file-expand-apk/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-ftp-spring-boot-starter/pom.xml b/kernel-file/file-ftp-spring-boot-starter/pom.xml index b487590..8cfd61e 100644 --- a/kernel-file/file-ftp-spring-boot-starter/pom.xml +++ b/kernel-file/file-ftp-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-local-spring-boot-starter/pom.xml b/kernel-file/file-local-spring-boot-starter/pom.xml index d611064..a340f8f 100644 --- a/kernel-file/file-local-spring-boot-starter/pom.xml +++ b/kernel-file/file-local-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-sdk-ali/pom.xml b/kernel-file/file-sdk-ali/pom.xml index 1f997b2..8c451df 100644 --- a/kernel-file/file-sdk-ali/pom.xml +++ b/kernel-file/file-sdk-ali/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-sdk-ftp/pom.xml b/kernel-file/file-sdk-ftp/pom.xml index aac7e9a..4aa34ae 100644 --- a/kernel-file/file-sdk-ftp/pom.xml +++ b/kernel-file/file-sdk-ftp/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/file-sdk-local/pom.xml b/kernel-file/file-sdk-local/pom.xml index cd3cfa3..c6a4d0c 100644 --- a/kernel-file/file-sdk-local/pom.xml +++ b/kernel-file/file-sdk-local/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-file - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-file/pom.xml b/kernel-file/pom.xml index 2093c0e..da51fc2 100644 --- a/kernel-file/pom.xml +++ b/kernel-file/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-jwt/jwt-api/pom.xml b/kernel-jwt/jwt-api/pom.xml index e0c84c3..1e622bb 100644 --- a/kernel-jwt/jwt-api/pom.xml +++ b/kernel-jwt/jwt-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-jwt - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-jwt/jwt-sdk/pom.xml b/kernel-jwt/jwt-sdk/pom.xml index b7e32a4..39abec6 100644 --- a/kernel-jwt/jwt-sdk/pom.xml +++ b/kernel-jwt/jwt-sdk/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-jwt - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-jwt/jwt-spring-boot-starter/pom.xml b/kernel-jwt/jwt-spring-boot-starter/pom.xml index 5d20178..b8ddcfd 100644 --- a/kernel-jwt/jwt-spring-boot-starter/pom.xml +++ b/kernel-jwt/jwt-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-jwt - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-jwt/pom.xml b/kernel-jwt/pom.xml index d65c3e3..7b6fc98 100644 --- a/kernel-jwt/pom.xml +++ b/kernel-jwt/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-parent/pom.xml b/kernel-parent/pom.xml index 74cb261..335b304 100644 --- a/kernel-parent/pom.xml +++ b/kernel-parent/pom.xml @@ -23,7 +23,7 @@ com.gitee.fubluesky kernel-parent pom - 1.6.2 + 1.6.3 2021-Now kernel-parent kernel-parent @@ -42,8 +42,8 @@ 2020.0.4 2021.1 - 1.6.2 - 1.6.2 + 1.6.3 + ${project.version} 3.1.0 diff --git a/kernel-push/pom.xml b/kernel-push/pom.xml index 6e27b3a..8627e58 100644 --- a/kernel-push/pom.xml +++ b/kernel-push/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-push/push-api/pom.xml b/kernel-push/push-api/pom.xml index a10dc87..f0aa662 100644 --- a/kernel-push/push-api/pom.xml +++ b/kernel-push/push-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-push - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-push/push-sdk-jpush/pom.xml b/kernel-push/push-sdk-jpush/pom.xml index 68f289a..7f7ad33 100644 --- a/kernel-push/push-sdk-jpush/pom.xml +++ b/kernel-push/push-sdk-jpush/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-push - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-push/push-spring-boot-starter/pom.xml b/kernel-push/push-spring-boot-starter/pom.xml index 4a7fb6c..27eb9ed 100644 --- a/kernel-push/push-spring-boot-starter/pom.xml +++ b/kernel-push/push-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-push - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-security/pom.xml b/kernel-security/pom.xml index 7661844..4599ea9 100644 --- a/kernel-security/pom.xml +++ b/kernel-security/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-security/security-api/pom.xml b/kernel-security/security-api/pom.xml index f90644f..af8d30a 100644 --- a/kernel-security/security-api/pom.xml +++ b/kernel-security/security-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-security - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-security/security-sdk-captcha/pom.xml b/kernel-security/security-sdk-captcha/pom.xml index 24891e5..69815a9 100644 --- a/kernel-security/security-sdk-captcha/pom.xml +++ b/kernel-security/security-sdk-captcha/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-security - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-security/security-sdk-cors/pom.xml b/kernel-security/security-sdk-cors/pom.xml index 2a4a443..6723846 100644 --- a/kernel-security/security-sdk-cors/pom.xml +++ b/kernel-security/security-sdk-cors/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-security - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-security/security-sdk-jackson/pom.xml b/kernel-security/security-sdk-jackson/pom.xml index 75bf9e6..3be51a2 100644 --- a/kernel-security/security-sdk-jackson/pom.xml +++ b/kernel-security/security-sdk-jackson/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-security - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-security/security-sdk-sign/pom.xml b/kernel-security/security-sdk-sign/pom.xml index f6f5144..5fbad2c 100644 --- a/kernel-security/security-sdk-sign/pom.xml +++ b/kernel-security/security-sdk-sign/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-security - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-security/security-spring-boot-starter/pom.xml b/kernel-security/security-spring-boot-starter/pom.xml index 6c21f54..371b619 100644 --- a/kernel-security/security-spring-boot-starter/pom.xml +++ b/kernel-security/security-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-security - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-sms/pom.xml b/kernel-sms/pom.xml index 7c71448..9608398 100644 --- a/kernel-sms/pom.xml +++ b/kernel-sms/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-sms/sms-ali-spring-boot-starter/pom.xml b/kernel-sms/sms-ali-spring-boot-starter/pom.xml index 7a2d78a..a2dbfcf 100644 --- a/kernel-sms/sms-ali-spring-boot-starter/pom.xml +++ b/kernel-sms/sms-ali-spring-boot-starter/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-sms - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-sms/sms-api/pom.xml b/kernel-sms/sms-api/pom.xml index 6a92741..7d1ae35 100644 --- a/kernel-sms/sms-api/pom.xml +++ b/kernel-sms/sms-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-sms - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-sms/sms-sdk-ali/pom.xml b/kernel-sms/sms-sdk-ali/pom.xml index a8150e3..c553277 100644 --- a/kernel-sms/sms-sdk-ali/pom.xml +++ b/kernel-sms/sms-sdk-ali/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-sms - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-validator/pom.xml b/kernel-validator/pom.xml index 4f56e7a..05fc3d9 100644 --- a/kernel-validator/pom.xml +++ b/kernel-validator/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.2 + 1.6.3 4.0.0 diff --git a/kernel-validator/validator-api/pom.xml b/kernel-validator/validator-api/pom.xml index 8cde9ea..0581ad7 100644 --- a/kernel-validator/validator-api/pom.xml +++ b/kernel-validator/validator-api/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel-validator - 1.6.2 + 1.6.3 4.0.0 diff --git a/pom.xml b/pom.xml index c7ae0e4..1c1ad95 100644 --- a/pom.xml +++ b/pom.xml @@ -23,14 +23,14 @@ com.gitee.fubluesky kernel-parent - 1.6.2 + 1.6.3 com.gitee.fubluesky.kernel kernel pom - 1.6.2 + 1.6.3 2021-Now kernel kernel From 5b5f65a261629dea4f71f6574a60c26494061a28 Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Tue, 4 Jan 2022 17:26:19 +0800 Subject: [PATCH 3/4] generateUUID -> generateUuid --- .../java/com/gitee/fubluesky/kernel/core/util/IdUtils.java | 3 +-- .../gitee/fubluesky/kernel/jwt/api/pojo/DefaultJwtPayload.java | 2 +- .../fubluesky/kernel/security/captcha/CaptchaService.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/util/IdUtils.java b/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/util/IdUtils.java index cf9cada..af02064 100644 --- a/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/util/IdUtils.java +++ b/kernel-core/src/main/java/com/gitee/fubluesky/kernel/core/util/IdUtils.java @@ -26,11 +26,10 @@ * @version 1.0 * @since 2021-07-23 17:13 */ -@SuppressWarnings("all") @UtilityClass public class IdUtils { - public String generateUUID() { + public String generateUuid() { return UUID.randomUUID().toString().replaceAll("-", ""); } diff --git a/kernel-jwt/jwt-api/src/main/java/com/gitee/fubluesky/kernel/jwt/api/pojo/DefaultJwtPayload.java b/kernel-jwt/jwt-api/src/main/java/com/gitee/fubluesky/kernel/jwt/api/pojo/DefaultJwtPayload.java index 51ee2e8..b9ef92b 100644 --- a/kernel-jwt/jwt-api/src/main/java/com/gitee/fubluesky/kernel/jwt/api/pojo/DefaultJwtPayload.java +++ b/kernel-jwt/jwt-api/src/main/java/com/gitee/fubluesky/kernel/jwt/api/pojo/DefaultJwtPayload.java @@ -74,7 +74,7 @@ public DefaultJwtPayload(Long userId, String account, String appId, boolean reme this.userId = userId; this.account = account; this.appId = appId; - this.uuid = IdUtils.generateUUID(); + this.uuid = IdUtils.generateUuid(); this.rememberMe = rememberMe; } diff --git a/kernel-security/security-sdk-captcha/src/main/java/com/gitee/fubluesky/kernel/security/captcha/CaptchaService.java b/kernel-security/security-sdk-captcha/src/main/java/com/gitee/fubluesky/kernel/security/captcha/CaptchaService.java index d087e55..49457b6 100644 --- a/kernel-security/security-sdk-captcha/src/main/java/com/gitee/fubluesky/kernel/security/captcha/CaptchaService.java +++ b/kernel-security/security-sdk-captcha/src/main/java/com/gitee/fubluesky/kernel/security/captcha/CaptchaService.java @@ -45,7 +45,7 @@ public CaptchaService(CacheOperatorApi cacheOperatorApi) { public Captcha captcha() { SpecCaptcha specCaptcha = new SpecCaptcha(130, 48, 5); String code = specCaptcha.text().toLowerCase(); - String key = IdUtils.generateUUID(); + String key = IdUtils.generateUuid(); cacheOperatorApi.add(key, code); return new Captcha().setImage(specCaptcha.toBase64()).setKey(key); } From 9bbb4863479bdd780f5340fb556de31d07743644 Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Thu, 13 Jan 2022 10:15:43 +0800 Subject: [PATCH 4/4] auth appId expireMap empty edit --- .../auth/api/constants/AuthConstants.java | 5 +++++ .../fubluesky/kernel/auth/LoginImpl.java | 8 ++++++++ .../kernel/jwt/JwtTokenOperator.java | 19 +++++++++++++------ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/constants/AuthConstants.java b/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/constants/AuthConstants.java index ecd83fd..d330025 100644 --- a/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/constants/AuthConstants.java +++ b/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/constants/AuthConstants.java @@ -33,6 +33,11 @@ public interface AuthConstants { */ String EXCEPTION_STEP_CODE = "11"; + /** + * token header 默认参数名 + */ + String DEFAULT_TOKEN_HEADER_NAME = "Authorization"; + /** * 缓存前缀 */ diff --git a/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/LoginImpl.java b/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/LoginImpl.java index d6403de..ec88e3e 100644 --- a/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/LoginImpl.java +++ b/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/LoginImpl.java @@ -19,6 +19,7 @@ import com.gitee.fubluesky.kernel.auth.api.LoginApi; import com.gitee.fubluesky.kernel.auth.api.UserServiceApi; +import com.gitee.fubluesky.kernel.auth.api.constants.AuthConstants; import com.gitee.fubluesky.kernel.auth.api.exception.AuthException; import com.gitee.fubluesky.kernel.auth.api.exception.enums.AuthExceptionEnum; import com.gitee.fubluesky.kernel.auth.api.pojo.AuthProperties; @@ -85,6 +86,13 @@ public String getToken() { } } } + + token = request.getHeader(AuthConstants.DEFAULT_TOKEN_HEADER_NAME); + if (StringUtils.isNotBlank(token)) { + token = token.replace(authProperties.getTokenPrefix(), ""); + return token; + } + return null; } diff --git a/kernel-jwt/jwt-sdk/src/main/java/com/gitee/fubluesky/kernel/jwt/JwtTokenOperator.java b/kernel-jwt/jwt-sdk/src/main/java/com/gitee/fubluesky/kernel/jwt/JwtTokenOperator.java index dce9a04..e4457ad 100644 --- a/kernel-jwt/jwt-sdk/src/main/java/com/gitee/fubluesky/kernel/jwt/JwtTokenOperator.java +++ b/kernel-jwt/jwt-sdk/src/main/java/com/gitee/fubluesky/kernel/jwt/JwtTokenOperator.java @@ -68,15 +68,22 @@ private Date getExpiration(String appId) { } } else { + // 获取 过期时间配置 + Map map = jwtProperties.getExpireMap(); + if (StringUtils.isBlank(appId)) { - log.error("generateToken fail. The appId is blank!"); - throw new JwtException(JwtExceptionEnum.JWT_CREATE_ERROR); + log.warn("multi expire is enabled, but the appId is empty!"); + + if (map == null || map.isEmpty()) { + log.warn("multi expire is enabled, but the expire map is empty!"); + return new Date(System.currentTimeMillis() + jwtProperties.getExpire() * 1000); + } + appId = map.keySet().iterator().next(); } - // 获取 - Map map = jwtProperties.getExpireMap(); + if (map == null || map.isEmpty()) { - log.error("generateToken fail. The expireMap is empty!"); - throw new JwtException(JwtExceptionEnum.JWT_CREATE_ERROR); + log.warn("multi expire is enabled, but the expire map is empty!"); + return new Date(System.currentTimeMillis() + jwtProperties.getExpire() * 1000); } Long expire = map.get(appId); if (expire == null) {