From 0ea1e3a0a9ad8a76f75f1a45a5d16ae98f14ce4b Mon Sep 17 00:00:00 2001
From: aliiohs <rzy1107@163.com>
Date: Thu, 27 Jun 2019 20:46:36 +0800
Subject: [PATCH] fix
---
.gitignore | 2 +-
cluster/router.go | 2 +-
cluster/router/condition_router.go | 4 ++--
cluster/router/condition_router_test.go | 12 ++++++------
cluster/router/router_factory.go | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6e2013d1b..0b3673bf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,4 @@ classes
vendor/
logs/
-
+.vscode/
diff --git a/cluster/router.go b/cluster/router.go
index 30771fcfc..54a196955 100644
--- a/cluster/router.go
+++ b/cluster/router.go
@@ -25,7 +25,7 @@ import (
// Extension - Router
type RouterFactory interface {
- Router(common.URL) (Router, error)
+ Router(*common.URL) (Router, error)
}
type Router interface {
diff --git a/cluster/router/condition_router.go b/cluster/router/condition_router.go
index b5f8551e9..3797782e9 100644
--- a/cluster/router/condition_router.go
+++ b/cluster/router/condition_router.go
@@ -40,14 +40,14 @@ const (
//ConditionRouter condition router struct
type ConditionRouter struct {
Pattern string
- Url common.URL
+ Url *common.URL
Priority int64
Force bool
WhenCondition map[string]MatchPair
ThenCondition map[string]MatchPair
}
-func newConditionRouter(url common.URL) (*ConditionRouter, error) {
+func newConditionRouter(url *common.URL) (*ConditionRouter, error) {
var (
whenRule string
thenRule string
diff --git a/cluster/router/condition_router_test.go b/cluster/router/condition_router_test.go
index d24e0ec86..e60cda317 100644
--- a/cluster/router/condition_router_test.go
+++ b/cluster/router/condition_router_test.go
@@ -54,24 +54,24 @@ func (bi *MockInvoker) GetUrl() common.URL {
return bi.url
}
-func getRouteUrl(rule string) common.URL {
+func getRouteUrl(rule string) *common.URL {
url, _ := common.NewURL(context.TODO(), "condition://0.0.0.0/com.foo.BarService")
url.AddParam("rule", rule)
url.AddParam("force", "true")
- return url
+ return &url
}
-func getRouteUrlWithForce(rule, force string) common.URL {
+func getRouteUrlWithForce(rule, force string) *common.URL {
url, _ := common.NewURL(context.TODO(), "condition://0.0.0.0/com.foo.BarService")
url.AddParam("rule", rule)
url.AddParam("force", force)
- return url
+ return &url
}
-func getRouteUrlWithNoForce(rule string) common.URL {
+func getRouteUrlWithNoForce(rule string) *common.URL {
url, _ := common.NewURL(context.TODO(), "condition://0.0.0.0/com.foo.BarService")
url.AddParam("rule", rule)
- return url
+ return &url
}
func (bi *MockInvoker) IsAvailable() bool {
diff --git a/cluster/router/router_factory.go b/cluster/router/router_factory.go
index f54042ae9..a9794cb88 100644
--- a/cluster/router/router_factory.go
+++ b/cluster/router/router_factory.go
@@ -32,6 +32,6 @@ type ConditionRouterFactory struct{}
func NewConditionRouterFactory() cluster.RouterFactory {
return ConditionRouterFactory{}
}
-func (c ConditionRouterFactory) Router(url common.URL) (cluster.Router, error) {
+func (c ConditionRouterFactory) Router(url *common.URL) (cluster.Router, error) {
return newConditionRouter(url)
}
--
GitLab