From 0a6eaf136efdbf15d8728ccc3eb24086d65bf3fe Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Fri, 25 Mar 2022 16:09:41 +0800 Subject: [PATCH 1/5] 1.6.8 --- kernel-all-spring-boot-starter/pom.xml | 11 +- kernel-auth/auth-api/pom.xml | 2 +- kernel-auth/auth-sdk/pom.xml | 8 +- kernel-auth/auth-spring-boot-starter/pom.xml | 6 +- kernel-auth/pom.xml | 4 +- 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 | 3 +- 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 | 3 +- 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 | 4 +- 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 | 3 +- .../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 | 4 +- 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 | 3 +- kernel-parent/pom.xml | 175 +++++++++++++++++- kernel-push/pom.xml | 3 +- 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 | 3 +- 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 | 4 +- kernel-security/security-sdk-sign/pom.xml | 2 +- .../security-spring-boot-starter/pom.xml | 2 +- kernel-sms/pom.xml | 4 +- .../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 | 3 +- kernel-validator/validator-api/pom.xml | 2 +- pom.xml | 4 +- 55 files changed, 236 insertions(+), 85 deletions(-) diff --git a/kernel-all-spring-boot-starter/pom.xml b/kernel-all-spring-boot-starter/pom.xml index a5f5af5..f268f87 100644 --- a/kernel-all-spring-boot-starter/pom.xml +++ b/kernel-all-spring-boot-starter/pom.xml @@ -20,12 +20,11 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 kernel-all-spring-boot-starter - 1.6.7 spring-boot 依赖引用 2021-Now pom @@ -34,42 +33,34 @@ com.gitee.fubluesky.kernel jwt-spring-boot-starter - ${kernel.version} com.gitee.fubluesky.kernel cache-redis-spring-boot-starter - ${kernel.version} com.gitee.fubluesky.kernel db-spring-boot-starter - ${kernel.version} 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 push-spring-boot-starter - ${kernel.version} diff --git a/kernel-auth/auth-api/pom.xml b/kernel-auth/auth-api/pom.xml index 3d5f39c..c34f327 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.7 + ${revision} 4.0.0 diff --git a/kernel-auth/auth-sdk/pom.xml b/kernel-auth/auth-sdk/pom.xml index 8b49cf9..f8041d8 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.7 + ${revision} 4.0.0 @@ -38,17 +38,17 @@ com.gitee.fubluesky.kernel security-sdk-captcha - ${kernel.version} + ${project.version} com.gitee.fubluesky.kernel cache-sdk-redis - ${kernel.version} + ${project.version} com.gitee.fubluesky.kernel jwt-spring-boot-starter - ${kernel.version} + ${project.version} org.springframework.boot diff --git a/kernel-auth/auth-spring-boot-starter/pom.xml b/kernel-auth/auth-spring-boot-starter/pom.xml index 85490e6..d025e53 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.7 + ${revision} 4.0.0 @@ -38,12 +38,12 @@ com.gitee.fubluesky.kernel security-spring-boot-starter - ${kernel.version} + ${project.version} com.gitee.fubluesky.kernel cache-redis-spring-boot-starter - ${kernel.version} + ${project.version} org.springframework.boot diff --git a/kernel-auth/pom.xml b/kernel-auth/pom.xml index 2c30a2a..607831c 100644 --- a/kernel-auth/pom.xml +++ b/kernel-auth/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,7 @@ com.gitee.fubluesky.kernel kernel-core - ${kernel.version} + ${project.version} diff --git a/kernel-cache/cache-api/pom.xml b/kernel-cache/cache-api/pom.xml index e0cc089..16b034e 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.7 + ${revision} 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 fa38601..f248813 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.7 + ${revision} 4.0.0 diff --git a/kernel-cache/cache-sdk-redis/pom.xml b/kernel-cache/cache-sdk-redis/pom.xml index aa28409..f31e89b 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.7 + ${revision} 4.0.0 diff --git a/kernel-cache/pom.xml b/kernel-cache/pom.xml index b9f0c99..f6cdab3 100644 --- a/kernel-cache/pom.xml +++ b/kernel-cache/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,6 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} diff --git a/kernel-core/pom.xml b/kernel-core/pom.xml index 6bf674b..809378f 100644 --- a/kernel-core/pom.xml +++ b/kernel-core/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 diff --git a/kernel-db/db-api/pom.xml b/kernel-db/db-api/pom.xml index 4639143..995b5ad 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.7 + ${revision} 4.0.0 diff --git a/kernel-db/db-sdk-mybatis-plus/pom.xml b/kernel-db/db-sdk-mybatis-plus/pom.xml index 176bec1..c584160 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.7 + ${revision} 4.0.0 diff --git a/kernel-db/db-spring-boot-starter/pom.xml b/kernel-db/db-spring-boot-starter/pom.xml index a7b6f2a..999cf05 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.7 + ${revision} 4.0.0 diff --git a/kernel-db/pom.xml b/kernel-db/pom.xml index 607c36a..65106e1 100644 --- a/kernel-db/pom.xml +++ b/kernel-db/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,6 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} diff --git a/kernel-email/email-api/pom.xml b/kernel-email/email-api/pom.xml index 8bd25aa..25864d7 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.7 + ${revision} 4.0.0 diff --git a/kernel-email/email-sdk-java/pom.xml b/kernel-email/email-sdk-java/pom.xml index 432d08e..d8836ee 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.7 + ${revision} 4.0.0 diff --git a/kernel-email/email-spring-boot-starter/pom.xml b/kernel-email/email-spring-boot-starter/pom.xml index b1e56ba..448e247 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.7 + ${revision} 4.0.0 diff --git a/kernel-email/pom.xml b/kernel-email/pom.xml index f8fd057..5174683 100644 --- a/kernel-email/pom.xml +++ b/kernel-email/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,7 @@ com.gitee.fubluesky.kernel kernel-core - ${kernel.version} + ${project.version} diff --git a/kernel-excel/excel-api/pom.xml b/kernel-excel/excel-api/pom.xml index e9d301e..7d8ebc8 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.7 + ${revision} 4.0.0 diff --git a/kernel-excel/excel-sdk-easy/pom.xml b/kernel-excel/excel-sdk-easy/pom.xml index eca2df4..34ad49d 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.7 + ${revision} 4.0.0 diff --git a/kernel-excel/excel-spring-boot-starter/pom.xml b/kernel-excel/excel-spring-boot-starter/pom.xml index 202d342..b9f1f69 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.7 + ${revision} 4.0.0 diff --git a/kernel-excel/pom.xml b/kernel-excel/pom.xml index 9714899..b6405a4 100644 --- a/kernel-excel/pom.xml +++ b/kernel-excel/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,6 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} diff --git a/kernel-file/file-ali-spring-boot-starter/pom.xml b/kernel-file/file-ali-spring-boot-starter/pom.xml index ce8a4dd..df1129d 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.7 + ${revision} 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 f0abc82..81721c8 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.7 + ${revision} 4.0.0 diff --git a/kernel-file/file-api/pom.xml b/kernel-file/file-api/pom.xml index f180445..00e1c61 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.7 + ${revision} 4.0.0 diff --git a/kernel-file/file-expand-apk/pom.xml b/kernel-file/file-expand-apk/pom.xml index b0bafe8..d744675 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.7 + ${revision} 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 c0d18d2..b7eabf4 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.7 + ${revision} 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 eadf100..762af68 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.7 + ${revision} 4.0.0 diff --git a/kernel-file/file-sdk-ali/pom.xml b/kernel-file/file-sdk-ali/pom.xml index e28b826..bb4f936 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.7 + ${revision} 4.0.0 diff --git a/kernel-file/file-sdk-ftp/pom.xml b/kernel-file/file-sdk-ftp/pom.xml index 5ebbf7e..51c30b7 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.7 + ${revision} 4.0.0 diff --git a/kernel-file/file-sdk-local/pom.xml b/kernel-file/file-sdk-local/pom.xml index a4fda6c..f16dee4 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.7 + ${revision} 4.0.0 diff --git a/kernel-file/pom.xml b/kernel-file/pom.xml index 73c17b6..b2f6a35 100644 --- a/kernel-file/pom.xml +++ b/kernel-file/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,7 @@ com.gitee.fubluesky.kernel kernel-core - ${kernel.version} + ${project.version} diff --git a/kernel-jwt/jwt-api/pom.xml b/kernel-jwt/jwt-api/pom.xml index f9c4edd..e9ffb16 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.7 + ${revision} 4.0.0 diff --git a/kernel-jwt/jwt-sdk/pom.xml b/kernel-jwt/jwt-sdk/pom.xml index 2f0b034..51bfded 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.7 + ${revision} 4.0.0 diff --git a/kernel-jwt/jwt-spring-boot-starter/pom.xml b/kernel-jwt/jwt-spring-boot-starter/pom.xml index c959633..3cb8d2a 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.7 + ${revision} 4.0.0 diff --git a/kernel-jwt/pom.xml b/kernel-jwt/pom.xml index 8d4f06d..6fd1c0b 100644 --- a/kernel-jwt/pom.xml +++ b/kernel-jwt/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,6 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} diff --git a/kernel-parent/pom.xml b/kernel-parent/pom.xml index a8d916d..2785124 100644 --- a/kernel-parent/pom.xml +++ b/kernel-parent/pom.xml @@ -23,7 +23,7 @@ com.gitee.fubluesky kernel-parent pom - 1.6.7 + 1.6.8 2021-Now kernel-parent kernel-parent @@ -37,14 +37,14 @@ 1.8 - 2.6.4 + 2.6.5 2021.0.1 2021.0.1.0 1.6.3 - 1.6.7 - + 1.6.8 + 3.1.0 3.0.0-M1 @@ -122,6 +122,173 @@ pom import + + + + + com.gitee.fubluesky.kernel + kernel-core + ${project.version} + + + + com.gitee.fubluesky.kernel + db-api + ${project.version} + + + com.gitee.fubluesky.kernel + db-sdk-mybatis-plus + ${project.version} + + + com.gitee.fubluesky.kernel + db-spring-boot-starter + ${project.version} + + + + com.gitee.fubluesky.kernel + jwt-api + ${project.version} + + + com.gitee.fubluesky.kernel + jwt-sdk + ${project.version} + + + com.gitee.fubluesky.kernel + jwt-spring-boot-starter + ${project.version} + + + + com.gitee.fubluesky.kernel + cache-api + ${project.version} + + + com.gitee.fubluesky.kernel + cache-sdk-redis + ${project.version} + + + com.gitee.fubluesky.kernel + cache-redis-spring-boot-starter + ${project.version} + + + + com.gitee.fubluesky.kernel + security-api + ${project.version} + + + com.gitee.fubluesky.kernel + security-sdk-captcha + ${project.version} + + + com.gitee.fubluesky.kernel + security-sdk-cors + ${project.version} + + + com.gitee.fubluesky.kernel + security-sdk-jackson + ${project.version} + + + com.gitee.fubluesky.kernel + security-sdk-sign + ${project.version} + + + com.gitee.fubluesky.kernel + security-spring-boot-starter + ${project.version} + + + + com.gitee.fubluesky.kernel + auth-api + ${project.version} + + + com.gitee.fubluesky.kernel + auth-sdk + ${project.version} + + + com.gitee.fubluesky.kernel + auth-spring-boot-starter + ${project.version} + + + + com.gitee.fubluesky.kernel + file-api + ${project.version} + + + com.gitee.fubluesky.kernel + file-sdk-ali + ${project.version} + + + com.gitee.fubluesky.kernel + file-sdk-ftp + ${project.version} + + + com.gitee.fubluesky.kernel + file-sdk-local + ${project.version} + + + com.gitee.fubluesky.kernel + file-ali-spring-boot-starter + ${project.version} + + + com.gitee.fubluesky.kernel + file-ftp-spring-boot-starter + ${project.version} + + + com.gitee.fubluesky.kernel + file-local-spring-boot-starter + ${project.version} + + + com.gitee.fubluesky.kernel + file-all-spring-boot-starter + ${project.version} + + + com.gitee.fubluesky.kernel + file-expand-apk + ${project.version} + + + + com.gitee.fubluesky.kernel + push-spring-boot-starter + ${project.version} + + + + com.gitee.fubluesky.kernel + sms-ali-spring-boot-starter + ${project.version} + + + + com.gitee.fubluesky.kernel + email-spring-boot-starter + ${project.version} + diff --git a/kernel-push/pom.xml b/kernel-push/pom.xml index 805d5cb..ff9aca6 100644 --- a/kernel-push/pom.xml +++ b/kernel-push/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,6 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} diff --git a/kernel-push/push-api/pom.xml b/kernel-push/push-api/pom.xml index 36f4dc7..8916ba0 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.7 + ${revision} 4.0.0 diff --git a/kernel-push/push-sdk-jpush/pom.xml b/kernel-push/push-sdk-jpush/pom.xml index 0f7a4a3..5e84212 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.7 + ${revision} 4.0.0 diff --git a/kernel-push/push-spring-boot-starter/pom.xml b/kernel-push/push-spring-boot-starter/pom.xml index 1fbf379..bb54068 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.7 + ${revision} 4.0.0 diff --git a/kernel-security/pom.xml b/kernel-security/pom.xml index 46e12dd..c1a6ef0 100644 --- a/kernel-security/pom.xml +++ b/kernel-security/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,6 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} diff --git a/kernel-security/security-api/pom.xml b/kernel-security/security-api/pom.xml index 27cba35..35aa054 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.7 + ${revision} 4.0.0 diff --git a/kernel-security/security-sdk-captcha/pom.xml b/kernel-security/security-sdk-captcha/pom.xml index d696d2b..fdc577f 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.7 + ${revision} 4.0.0 diff --git a/kernel-security/security-sdk-cors/pom.xml b/kernel-security/security-sdk-cors/pom.xml index a729452..5de2087 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.7 + ${revision} 4.0.0 diff --git a/kernel-security/security-sdk-jackson/pom.xml b/kernel-security/security-sdk-jackson/pom.xml index 5a2ab11..ba8a934 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.7 + ${revision} 4.0.0 @@ -33,7 +33,7 @@ com.gitee.fubluesky.kernel security-api - ${kernel.version} + ${project.version} org.springframework.boot diff --git a/kernel-security/security-sdk-sign/pom.xml b/kernel-security/security-sdk-sign/pom.xml index 21693be..a427548 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.7 + ${revision} 4.0.0 diff --git a/kernel-security/security-spring-boot-starter/pom.xml b/kernel-security/security-spring-boot-starter/pom.xml index e5d30a7..7921554 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.7 + ${revision} 4.0.0 diff --git a/kernel-sms/pom.xml b/kernel-sms/pom.xml index d627bd5..931db73 100644 --- a/kernel-sms/pom.xml +++ b/kernel-sms/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,7 @@ com.gitee.fubluesky.kernel kernel-core - ${kernel.version} + ${project.version} diff --git a/kernel-sms/sms-ali-spring-boot-starter/pom.xml b/kernel-sms/sms-ali-spring-boot-starter/pom.xml index d581230..aa46a6e 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.7 + ${revision} 4.0.0 diff --git a/kernel-sms/sms-api/pom.xml b/kernel-sms/sms-api/pom.xml index 41e8f98..65a0f3e 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.7 + ${revision} 4.0.0 diff --git a/kernel-sms/sms-sdk-ali/pom.xml b/kernel-sms/sms-sdk-ali/pom.xml index ed10e13..ac6570b 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.7 + ${revision} 4.0.0 diff --git a/kernel-validator/pom.xml b/kernel-validator/pom.xml index afaad75..fdb5736 100644 --- a/kernel-validator/pom.xml +++ b/kernel-validator/pom.xml @@ -20,7 +20,7 @@ com.gitee.fubluesky.kernel kernel - 1.6.7 + ${revision} 4.0.0 @@ -33,7 +33,6 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} diff --git a/kernel-validator/validator-api/pom.xml b/kernel-validator/validator-api/pom.xml index 2ae118d..1627418 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.7 + ${revision} 4.0.0 diff --git a/pom.xml b/pom.xml index 5f774f2..fd63ca5 100644 --- a/pom.xml +++ b/pom.xml @@ -23,16 +23,16 @@ com.gitee.fubluesky kernel-parent - 1.6.7 + 1.6.8 com.gitee.fubluesky.kernel kernel pom - 1.6.7 2021-Now kernel + ${revision} kernel https://github.com/guoshiqiufeng/kernel.git From 563715f9187b0cce1b7728f9911cb4efb4beb7b2 Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Fri, 25 Mar 2022 16:13:55 +0800 Subject: [PATCH 2/5] 1.6.8 --- README.md | 3 ++- kernel-auth/README.md | 2 +- kernel-cache/cache-redis-spring-boot-starter/README.md | 2 +- kernel-db/README.md | 2 +- kernel-email/email-spring-boot-starter/README.md | 2 +- kernel-file/file-ali-spring-boot-starter/README.md | 2 +- kernel-file/file-all-spring-boot-starter/README.md | 2 +- kernel-file/file-ftp-spring-boot-starter/README.md | 2 +- kernel-file/file-local-spring-boot-starter/README.md | 2 +- kernel-jwt/jwt-spring-boot-starter/README.md | 2 +- kernel-sms/sms-ali-spring-boot-starter/README.md | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 60a48c5..5243ddb 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ #### 介绍 内核框架 #### 依赖 -- spring-boot 2.6.4 +- spring-boot 2.6.5 - spring-cloud 2021.0.1 - spring-cloud-alibaba 2021.0.1.0 - kernel-dependencies 1.6.3 @@ -35,6 +35,7 @@ - [ ] 模块拆分 - [ ] 文档 - [ ] demo + - [vea](https://github.com/guoshiqiufeng/vea) 微服务demo #### 安装教程 使用maven进行依赖安装 diff --git a/kernel-auth/README.md b/kernel-auth/README.md index a060664..09f4a66 100644 --- a/kernel-auth/README.md +++ b/kernel-auth/README.md @@ -9,7 +9,7 @@ pom添加依赖 com.gitee.fubluesky.kernel auth-spring-boot-starter - 1.6.6 + 1.6.8 ``` ### 配置 diff --git a/kernel-cache/cache-redis-spring-boot-starter/README.md b/kernel-cache/cache-redis-spring-boot-starter/README.md index 2410c60..6134748 100644 --- a/kernel-cache/cache-redis-spring-boot-starter/README.md +++ b/kernel-cache/cache-redis-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel cache-redis-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-db/README.md b/kernel-db/README.md index 55be2d0..cf03c1a 100644 --- a/kernel-db/README.md +++ b/kernel-db/README.md @@ -11,7 +11,7 @@ pom添加依赖 com.gitee.fubluesky.kernel db-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-email/email-spring-boot-starter/README.md b/kernel-email/email-spring-boot-starter/README.md index af20f6e..713c474 100644 --- a/kernel-email/email-spring-boot-starter/README.md +++ b/kernel-email/email-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel email-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-file/file-ali-spring-boot-starter/README.md b/kernel-file/file-ali-spring-boot-starter/README.md index 0865ce7..1f6779d 100644 --- a/kernel-file/file-ali-spring-boot-starter/README.md +++ b/kernel-file/file-ali-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel file-ali-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-file/file-all-spring-boot-starter/README.md b/kernel-file/file-all-spring-boot-starter/README.md index 30262e1..d717ab1 100644 --- a/kernel-file/file-all-spring-boot-starter/README.md +++ b/kernel-file/file-all-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel file-all-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-file/file-ftp-spring-boot-starter/README.md b/kernel-file/file-ftp-spring-boot-starter/README.md index 4710788..3896e9e 100644 --- a/kernel-file/file-ftp-spring-boot-starter/README.md +++ b/kernel-file/file-ftp-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel file-ftp-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-file/file-local-spring-boot-starter/README.md b/kernel-file/file-local-spring-boot-starter/README.md index e70b9bf..5cac113 100644 --- a/kernel-file/file-local-spring-boot-starter/README.md +++ b/kernel-file/file-local-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel file-local-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-jwt/jwt-spring-boot-starter/README.md b/kernel-jwt/jwt-spring-boot-starter/README.md index ca8112f..02f60be 100644 --- a/kernel-jwt/jwt-spring-boot-starter/README.md +++ b/kernel-jwt/jwt-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel jwt-spring-boot-starter - 1.6.6 + 1.6.8 ``` diff --git a/kernel-sms/sms-ali-spring-boot-starter/README.md b/kernel-sms/sms-ali-spring-boot-starter/README.md index 026690a..8d027a6 100644 --- a/kernel-sms/sms-ali-spring-boot-starter/README.md +++ b/kernel-sms/sms-ali-spring-boot-starter/README.md @@ -12,7 +12,7 @@ pom添加依赖 com.gitee.fubluesky.kernel sms-ali-spring-boot-starter - 1.6.6 + 1.6.8 ``` From c25ed4016bd9611b373294c8786eb6caf7e26b2b Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Mon, 28 Mar 2022 17:24:56 +0800 Subject: [PATCH 3/5] =?UTF-8?q?securityConfig=20=E6=94=B9=E4=B8=BA=20?= =?UTF-8?q?=E9=9D=9E=E5=BC=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/auth/autoconfigure/SecurityAutoConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java b/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java index 7a04fce..d622590 100644 --- a/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java +++ b/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java @@ -35,7 +35,7 @@ @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) @AutoConfigureAfter(value = { AuthAutoConfiguration.class }) -@ConditionalOnProperty(prefix = "kernel.auth", name = "securityConfigEnabled", matchIfMissing = true) +@ConditionalOnProperty(prefix = "kernel.auth", name = "securityConfigEnabled", havingValue = "true") public class SecurityAutoConfiguration { @Bean From fb17ebd800d37752630cf49cbf870e23f0767fc8 Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Mon, 28 Mar 2022 17:32:10 +0800 Subject: [PATCH 4/5] version flatten-maven-plugin --- kernel-parent/pom.xml | 69 ++++++++++++++++++++++--------------------- pom.xml | 34 +++++++++++++++++++-- 2 files changed, 67 insertions(+), 36 deletions(-) diff --git a/kernel-parent/pom.xml b/kernel-parent/pom.xml index 2785124..5e1c869 100644 --- a/kernel-parent/pom.xml +++ b/kernel-parent/pom.xml @@ -23,7 +23,7 @@ com.gitee.fubluesky kernel-parent pom - 1.6.8 + 1.6.9 2021-Now kernel-parent kernel-parent @@ -43,8 +43,9 @@ 2021.0.1.0 1.6.3 - 1.6.8 - + + 1.6.9 + 3.1.0 3.0.0-M1 @@ -128,166 +129,166 @@ com.gitee.fubluesky.kernel kernel-core - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel db-api - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel db-sdk-mybatis-plus - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel db-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel jwt-api - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel jwt-sdk - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel jwt-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel cache-api - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel cache-sdk-redis - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel cache-redis-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel security-api - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel security-sdk-captcha - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel security-sdk-cors - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel security-sdk-jackson - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel security-sdk-sign - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel security-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel auth-api - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel auth-sdk - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel auth-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-api - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-sdk-ali - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-sdk-ftp - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-sdk-local - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-ali-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-ftp-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-local-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-all-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel file-expand-apk - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel push-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel sms-ali-spring-boot-starter - ${project.version} + ${kernel.version} com.gitee.fubluesky.kernel email-spring-boot-starter - ${project.version} + ${kernel.version} diff --git a/pom.xml b/pom.xml index fd63ca5..1d03703 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.gitee.fubluesky kernel-parent - 1.6.8 + 1.6.9 @@ -42,10 +42,40 @@ ${java.version} ${java.version} 1.8 + 1.6.9 + 1.1.0 + + org.codehaus.mojo + flatten-maven-plugin + ${maven-flatten-version} + + true + resolveCiFriendliesOnly + + expand + + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + io.spring.javaformat spring-javaformat-maven-plugin @@ -173,7 +203,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.9 true sonatype-nexus-releases From b8484b90050ea914ea7a33b6e396ce20e3a9710f Mon Sep 17 00:00:00 2001 From: yanghq <1040926235@qq.com> Date: Mon, 28 Mar 2022 19:15:51 +0800 Subject: [PATCH 5/5] security properties --- kernel-auth/README.md | 31 +++++++++++++------ .../kernel/auth/api/pojo/AuthProperties.java | 21 ++++++++----- .../kernel/auth/security/SecurityConfig.java | 4 +-- .../SecurityAutoConfiguration.java | 2 +- 4 files changed, 38 insertions(+), 20 deletions(-) diff --git a/kernel-auth/README.md b/kernel-auth/README.md index 09f4a66..96277da 100644 --- a/kernel-auth/README.md +++ b/kernel-auth/README.md @@ -13,19 +13,32 @@ pom添加依赖 ``` ### 配置 -| 参数 | 名称 | 备注 | -|------------------------------------|-------------------------------------------------------------------------|------------------| -| kernel.auth.token-prefix | jwt 生成 token 前缀 | 默认为Bearer | -| kernel.auth.token-param-name | 请求中token 参数名称 | 默认为Authorization | -| kernel.auth.token-header-name | 请求头中token 参数名称 | 默认为Authorization | -| kernel.auth.token-cookie-name | cookie中token 参数名称 | 默认为Authorization | -| kernel.auth.jwt-app-id-header-name | 请求头中 jwt app id 参数名称 （用于获取jwt模块所使用加密的密钥对应的参数名，若 jwt模块开启多租户则必填，若 未开启可忽略） | 默认为 appId | -| kernel.auth.security-config-enabled | 是否开启spring security config | 默认为 true | -| kernel.auth.security-config-allow-patterns | spring security 放行路径 | | +| 参数 | 名称 | 备注 | +|-------------------------------------|-------------------------------------------------------------------------|------------------| +| kernel.auth.token-prefix | jwt 生成 token 前缀 | 默认为Bearer | +| kernel.auth.token-param-name | 请求中token 参数名称 | 默认为Authorization | +| kernel.auth.token-header-name | 请求头中token 参数名称 | 默认为Authorization | +| kernel.auth.token-cookie-name | cookie中token 参数名称 | 默认为Authorization | +| kernel.auth.jwt-app-id-header-name | 请求头中 jwt app id 参数名称 （用于获取jwt模块所使用加密的密钥对应的参数名，若 jwt模块开启多租户则必填，若 未开启可忽略） | 默认为 appId | +| kernel.auth.security.enabled | 是否开启spring security config | 默认为 true | +| kernel.auth.security.allow-patterns | spring security 放行路径 | | ### security can set `kernel.auth.security-config-enabled: false` to skip this config can set `kernel.auth.security-config-allow-patterns: -/url` to allow patterns +若想不使用spring security ,添加依赖时排除`spring-boot-starter-security`依赖 +```xml + + com.gitee.fubluesky.kernel + auth-spring-boot-starter + + + org.springframework.boot + spring-boot-starter-security + + + +``` #### security-config-allow-patterns example ```yaml kernel: diff --git a/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/pojo/AuthProperties.java b/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/pojo/AuthProperties.java index 91ef6c1..bafb3e1 100644 --- a/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/pojo/AuthProperties.java +++ b/kernel-auth/auth-api/src/main/java/com/gitee/fubluesky/kernel/auth/api/pojo/AuthProperties.java @@ -53,14 +53,19 @@ public class AuthProperties { */ private String jwtAppIdHeaderName = "appId"; - /** - * 是否启用spring security config - */ - private Boolean securityConfigEnabled = true; + private SecurityProperties security; - /** - * 启用 spring security config 后 spring security 放行路径 - */ - private List securityConfigAllowPatterns; + @Data + public static class SecurityProperties { + + /** + * 是否启用spring security config + */ + private Boolean enabled = true; + /** + * 启用 spring security config 后 spring security 放行路径 + */ + private List allowPatterns; + } } diff --git a/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/security/SecurityConfig.java b/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/security/SecurityConfig.java index 4ce4274..f52b4ef 100644 --- a/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/security/SecurityConfig.java +++ b/kernel-auth/auth-sdk/src/main/java/com/gitee/fubluesky/kernel/auth/security/SecurityConfig.java @@ -69,8 +69,8 @@ protected void configure(HttpSecurity http) throws Exception { http.headers() .addHeaderWriter(new XFrameOptionsHeaderWriter(XFrameOptionsHeaderWriter.XFrameOptionsMode.SAMEORIGIN)); - if (ListUtils.isNotEmpty(authProperties.getSecurityConfigAllowPatterns())) { - http.authorizeRequests().antMatchers(authProperties.getSecurityConfigAllowPatterns().toArray(new String[1])) + if (ListUtils.isNotEmpty(authProperties.getSecurity().getAllowPatterns())) { + http.authorizeRequests().antMatchers(authProperties.getSecurity().getAllowPatterns().toArray(new String[1])) .permitAll(); } http.authorizeRequests().requestMatchers(CorsUtils::isPreFlightRequest).permitAll().anyRequest() diff --git a/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java b/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java index d622590..5001d82 100644 --- a/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java +++ b/kernel-auth/auth-spring-boot-starter/src/main/java/com/gitee/fubluesky/kernel/auth/autoconfigure/SecurityAutoConfiguration.java @@ -35,7 +35,7 @@ @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true) @AutoConfigureAfter(value = { AuthAutoConfiguration.class }) -@ConditionalOnProperty(prefix = "kernel.auth", name = "securityConfigEnabled", havingValue = "true") +@ConditionalOnProperty(prefix = "kernel.auth.security", name = "enabled", havingValue = "true") public class SecurityAutoConfiguration { @Bean