From 8b3f60ed88b82f1f3944b8d2e376d353bd40b593 Mon Sep 17 00:00:00 2001 From: Guanhua Li Date: Fri, 19 Aug 2022 10:34:00 +0800 Subject: [PATCH] [Improvement] [LDAP] Bug fix: Config value return "null" instead of real null currently. (#11325) --- .../api/security/impl/ldap/LdapService.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java index 180c7d0005..8a7dd5a784 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapService.java @@ -45,25 +45,25 @@ import org.springframework.stereotype.Component; public class LdapService { private static final Logger logger = LoggerFactory.getLogger(LdapService.class); - @Value("${security.authentication.ldap.user.admin:null}") + @Value("${security.authentication.ldap.user.admin:#{null}}") private String adminUserId; - @Value("${security.authentication.ldap.urls:null}") + @Value("${security.authentication.ldap.urls:#{null}}") private String ldapUrls; - @Value("${security.authentication.ldap.base-dn:null}") + @Value("${security.authentication.ldap.base-dn:#{null}}") private String ldapBaseDn; - @Value("${security.authentication.ldap.username:null}") + @Value("${security.authentication.ldap.username:#{null}}") private String ldapSecurityPrincipal; - @Value("${security.authentication.ldap.password:null}") + @Value("${security.authentication.ldap.password:#{null}}") private String ldapPrincipalPassword; - @Value("${security.authentication.ldap.user.identity-attribute:null}") + @Value("${security.authentication.ldap.user.identity-attribute:#{null}}") private String ldapUserIdentifyingAttribute; - @Value("${security.authentication.ldap.user.email-attribute:null}") + @Value("${security.authentication.ldap.user.email-attribute:#{null}}") private String ldapEmailAttribute; @Value("${security.authentication.ldap.user.not-exist-action:CREATE}")