From 4fe6fa30ba25b00ad1eb83193f758f21a6e71ac0 Mon Sep 17 00:00:00 2001
From: YGrylls <910357107@qq.com>
Date: Wed, 31 Jul 2019 16:06:41 +0800
Subject: [PATCH] Change hystrix example directory and modified to follow other
new examples
---
.../with-hystrix-go-client/app/client.go | 2 +-
.../app/example_fallback_filter.go | 0
.../dubbo}/with-hystrix-go-client/app/user.go | 44 +++++++++++++++----
.../with-hystrix-go-client/app/version.go | 0
.../assembly/bin/load.sh | 0
.../assembly/common/app.properties | 0
.../assembly/common/build.sh | 0
.../assembly/linux/dev.sh | 0
.../assembly/linux/release.sh | 0
.../assembly/linux/test.sh | 0
.../assembly/mac/dev.sh | 0
.../assembly/mac/release.sh | 0
.../assembly/mac/test.sh | 0
.../assembly/windows/dev.sh | 0
.../assembly/windows/release.sh | 0
.../assembly/windows/test.sh | 0
.../profiles/dev/client.yml | 0
.../profiles/dev/log.yml | 0
.../profiles/release/client.yml | 0
.../profiles/release/log.yml | 0
.../profiles/test/client.yml | 0
.../profiles/test/log.yml | 0
22 files changed, 37 insertions(+), 9 deletions(-)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/app/client.go (98%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/app/example_fallback_filter.go (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/app/user.go (62%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/app/version.go (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/bin/load.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/common/app.properties (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/common/build.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/linux/dev.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/linux/release.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/linux/test.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/mac/dev.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/mac/release.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/mac/test.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/windows/dev.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/windows/release.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/assembly/windows/test.sh (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/profiles/dev/client.yml (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/profiles/dev/log.yml (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/profiles/release/client.yml (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/profiles/release/log.yml (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/profiles/test/client.yml (100%)
rename examples/{configcenter/zookeeper/jsonrpc => hystrixfilter/dubbo}/with-hystrix-go-client/profiles/test/log.yml (100%)
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/client.go b/examples/hystrixfilter/dubbo/with-hystrix-go-client/app/client.go
similarity index 98%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/client.go
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/app/client.go
index 886fa8920..0d8d7d2ff 100644
--- a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/client.go
+++ b/examples/hystrixfilter/dubbo/with-hystrix-go-client/app/client.go
@@ -27,7 +27,7 @@ import (
)
import (
- "github.com/dubbogo/hessian2"
+ "github.com/apache/dubbo-go-hessian2"
)
import (
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/example_fallback_filter.go b/examples/hystrixfilter/dubbo/with-hystrix-go-client/app/example_fallback_filter.go
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/example_fallback_filter.go
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/app/example_fallback_filter.go
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/user.go b/examples/hystrixfilter/dubbo/with-hystrix-go-client/app/user.go
similarity index 62%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/user.go
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/app/user.go
index 4fcd07176..affa5418a 100644
--- a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/user.go
+++ b/examples/hystrixfilter/dubbo/with-hystrix-go-client/app/user.go
@@ -25,7 +25,7 @@ import (
)
import (
- hessian "github.com/dubbogo/hessian2"
+ hessian "github.com/apache/dubbo-go-hessian2"
)
import (
@@ -34,10 +34,16 @@ import (
type Gender hessian.JavaEnum
-var userProvider = new(UserProvider)
+var (
+ userProvider = new(UserProvider)
+ userProvider1 = new(UserProvider1)
+ userProvider2 = new(UserProvider2)
+)
func init() {
config.SetConsumerService(userProvider)
+ config.SetConsumerService(userProvider1)
+ config.SetConsumerService(userProvider2)
}
const (
@@ -108,14 +114,36 @@ type UserProvider struct {
Echo func(ctx context.Context, req interface{}) (interface{}, error) // Echo represent EchoFilter will be used
}
-func (u *UserProvider) Service() string {
- return "com.ikurento.user.UserProvider"
+func (u *UserProvider) Reference() string {
+ return "UserProvider"
}
-func (u *UserProvider) Version() string {
- return ""
+type UserProvider1 struct {
+ GetUsers func(req []interface{}) ([]interface{}, error)
+ GetErr func(ctx context.Context, req []interface{}, rsp *User) error
+ GetUser func(ctx context.Context, req []interface{}, rsp *User) error
+ GetUser0 func(id string, name string) (User, error)
+ GetUser1 func(ctx context.Context, req []interface{}, rsp *User) error
+ GetUser2 func(ctx context.Context, req []interface{}, rsp *User) error `dubbo:"getUser"`
+ GetUser3 func() error
+ Echo func(ctx context.Context, req interface{}) (interface{}, error) // Echo represent EchoFilter will be used
}
-func (u *UserProvider) Reference() string {
- return "UserProvider"
+func (u *UserProvider1) Reference() string {
+ return "UserProvider1"
+}
+
+type UserProvider2 struct {
+ GetUsers func(req []interface{}) ([]interface{}, error)
+ GetErr func(ctx context.Context, req []interface{}, rsp *User) error
+ GetUser func(ctx context.Context, req []interface{}, rsp *User) error
+ GetUser0 func(id string, name string) (User, error)
+ GetUser1 func(ctx context.Context, req []interface{}, rsp *User) error
+ GetUser2 func(ctx context.Context, req []interface{}, rsp *User) error `dubbo:"getUser"`
+ GetUser3 func() error
+ Echo func(ctx context.Context, req interface{}) (interface{}, error) // Echo represent EchoFilter will be used
+}
+
+func (u *UserProvider2) Reference() string {
+ return "UserProvider2"
}
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/version.go b/examples/hystrixfilter/dubbo/with-hystrix-go-client/app/version.go
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/app/version.go
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/app/version.go
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/bin/load.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/bin/load.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/bin/load.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/bin/load.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/common/app.properties b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/common/app.properties
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/common/app.properties
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/common/app.properties
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/common/build.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/common/build.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/common/build.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/common/build.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/linux/dev.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/linux/dev.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/linux/dev.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/linux/dev.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/linux/release.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/linux/release.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/linux/release.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/linux/release.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/linux/test.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/linux/test.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/linux/test.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/linux/test.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/mac/dev.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/mac/dev.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/mac/dev.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/mac/dev.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/mac/release.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/mac/release.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/mac/release.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/mac/release.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/mac/test.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/mac/test.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/mac/test.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/mac/test.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/windows/dev.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/windows/dev.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/windows/dev.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/windows/dev.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/windows/release.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/windows/release.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/windows/release.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/windows/release.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/windows/test.sh b/examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/windows/test.sh
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/assembly/windows/test.sh
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/assembly/windows/test.sh
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/dev/client.yml b/examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/dev/client.yml
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/dev/client.yml
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/dev/client.yml
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/dev/log.yml b/examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/dev/log.yml
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/dev/log.yml
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/dev/log.yml
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/release/client.yml b/examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/release/client.yml
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/release/client.yml
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/release/client.yml
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/release/log.yml b/examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/release/log.yml
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/release/log.yml
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/release/log.yml
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/test/client.yml b/examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/test/client.yml
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/test/client.yml
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/test/client.yml
diff --git a/examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/test/log.yml b/examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/test/log.yml
similarity index 100%
rename from examples/configcenter/zookeeper/jsonrpc/with-hystrix-go-client/profiles/test/log.yml
rename to examples/hystrixfilter/dubbo/with-hystrix-go-client/profiles/test/log.yml
--
GitLab