From d09d6172c15de41eb353ec0a02af1463dbb7a80a Mon Sep 17 00:00:00 2001 From: jangrui Date: Fri, 15 May 2026 02:24:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=92=8C=E5=90=AF=E5=8A=A8=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - application.yml: 合并重复的 management.health 节点,解决 DuplicateKeyException - LocalAuthServiceTest.java: 补充 PlatformPrincipal/Set import 和类闭合括号 Signed-off-by: jangrui --- server/skillhub-app/src/main/resources/application.yml | 5 ++--- .../iflytek/skillhub/auth/local/LocalAuthServiceTest.java | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/skillhub-app/src/main/resources/application.yml b/server/skillhub-app/src/main/resources/application.yml index 5a51e49e..66af1081 100644 --- a/server/skillhub-app/src/main/resources/application.yml +++ b/server/skillhub-app/src/main/resources/application.yml @@ -214,6 +214,8 @@ management: health: mail: enabled: ${MANAGEMENT_HEALTH_MAIL_ENABLED:false} + ldap: + enabled: false endpoints: web: exposure: @@ -221,9 +223,6 @@ management: endpoint: health: show-details: when-authorized - health: - ldap: - enabled: false metrics: tags: application: skillhub diff --git a/server/skillhub-auth/src/test/java/com/iflytek/skillhub/auth/local/LocalAuthServiceTest.java b/server/skillhub-auth/src/test/java/com/iflytek/skillhub/auth/local/LocalAuthServiceTest.java index 9c02485d..bd5ac1c8 100644 --- a/server/skillhub-auth/src/test/java/com/iflytek/skillhub/auth/local/LocalAuthServiceTest.java +++ b/server/skillhub-auth/src/test/java/com/iflytek/skillhub/auth/local/LocalAuthServiceTest.java @@ -11,6 +11,7 @@ import static org.mockito.Mockito.verify; import com.iflytek.skillhub.auth.config.LdapProperties; import com.iflytek.skillhub.auth.exception.AuthFlowException; +import com.iflytek.skillhub.auth.rbac.PlatformPrincipal; import com.iflytek.skillhub.auth.entity.Role; import com.iflytek.skillhub.auth.entity.UserRoleBinding; import com.iflytek.skillhub.auth.ldap.LdapAuthService; @@ -24,6 +25,7 @@ import java.time.Instant; import java.time.ZoneOffset; import java.util.List; import java.util.Optional; +import java.util.Set; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -321,4 +323,5 @@ class LocalAuthServiceTest { .isEqualTo(HttpStatus.UNAUTHORIZED); verify(ldapAuthService, never()).login(any(), any()); + } }