From a560c3c5e7151e1e9047cc8d074314fb51847891 Mon Sep 17 00:00:00 2001
From: AlexStocks <alexstocks@foxmail.com>
Date: Wed, 14 Aug 2019 13:03:41 +0800
Subject: [PATCH] Rem: version; Mod: translate chinese to english
---
registry/zookeeper/registry.go | 8 +++++---
version/version.go | 24 ------------------------
2 files changed, 5 insertions(+), 27 deletions(-)
delete mode 100644 version/version.go
diff --git a/registry/zookeeper/registry.go b/registry/zookeeper/registry.go
index 9ce3ee580..003ee2940 100644
--- a/registry/zookeeper/registry.go
+++ b/registry/zookeeper/registry.go
@@ -232,8 +232,9 @@ func (r *zkRegistry) Register(conf common.URL) error {
// Check if the service has been registered
r.cltLock.Lock()
- // 娉ㄦ剰姝ゅ涓巆onsumerZookeeperRegistry鐨勫樊寮傦紝consumer鐢ㄧ殑鏄痗onf.Path锛�
- // 鍥犱负consumer瑕佹彁渚泈atch鍔熻兘缁檚elector浣跨敤, provider鍏佽娉ㄥ唽鍚屼竴涓猻ervice鐨勫涓猤roup or version
+ // Note the difference between consumer and consumerZookeeperRegistry (consumer use conf.Path).
+ // Because the consumer wants to provide monitoring functions for the selector,
+ // the provider allows multiple groups or versions of the same service to be registered.
_, ok = r.services[conf.Key()]
r.cltLock.Unlock()
if ok {
@@ -298,7 +299,8 @@ func (r *zkRegistry) register(c common.URL) error {
}
params.Add("anyhost", "true")
- // dubbo java consumer鏉ュ惎鍔ㄦ壘provider url鏃讹紝鍥犱负category涓嶅尮閰嶏紝浼氭壘涓嶅埌provider锛屽鑷碿onsumer鍚姩涓嶄簡,鎵€浠ヤ娇鐢╟onsumers&providers
+ // Dubbo java consumer to start looking for the provider url,because the category does not match,
+ // the provider will not find, causing the consumer can not start, so we use consumers.
// DubboRole = [...]string{"consumer", "", "", "provider"}
// params.Add("category", (RoleType(PROVIDER)).Role())
params.Add("category", (common.RoleType(common.PROVIDER)).String())
diff --git a/version/version.go b/version/version.go
deleted file mode 100644
index b9a076e78..000000000
--- a/version/version.go
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * 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 version
-
-const (
- Version = "2.6.0"
- Name = "dubbogo"
- DATE = "2019/05/06"
-)
--
GitLab