[ISSUE alibaba#8214] The constants of Ldap move to the plugin-impl mo…

…dule
onewe · Apr 22, 2022 · 2a3417d · 2a3417d
1 parent ecd8fa9
commit 2a3417d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/plugin-default-impl/src/main/java/com/alibaba/nacos/plugin/auth/impl/LdapAuthConfig.java b/plugin-default-impl/src/main/java/com/alibaba/nacos/plugin/auth/impl/LdapAuthConfig.java
@@ -16,8 +16,8 @@
 
 package com.alibaba.nacos.plugin.auth.impl;
 
-import com.alibaba.nacos.plugin.auth.constant.Constants;
 import com.alibaba.nacos.plugin.auth.impl.configuration.ConditionOnLdapAuth;
+import com.alibaba.nacos.plugin.auth.impl.constant.AuthConstants;
 import com.alibaba.nacos.plugin.auth.impl.roles.NacosRoleServiceImpl;
 import com.alibaba.nacos.plugin.auth.impl.users.NacosUserDetailsServiceImpl;
 import org.springframework.beans.factory.annotation.Value;
@@ -40,19 +40,19 @@
 @EnableAutoConfiguration(exclude = LdapAutoConfiguration.class)
 public class LdapAuthConfig {
 
-    @Value(("${" + Constants.Auth.NACOS_CORE_AUTH_LDAP_URL + ":ldap://localhost:389}"))
+    @Value(("${" + AuthConstants.NACOS_CORE_AUTH_LDAP_URL + ":ldap://localhost:389}"))
     private String ldapUrl;
 
-    @Value(("${" + Constants.Auth.NACOS_CORE_AUTH_LDAP_BASEDC + ":dc=example,dc=org}"))
+    @Value(("${" + AuthConstants.NACOS_CORE_AUTH_LDAP_BASEDC + ":dc=example,dc=org}"))
     private String ldapBaseDc;
 
-    @Value(("${" + Constants.Auth.NACOS_CORE_AUTH_LDAP_TIMEOUT + ":3000}"))
+    @Value(("${" + AuthConstants.NACOS_CORE_AUTH_LDAP_TIMEOUT + ":3000}"))
     private String ldapTimeOut;
 
-    @Value(("${" + Constants.Auth.NACOS_CORE_AUTH_LDAP_USERDN + ":cn=admin,dc=example,dc=org}"))
+    @Value(("${" + AuthConstants.NACOS_CORE_AUTH_LDAP_USERDN + ":cn=admin,dc=example,dc=org}"))
     private String userDn;
 
-    @Value(("${ " + Constants.Auth.NACOS_CORE_AUTH_LDAP_PASSWORD + ":password}"))
+    @Value(("${ " + AuthConstants.NACOS_CORE_AUTH_LDAP_PASSWORD + ":password}"))
     private String password;
 
     @Bean

diff --git a/...default-impl/src/main/java/com/alibaba/nacos/plugin/auth/impl/constant/AuthConstants.java b/...default-impl/src/main/java/com/alibaba/nacos/plugin/auth/impl/constant/AuthConstants.java
@@ -50,4 +50,14 @@ public class AuthConstants {
     public static final String TOKEN_EXPIRE_SECONDS = "token.expire.seconds";
 
     public static final String DEFAULT_TOKEN_EXPIRE_SECONDS = "18000";
+
+    public static final String NACOS_CORE_AUTH_LDAP_URL = "nacos.core.auth.ldap.url";
+
+    public static final String NACOS_CORE_AUTH_LDAP_BASEDC = "nacos.core.auth.ldap.basedc";
+
+    public static final String NACOS_CORE_AUTH_LDAP_TIMEOUT = "nacos.core.auth.ldap.timeout";
+
+    public static final String NACOS_CORE_AUTH_LDAP_USERDN = "nacos.core.auth.ldap.userDn";
+
+    public static final String NACOS_CORE_AUTH_LDAP_PASSWORD = "nacos.core.auth.ldap.password";
 }
diff --git a/plugin/auth/src/main/java/com/alibaba/nacos/plugin/auth/constant/Constants.java b/plugin/auth/src/main/java/com/alibaba/nacos/plugin/auth/constant/Constants.java
@@ -36,16 +36,7 @@ public static class Auth {
         public static final String NACOS_CORE_AUTH_SERVER_IDENTITY_VALUE = "nacos.core.auth.server.identity.value";
 
         public static final String NACOS_CORE_AUTH_ENABLE_USER_AGENT_AUTH_WHITE = "nacos.core.auth.enable.userAgentAuthWhite";
-
-        public static final String NACOS_CORE_AUTH_LDAP_URL = "nacos.core.auth.ldap.url";
-
-        public static final String NACOS_CORE_AUTH_LDAP_BASEDC = "nacos.core.auth.ldap.basedc";
-
-        public static final String NACOS_CORE_AUTH_LDAP_TIMEOUT = "nacos.core.auth.ldap.timeout";
-
-        public static final String NACOS_CORE_AUTH_LDAP_USERDN = "nacos.core.auth.ldap.userDn";
-
-        public static final String NACOS_CORE_AUTH_LDAP_PASSWORD = "nacos.core.auth.ldap.password";
+
     }
 
     public static class Resource {