[dolphinscheduler] branch 3.0.1-prepare updated: cherry-pick [Improvement] [LDAP] Config value should return real null instead of 'null' string (#12031)

[kerwin]

This is an automated email from the ASF dual-hosted git repository.

kerwin pushed a commit to branch 3.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/3.0.1-prepare by this push:
     new 2b016356a5 cherry-pick [Improvement] [LDAP] Config value should return 
real null instead of 'null' string (#12031)
2b016356a5 is described below

commit 2b016356a536866367a52fc82873b80a890d8c66
Author: Kerwin <37063904+zhuangch...@users.noreply.github.com>
AuthorDate: Mon Sep 19 09:48:17 2022 +0800

    cherry-pick [Improvement] [LDAP] Config value should return real null 
instead of 'null' string (#12031)
    
    Co-authored-by: Guanhua Li <guanhua...@foxmail.com>
---
 .../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 35abb11479..dd2123bd1c 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
@@ -42,25 +42,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;
 
     /***