Merge remote-tracking branch 'origin/feature/addRouter' into feature/addRouter

cluster/router/condition/listenable_router.go

@@ -19,7 +19,6 @@ package condition
 
 import (
 	"fmt"
-	"github.com/apache/dubbo-go/common/constant"
 )
 
 import (
@@ -29,6 +28,7 @@ import (
 import (
 	"github.com/apache/dubbo-go/common"
 	"github.com/apache/dubbo-go/common/config"
+	"github.com/apache/dubbo-go/common/constant"
 	"github.com/apache/dubbo-go/common/logger"
 	"github.com/apache/dubbo-go/config_center"
 	"github.com/apache/dubbo-go/protocol"

registry/directory/directory_test.go

@@ -107,7 +107,7 @@ func TestSubscribe_Group(t *testing.T) {
 func Test_Destroy(t *testing.T) {
 	registryDirectory, _ := normalRegistryDir()
 
-	time.Sleep(4e9)
+	time.Sleep(3e9)
 	assert.Len(t, registryDirectory.cacheInvokers, 3)
 	assert.Equal(t, true, registryDirectory.IsAvailable())