diff --git a/cluster/directory/base_directory.go b/cluster/directory/base_directory.go index 634cee4263a8c477c5ddba494d62f74d15093323..7e1563a8310bbed1739d5f1856c2a12e7c762ed4 100644 --- a/cluster/directory/base_directory.go +++ b/cluster/directory/base_directory.go @@ -116,14 +116,11 @@ func (dir *BaseDirectory) isProperRouter(url *common.URL) bool { if serviceKey == "" { serviceKey = dir.GetUrl().SubURL.ServiceKey() } - if len(app) > 0 { - if app != dir.GetUrl().GetParam(constant.APPLICATION_KEY, "") { - return false - } - } else { - if url.ServiceKey() != serviceKey { - return false - } + if len(app) > 0 && app != dir.GetUrl().GetParam(constant.APPLICATION_KEY, "") { + return false + } + if url.ServiceKey() != serviceKey { + return false } return true } diff --git a/cluster/router/condition/router.go b/cluster/router/condition/router.go index 6be3a4fc0a9e5c1174f61e52fe49e3b4476cd1a9..800293da6c59f07a4bff1b6b832f482273394cec 100644 --- a/cluster/router/condition/router.go +++ b/cluster/router/condition/router.go @@ -117,13 +117,11 @@ func NewConditionRouter(url *common.URL) (*ConditionRouter, error) { } router.url = url - var defaultPriority int64 + var defaultPriority int64 = 0 if url.GetParam(constant.APPLICATION_KEY, "") != "" { defaultPriority = 150 } else if url.GetParam(constant.INTERFACE_KEY, "") != "" { defaultPriority = 140 - } else { - defaultPriority = 0 } router.priority = url.GetParamInt(constant.RouterPriority, defaultPriority) router.Force = url.GetParamBool(constant.RouterForce, false)