[incubator-dubbo-website] branch asf-site updated: Fix typo (#241)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 64796e0 Fix typo (#241)
64796e0 is described below
commit 64796e07eda22f613ed83e17eddcfe0902d3e616
Author: kezhenxu94
AuthorDate: Mon Jan 14 13:24:36 2019 +0800
Fix typo (#241)
---
docs/zh-cn/user/references/xml/dubbo-registry.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/zh-cn/user/references/xml/dubbo-registry.md
b/docs/zh-cn/user/references/xml/dubbo-registry.md
index 8da17c0..8fdc1a7 100644
--- a/docs/zh-cn/user/references/xml/dubbo-registry.md
+++ b/docs/zh-cn/user/references/xml/dubbo-registry.md
@@ -62,5 +62,5 @@ table tr:hover {
| check | check | boolean | 可选 | true | 服务治理 | 注册中心不存在时，是否报错 | 2.0.0以上版本 |
| register | register | boolean | 可选 | true | 服务治理 |
是否向此注册中心注册服务，如果设为false，将只订阅，不注册 | 2.0.5以上版本 |
| subscribe | subscribe | boolean | 可选 | true | 服务治理 |
是否向此注册中心订阅服务，如果设为false，将只注册，不订阅 | 2.0.5以上版本 |
-| dynamic | dynamic | boolean | 可选 | true | 服务治理 |
服务是否动态注册，如果设为false，注册后将显示后disable状态，需人工启用，并且服务提供者停止时，也不会自动取消册，需人工禁用。 |
2.0.5以上版本 |
+| dynamic | dynamic | boolean | 可选 | true | 服务治理 |
服务是否动态注册，如果设为false，注册后将显示为disable状态，需人工启用，并且服务提供者停止时，也不会自动取消注册，需人工禁用。 |
2.0.5以上版本 |
| group | group | string | 可选 | dubbo | 服务治理 |
服务注册分组，跨组的服务不会相互影响，也无法相互调用，适用于环境隔离。 | 2.0.5以上版本 |
[incubator-dubbo-website] Diff for: [GitHub] ralf0131 closed pull request #241: fix typo
diff --git a/docs/zh-cn/user/references/xml/dubbo-registry.md
b/docs/zh-cn/user/references/xml/dubbo-registry.md
index 8da17c0c..8fdc1a7f 100644
--- a/docs/zh-cn/user/references/xml/dubbo-registry.md
+++ b/docs/zh-cn/user/references/xml/dubbo-registry.md
@@ -62,5 +62,5 @@ table tr:hover {
| check | check | boolean | 可选 | true | 服务治理 | 注册中心不存在时，是否报错 | 2.0.0以上版本 |
| register | register | boolean | 可选 | true | 服务治理 |
是否向此注册中心注册服务，如果设为false，将只订阅，不注册 | 2.0.5以上版本 |
| subscribe | subscribe | boolean | 可选 | true | 服务治理 |
是否向此注册中心订阅服务，如果设为false，将只注册，不订阅 | 2.0.5以上版本 |
-| dynamic | dynamic | boolean | 可选 | true | 服务治理 |
服务是否动态注册，如果设为false，注册后将显示后disable状态，需人工启用，并且服务提供者停止时，也不会自动取消册，需人工禁用。 |
2.0.5以上版本 |
+| dynamic | dynamic | boolean | 可选 | true | 服务治理 |
服务是否动态注册，如果设为false，注册后将显示为disable状态，需人工启用，并且服务提供者停止时，也不会自动取消注册，需人工禁用。 |
2.0.5以上版本 |
| group | group | string | 可选 | dubbo | 服务治理 |
服务注册分组，跨组的服务不会相互影响，也无法相互调用，适用于环境隔离。 | 2.0.5以上版本 |
With regards,
Apache Git Services
[incubator-dubbo-website] branch asf-site updated: Fix wrong grammar (#242)
This is an automated email from the ASF dual-hosted git repository.
huxing pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new f1250f7 Fix wrong grammar (#242)
f1250f7 is described below
commit f1250f7c45910fe6701864b59932c8e9967d09ec
Author: mimihom
AuthorDate: Mon Jan 14 13:23:45 2019 +0800
Fix wrong grammar (#242)
---
docs/zh-cn/user/references/xml/dubbo-protocol.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/zh-cn/user/references/xml/dubbo-protocol.md
b/docs/zh-cn/user/references/xml/dubbo-protocol.md
index 084676a..fe792eb 100644
--- a/docs/zh-cn/user/references/xml/dubbo-protocol.md
+++ b/docs/zh-cn/user/references/xml/dubbo-protocol.md
@@ -65,7 +65,7 @@ table tr:hover {
| server | server | string | 可选 | dubbo协议缺省为netty，http协议缺省为servlet | 性能调优 |
协议的服务器端实现类型，比如：dubbo协议的mina,netty等，http协议的jetty,servlet等 | 2.0.5以上版本 |
| client | client | string | 可选 | dubbo协议缺省为netty | 性能调优 |
协议的客户端实现类型，比如：dubbo协议的mina,netty等 | 2.0.5以上版本 |
| dispatcher | dispatcher | string | 可选 | dubbo协议缺省为all | 性能调优 |
协议的消息派发方式，用于指定线程模型，比如：dubbo协议的all, direct, message, execution, connection等 |
2.1.0以上版本 |
-| queues | queues | int | 可选 | 0 | 性能调优 |
线程池队列大小，当线程池满时，排队等待执行的队列大小，建议不要设置，当线程程池时应立即失败，重试其它服务提供机器，而不是排队，除非有特殊需求。 |
2.0.5以上版本 |
+| queues | queues | int | 可选 | 0 | 性能调优 |
线程池队列大小，当线程池满时，排队等待执行的队列大小，建议不要设置，当线程池满时应立即失败，重试其它服务提供机器，而不是排队，除非有特殊需求。 |
2.0.5以上版本 |
| charset | charset | string | 可选 | UTF-8 | 性能调优 | 序列化编码 | 2.0.5以上版本 |
| buffer | buffer | int | 可选 | 8192 | 性能调优 | 网络读写缓冲区大小 | 2.0.5以上版本 |
| heartbeat | heartbeat | int | 可选 | 0 | 性能调优 |
心跳间隔，对于长连接，当物理层断开时，比如拔网线，TCP的FIN消息来不及发送，对方收不到断开事件，此时需要心跳来帮助检查连接是否已断开 |
2.0.10以上版本 |
[incubator-dubbo-website] Diff for: [GitHub] ralf0131 closed pull request #242: fix wrong grammar
diff --git a/docs/zh-cn/user/references/xml/dubbo-protocol.md
b/docs/zh-cn/user/references/xml/dubbo-protocol.md
index 084676a9..fe792eb8 100644
--- a/docs/zh-cn/user/references/xml/dubbo-protocol.md
+++ b/docs/zh-cn/user/references/xml/dubbo-protocol.md
@@ -65,7 +65,7 @@ table tr:hover {
| server | server | string | 可选 | dubbo协议缺省为netty，http协议缺省为servlet | 性能调优 |
协议的服务器端实现类型，比如：dubbo协议的mina,netty等，http协议的jetty,servlet等 | 2.0.5以上版本 |
| client | client | string | 可选 | dubbo协议缺省为netty | 性能调优 |
协议的客户端实现类型，比如：dubbo协议的mina,netty等 | 2.0.5以上版本 |
| dispatcher | dispatcher | string | 可选 | dubbo协议缺省为all | 性能调优 |
协议的消息派发方式，用于指定线程模型，比如：dubbo协议的all, direct, message, execution, connection等 |
2.1.0以上版本 |
-| queues | queues | int | 可选 | 0 | 性能调优 |
线程池队列大小，当线程池满时，排队等待执行的队列大小，建议不要设置，当线程程池时应立即失败，重试其它服务提供机器，而不是排队，除非有特殊需求。 |
2.0.5以上版本 |
+| queues | queues | int | 可选 | 0 | 性能调优 |
线程池队列大小，当线程池满时，排队等待执行的队列大小，建议不要设置，当线程池满时应立即失败，重试其它服务提供机器，而不是排队，除非有特殊需求。 |
2.0.5以上版本 |
| charset | charset | string | 可选 | UTF-8 | 性能调优 | 序列化编码 | 2.0.5以上版本 |
| buffer | buffer | int | 可选 | 8192 | 性能调优 | 网络读写缓冲区大小 | 2.0.5以上版本 |
| heartbeat | heartbeat | int | 可选 | 0 | 性能调优 |
心跳间隔，对于长连接，当物理层断开时，比如拔网线，TCP的FIN消息来不及发送，对方收不到断开事件，此时需要心跳来帮助检查连接是否已断开 |
2.0.10以上版本 |
With regards,
Apache Git Services
svn commit: r31951 - /dev/incubator/dubbo/KEYS
Author: huxing Date: Mon Jan 14 02:33:28 2019 New Revision: 31951 Log: Add public gpg KEY Modified: dev/incubator/dubbo/KEYS Modified: dev/incubator/dubbo/KEYS == --- dev/incubator/dubbo/KEYS (original) +++ dev/incubator/dubbo/KEYS Mon Jan 14 02:33:28 2019 @@ -183,3 +183,63 @@ j3LZOuM8D14omM5EQBPwNA+M+QGzkJyKtZ6x8F+i 6kchStVgLtcK8Yg2D69K =u6lK -END PGP PUBLIC KEY BLOCK- + +pub rsa4096 2019-01-13 [SC] + AF1B3C2AC648B9E8C9AC6F26CD69F886A620E8EC +uid [ultimate] Huxing Zhang (CODE SIGNING KEY) +sig 3CD69F886A620E8EC 2019-01-13 Huxing Zhang (CODE SIGNING KEY) +sub rsa4096 2019-01-13 [E] +sig CD69F886A620E8EC 2019-01-13 Huxing Zhang (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +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 +HFe4h9/rb3KlbDNHS3ro +=YDk2 +-END PGP PUBLIC KEY BLOCK-
[incubator-dubbo] Diff for: [GitHub] L-Angel closed pull request #3220: user can set the classloader for load interface #3219
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 4b30bfe101..f19d4e1f25 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -44,13 +44,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
import static org.apache.dubbo.common.utils.NetUtils.isInvalidLocalHost;
@@ -105,7 +99,7 @@
* The interface class of the reference service
*/
private Class interfaceClass;
-
+
/**
* client type
*/
@@ -116,6 +110,11 @@
*/
private String url;
+/**
+ * The classloader for load interface
+ */
+private ClassLoader classLoader;
+
/**
* The method configs
*/
@@ -204,8 +203,7 @@ public void checkAndUpdateSubConfigs() {
interfaceClass = GenericService.class;
} else {
try {
-interfaceClass = Class.forName(interfaceName, true,
Thread.currentThread()
-.getContextClassLoader());
+interfaceClass = Class.forName(interfaceName, true,
classLoader());
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e.getMessage(), e);
}
@@ -226,6 +224,14 @@ public void checkAndUpdateSubConfigs() {
checkRegistryDataConfig();
}
+private ClassLoader classLoader() {
+return Objects.isNull(classLoader) ?
Thread.currentThread().getContextClassLoader() : this.classLoader;
+}
+
+private void setClassLoader(ClassLoader classLoader) {
+this.classLoader = classLoader;
+}
+
public synchronized T get() {
checkAndUpdateSubConfigs();
With regards,
Apache Git Services
[incubator-dubbo] branch master updated: fix wrong word spelling (#3217)
This is an automated email from the ASF dual-hosted git repository.
wangxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 67df884 fix wrong word spelling (#3217)
67df884 is described below
commit 67df8848dcb00f2e8e60cb4f195794cba45d9a68
Author: mimihom <46643402+mimi...@users.noreply.github.com>
AuthorDate: Sun Jan 13 19:40:50 2019 +0800
fix wrong word spelling (#3217)
---
.../src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index bd6e0fb..c7f62f7 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -96,7 +96,7 @@ public abstract class AbstractInterfaceConfig extends
AbstractMethodConfig {
protected String listener;
/**
- * The owner of zhe service providers
+ * The owner of the service providers
*/
protected String owner;
[incubator-dubbo] branch master updated (5298afd -> bb18512)
This is an automated email from the ASF dual-hosted git repository. huxing pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git. from 5298afd Upgrade junt to junit5 (#3149) add bb18512 Format change. No new revisions were added by this update. Summary of changes: .../java/org/apache/dubbo/remoting/telnet/codec/TelnetCodec.java | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-)
[incubator-dubbo-ops] branch login created (now 18ac197)
This is an automated email from the ASF dual-hosted git repository. min pushed a change to branch login in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git. at 18ac197 add login module This branch includes the following new commits: new 18ac197 add login module The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[incubator-dubbo-ops] 01/01: add login module
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch login
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
commit 18ac197ef3e9130b5217670007f522bf6a9d95e7
Author: nzomkxia
AuthorDate: Sun Jan 13 17:08:49 2019 +0800
add login module
---
.../org/apache/dubbo/admin/common/LoginFilter.java | 224 +
.../org/apache/dubbo/admin/model/domain/User.java | 2 +-
.../apache/dubbo/admin/service/UserService.java| 52 +
.../dubbo/admin/service/impl/UserServiceImpl.java | 139 +
.../src/components/public/Toolbar.vue | 109 +-
5 files changed, 480 insertions(+), 46 deletions(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/LoginFilter.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/LoginFilter.java
new file mode 100644
index 000..dd5a3d7
--- /dev/null
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/LoginFilter.java
@@ -0,0 +1,224 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dubbo.admin.common;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.dubbo.admin.common.util.CoderUtil;
+import org.apache.dubbo.admin.common.util.Constants;
+import org.apache.dubbo.admin.model.domain.User;
+import org.apache.dubbo.admin.service.UserService;
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class LoginFilter implements Filter {
+private static final Logger logger =
LoggerFactory.getLogger(LoginFilter.class);
+private static Pattern PARAMETER_PATTERN =
Pattern.compile("(\\w+)=[\"]?([^,\"]+)[\"]?[,]?\\s*");
+private static final String BASIC_CHALLENGE = "Basic";
+private static final String DIGEST_CHALLENGE = "Digest";
+private static final String CHALLENGE = BASIC_CHALLENGE;
+private static final String REALM = User.REALM;
+
+@Autowired
+private UserService userService;
+private String logout = "/api/dev/logout";
+private String logoutCookie = "logout";
+
+
+
+static Map parseParameters(String query) {
+Matcher matcher = PARAMETER_PATTERN.matcher(query);
+Map map = new HashMap();
+while (matcher.find()) {
+String key = matcher.group(1);
+String value = matcher.group(2);
+map.put(key, value);
+}
+return map;
+}
+
+static byte[] readToBytes(InputStream in) throws IOException {
+byte[] buf = new byte[in.available()];
+in.read(buf);
+return buf;
+}
+
+@Override
+public void init(FilterConfig filterConfig) throws ServletException {
+
+}
+
+@Override
+public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain)
+throws IOException, ServletException {
+
+HttpServletRequest req = (HttpServletRequest)request;
+HttpServletResponse resp = (HttpServletResponse) response;
+if (logger.isInfoEnabled()) {
+logger.info("AuthorizationValve of uri: " + req.getRequestURI());
+}
+String uri = req.getRequestURI();
+String contextPath = req.getContextPath();
+if (contextPath != null && contextPath.length() > 0 &&
!"/".equals(contextPath)) {
+uri = uri.substring(contextPath.length());
+}
+if (uri.equals(logout)) {
+if (!isLogout(req)) {
+setLogout(true, resp);
+showLoginForm(resp);
+} else {
+setLogout(false, resp);
+//resp.sendRedirect(contextPath == null ||
contextPath.length() == 0 ? "/" : contextPath);
+
[incubator-dubbo-ops] branch develop updated: change util class
This is an automated email from the ASF dual-hosted git repository.
min pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo-ops.git
The following commit(s) were added to refs/heads/develop by this push:
new 6e28c17 change util class
6e28c17 is described below
commit 6e28c1753dd1ab189daf0937cffd5c98eaeb6c90
Author: nzomkxia
AuthorDate: Sun Jan 13 17:06:17 2019 +0800
change util class
---
.../common/util/{MD5Util.java => CoderUtil.java} | 19 +++
.../org/apache/dubbo/admin/config/ConfigCenter.java | 10 +-
.../registry/config/impl/ApolloConfiguration.java| 10 +-
.../dubbo/admin/service/RegistryServerSync.java | 4 ++--
.../src/main/resources/application.properties| 20 ++--
5 files changed, 37 insertions(+), 26 deletions(-)
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/MD5Util.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/CoderUtil.java
similarity index 82%
rename from
dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/MD5Util.java
rename to
dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/CoderUtil.java
index ad01650..1245168 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/MD5Util.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/common/util/CoderUtil.java
@@ -17,15 +17,16 @@
package org.apache.dubbo.admin.common.util;
+import org.apache.dubbo.common.io.Bytes;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-public class MD5Util {
+public class CoderUtil {
-private static final Logger logger =
LoggerFactory.getLogger(MD5Util.class);
+private static final Logger logger =
LoggerFactory.getLogger(CoderUtil.class);
private static MessageDigest md;
private static final char[] hexCode = "0123456789ABCDEF".toCharArray();
@@ -55,6 +56,16 @@ public class MD5Util {
return hash;
}
+public static String MD5_32bit(byte[] input) {
+if (input == null || input.length == 0) {
+return null;
+}
+md.update(input);
+byte[] digest = md.digest();
+String hash = convertToString(digest);
+return hash;
+}
+
private static String convertToString(byte[] data) {
StringBuilder r = new StringBuilder(data.length * 2);
for (byte b : data) {
@@ -64,7 +75,7 @@ public class MD5Util {
return r.toString();
}
-public static void main(String[] args) {
-System.out.println(MD5_16bit("fwjioejfiowejfiowjfiwfjowejfei"));
+public static String decodeBase64(String source) {
+return new String(Bytes.base642bytes(source));
}
}
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
index a3c6405..a9c088d 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
@@ -41,16 +41,16 @@ import java.util.Arrays;
public class ConfigCenter {
-@Value("${dubbo.config-center:}")
+@Value("${admin.config-center:}")
private String configCenter;
-@Value("${dubbo.config-center.username:}")
+@Value("${admin.config-center.username:}")
private String username;
-@Value("${dubbo.config-center.password:}")
+@Value("${admin.config-center.password:}")
private String password;
-@Value("${dubbo.registry.address:}")
+@Value("${admin.registry.address:}")
private String registryAddress;
-@Value("${dubbo.registry.group:}")
+@Value("${admin.registry.group:}")
private String group;
private static String globalConfigPath = "config/dubbo/dubbo.properties";
diff --git
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/config/impl/ApolloConfiguration.java
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/config/impl/ApolloConfiguration.java
index 13d4b2e..e776f2c 100644
---
a/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/config/impl/ApolloConfiguration.java
+++
b/dubbo-admin-backend/src/main/java/org/apache/dubbo/admin/registry/config/impl/ApolloConfiguration.java
@@ -27,19 +27,19 @@ import org.springframework.beans.factory.annotation.Value;
@SPI("apollo")
public class ApolloConfiguration implements GovernanceConfiguration {
-@Value("${dubbo.apollo.token}")
+@Value("${admin.apollo.token}")
private String token;
-@Value("${dubbo.apollo.cluster}")
+@Value("${admin.apollo.cluster}")
private String cluster;
-@Value("${dubbo.apollo.namespace}")
+
