This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch refactor-with-go
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/refactor-with-go by this push:
new 6a90cb9 add pkg package (#993)
6a90cb9 is described below
commit 6a90cb9ffc7ea2bd6b6c680d2221cc2b8d744ef9
Author: min <[email protected]>
AuthorDate: Fri Feb 24 09:45:58 2023 +0800
add pkg package (#993)
---
dubbo-admin-server/admin.go | 4 ++--
.../{ => pkg}/cache/interface_registry_cache.go | 0
dubbo-admin-server/{ => pkg}/config/address_config.go | 0
dubbo-admin-server/{ => pkg}/config/config.go | 2 +-
dubbo-admin-server/{ => pkg}/constant/const.go | 0
dubbo-admin-server/{ => pkg}/handlers/service.go | 4 ++--
dubbo-admin-server/{ => pkg}/imports/imports.go | 0
.../{ => pkg}/services/registry_service_sync.go | 18 +++++++++---------
dubbo-admin-server/{ => pkg}/util/Tool.go | 0
.../{ => pkg}/util/base_service_metadata.go | 0
dubbo-admin-server/{ => pkg}/util/hash.go | 0
dubbo-admin-server/router/router.go | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dubbo-admin-server/admin.go b/dubbo-admin-server/admin.go
index 70c1dd3..493f9cb 100644
--- a/dubbo-admin-server/admin.go
+++ b/dubbo-admin-server/admin.go
@@ -18,9 +18,9 @@
package main
import (
- "admin/config"
+ "admin/pkg/config"
+ "admin/pkg/services"
"admin/router"
- "admin/services"
)
func main() {
diff --git a/dubbo-admin-server/cache/interface_registry_cache.go
b/dubbo-admin-server/pkg/cache/interface_registry_cache.go
similarity index 100%
rename from dubbo-admin-server/cache/interface_registry_cache.go
rename to dubbo-admin-server/pkg/cache/interface_registry_cache.go
diff --git a/dubbo-admin-server/config/address_config.go
b/dubbo-admin-server/pkg/config/address_config.go
similarity index 100%
rename from dubbo-admin-server/config/address_config.go
rename to dubbo-admin-server/pkg/config/address_config.go
diff --git a/dubbo-admin-server/config/config.go
b/dubbo-admin-server/pkg/config/config.go
similarity index 99%
rename from dubbo-admin-server/config/config.go
rename to dubbo-admin-server/pkg/config/config.go
index 0bbd29c..07a5f3a 100644
--- a/dubbo-admin-server/config/config.go
+++ b/dubbo-admin-server/pkg/config/config.go
@@ -18,8 +18,8 @@
package config
import (
- "admin/constant"
_ "admin/imports"
+ "admin/pkg/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
"dubbo.apache.org/dubbo-go/v3/config_center"
"dubbo.apache.org/dubbo-go/v3/metadata/report"
diff --git a/dubbo-admin-server/constant/const.go
b/dubbo-admin-server/pkg/constant/const.go
similarity index 100%
rename from dubbo-admin-server/constant/const.go
rename to dubbo-admin-server/pkg/constant/const.go
diff --git a/dubbo-admin-server/handlers/service.go
b/dubbo-admin-server/pkg/handlers/service.go
similarity index 96%
rename from dubbo-admin-server/handlers/service.go
rename to dubbo-admin-server/pkg/handlers/service.go
index 2007484..e097cb2 100644
--- a/dubbo-admin-server/handlers/service.go
+++ b/dubbo-admin-server/pkg/handlers/service.go
@@ -18,8 +18,8 @@
package handlers
import (
- "admin/cache"
- "admin/constant"
+ "admin/pkg/cache"
+ "admin/pkg/constant"
"github.com/gin-gonic/gin"
"net/http"
"sync"
diff --git a/dubbo-admin-server/imports/imports.go
b/dubbo-admin-server/pkg/imports/imports.go
similarity index 100%
rename from dubbo-admin-server/imports/imports.go
rename to dubbo-admin-server/pkg/imports/imports.go
diff --git a/dubbo-admin-server/services/registry_service_sync.go
b/dubbo-admin-server/pkg/services/registry_service_sync.go
similarity index 90%
rename from dubbo-admin-server/services/registry_service_sync.go
rename to dubbo-admin-server/pkg/services/registry_service_sync.go
index e338aba..25957b6 100644
--- a/dubbo-admin-server/services/registry_service_sync.go
+++ b/dubbo-admin-server/pkg/services/registry_service_sync.go
@@ -18,9 +18,9 @@
package services
import (
- "admin/cache"
- "admin/constant"
- "admin/util"
+ "admin/pkg/cache"
+ "admin/pkg/constant"
+ util2 "admin/pkg/util"
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/registry"
"net/url"
@@ -80,9 +80,9 @@ func (adminNotifyListener) Notify(event
*registry.ServiceEvent) {
} else {
// iterator services
services.(*sync.Map).Range(func(key,
value interface{}) bool {
- if
util.GetInterface(key.(string)) == getServiceInterface(serviceUrl) &&
- (constant.AnyValue ==
group || group == util.GetGroup(key.(string))) &&
- (constant.AnyValue ==
version || version == util.GetVersion(key.(string))) {
+ if
util2.GetInterface(key.(string)) == getServiceInterface(serviceUrl) &&
+ (constant.AnyValue ==
group || group == util2.GetGroup(key.(string))) &&
+ (constant.AnyValue ==
version || version == util2.GetVersion(key.(string))) {
services.(*sync.Map).Delete(key)
}
return true
@@ -100,7 +100,7 @@ func (adminNotifyListener) Notify(event
*registry.ServiceEvent) {
categories[category] = services
group := serviceUrl.GetParam(constant.GroupKey, "")
version := serviceUrl.GetParam(constant.VersionKey, "")
- service :=
util.BuildServiceKey(getServiceInterface(serviceUrl), group, version)
+ service :=
util2.BuildServiceKey(getServiceInterface(serviceUrl), group, version)
ids, found := services[service]
if !found {
ids = make(map[string]*common.URL)
@@ -109,7 +109,7 @@ func (adminNotifyListener) Notify(event
*registry.ServiceEvent) {
if md5, ok := UrlIdsMapper.Load(serviceUrl.Key()); ok {
ids[md5.(string)] = serviceUrl
} else {
- md5 := util.Md5_16bit(serviceUrl.Key())
+ md5 := util2.Md5_16bit(serviceUrl.Key())
ids[md5] = serviceUrl
UrlIdsMapper.LoadOrStore(serviceUrl.Key(), md5)
}
@@ -123,7 +123,7 @@ func (adminNotifyListener) Notify(event
*registry.ServiceEvent) {
// iterator services key set
services.(*sync.Map).Range(func(key, inner any)
bool {
_, ok := value[key.(string)]
- if util.GetInterface(key.(string)) ==
interfaceName && ok {
+ if util2.GetInterface(key.(string)) ==
interfaceName && ok {
services.(*sync.Map).Delete(key)
}
return true
diff --git a/dubbo-admin-server/util/Tool.go
b/dubbo-admin-server/pkg/util/Tool.go
similarity index 100%
rename from dubbo-admin-server/util/Tool.go
rename to dubbo-admin-server/pkg/util/Tool.go
diff --git a/dubbo-admin-server/util/base_service_metadata.go
b/dubbo-admin-server/pkg/util/base_service_metadata.go
similarity index 100%
rename from dubbo-admin-server/util/base_service_metadata.go
rename to dubbo-admin-server/pkg/util/base_service_metadata.go
diff --git a/dubbo-admin-server/util/hash.go
b/dubbo-admin-server/pkg/util/hash.go
similarity index 100%
rename from dubbo-admin-server/util/hash.go
rename to dubbo-admin-server/pkg/util/hash.go
diff --git a/dubbo-admin-server/router/router.go
b/dubbo-admin-server/router/router.go
index 473fe2c..e2dd997 100644
--- a/dubbo-admin-server/router/router.go
+++ b/dubbo-admin-server/router/router.go
@@ -18,7 +18,7 @@
package router
import (
- "admin/handlers"
+ "admin/pkg/handlers"
"github.com/gin-gonic/gin"
)
