From 1dc27ef22e9f792ef17e50234b7fc5b2168aef93 Mon Sep 17 00:00:00 2001 From: shu xian Date: Mon, 19 Aug 2019 11:48:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/middle-practices/micro-client/retry/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/middle-practices/micro-client/retry/README.md b/examples/middle-practices/micro-client/retry/README.md index a6f45d3a..9307cbf8 100644 --- a/examples/middle-practices/micro-client/retry/README.md +++ b/examples/middle-practices/micro-client/retry/README.md @@ -2,9 +2,9 @@ 演示如何使用客户端容错重试 -[客户端](./client.go) -[错误服务端](./FailureServer.go) -[成功服务端](./SuccessServer.go) +- [client.go](./client.go) 客户端 +- [FailureServer.go](./FailureServer.go) 错误服务端 +- [SuccessServer.go](./SuccessServer.go) 成功服务端 ## 运行 From ccab3b6c9c8d2da536cd0d94042186e48702fda9 Mon Sep 17 00:00:00 2001 From: shu xian Date: Mon, 19 Aug 2019 15:43:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- microservice-in-micro/part1/user-srv/main.go | 1 - microservice-in-micro/part1/user-web/main.go | 1 - microservice-in-micro/part2/auth/main.go | 1 - microservice-in-micro/part2/user-srv/main.go | 1 + microservice-in-micro/part2/user-web/main.go | 1 - microservice-in-micro/part3/auth/main.go | 1 + microservice-in-micro/part3/inventory-srv/main.go | 1 - microservice-in-micro/part3/orders-srv/main.go | 1 - microservice-in-micro/part3/orders-web/main.go | 3 +-- microservice-in-micro/part3/payment-srv/main.go | 1 - microservice-in-micro/part3/payment-web/main.go | 1 - microservice-in-micro/part3/user-srv/main.go | 1 + microservice-in-micro/part3/user-web/main.go | 1 + microservice-in-micro/part4/auth/main.go | 1 - microservice-in-micro/part4/inventory-srv/main.go | 1 - microservice-in-micro/part4/orders-srv/main.go | 1 - microservice-in-micro/part4/orders-web/main.go | 3 +-- microservice-in-micro/part4/payment-srv/main.go | 1 - microservice-in-micro/part4/payment-web/main.go | 1 - microservice-in-micro/part4/user-srv/main.go | 1 - microservice-in-micro/part4/user-web/main.go | 1 - microservice-in-micro/part5/auth/main.go | 1 - microservice-in-micro/part5/inventory-srv/main.go | 1 - microservice-in-micro/part5/orders-srv/main.go | 1 - microservice-in-micro/part5/orders-web/main.go | 1 + microservice-in-micro/part5/payment-srv/main.go | 1 - microservice-in-micro/part5/payment-web/main.go | 3 +-- microservice-in-micro/part5/user-srv/main.go | 1 - microservice-in-micro/part5/user-web/main.go | 1 - microservice-in-micro/part6/auth/main.go | 1 - microservice-in-micro/part7/auth/main.go | 1 - microservice-in-micro/part8/auth/main.go | 1 - 32 files changed, 8 insertions(+), 30 deletions(-) diff --git a/microservice-in-micro/part1/user-srv/main.go b/microservice-in-micro/part1/user-srv/main.go index 6074aeeb..248f70cc 100644 --- a/microservice-in-micro/part1/user-srv/main.go +++ b/microservice-in-micro/part1/user-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part1/user-srv/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part1/user-srv/basic/config" diff --git a/microservice-in-micro/part1/user-web/main.go b/microservice-in-micro/part1/user-web/main.go index 08f04b4f..4e577fd8 100644 --- a/microservice-in-micro/part1/user-web/main.go +++ b/microservice-in-micro/part1/user-web/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part1/user-web/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part1/user-web/basic/config" diff --git a/microservice-in-micro/part2/auth/main.go b/microservice-in-micro/part2/auth/main.go index 072ce46d..e9c17a42 100644 --- a/microservice-in-micro/part2/auth/main.go +++ b/microservice-in-micro/part2/auth/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part2/auth/handler" "github.com/micro-in-cn/tutorials/microservice-in-micro/part2/auth/model" diff --git a/microservice-in-micro/part2/user-srv/main.go b/microservice-in-micro/part2/user-srv/main.go index 5fdd87cd..2199cb35 100644 --- a/microservice-in-micro/part2/user-srv/main.go +++ b/microservice-in-micro/part2/user-srv/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/micro-in-cn/tutorials/microservice-in-micro/part2/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part2/basic/config" "github.com/micro-in-cn/tutorials/microservice-in-micro/part2/user-srv/handler" diff --git a/microservice-in-micro/part2/user-web/main.go b/microservice-in-micro/part2/user-web/main.go index 8741dab4..f80f0c61 100644 --- a/microservice-in-micro/part2/user-web/main.go +++ b/microservice-in-micro/part2/user-web/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part2/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part2/basic/config" diff --git a/microservice-in-micro/part3/auth/main.go b/microservice-in-micro/part3/auth/main.go index 66b76d49..b3e38990 100644 --- a/microservice-in-micro/part3/auth/main.go +++ b/microservice-in-micro/part3/auth/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/auth/handler" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/auth/model" s "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/auth/proto/auth" diff --git a/microservice-in-micro/part3/inventory-srv/main.go b/microservice-in-micro/part3/inventory-srv/main.go index 4c7e8a52..478c797d 100644 --- a/microservice-in-micro/part3/inventory-srv/main.go +++ b/microservice-in-micro/part3/inventory-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic/config" diff --git a/microservice-in-micro/part3/orders-srv/main.go b/microservice-in-micro/part3/orders-srv/main.go index c71d5f1e..42632c5c 100644 --- a/microservice-in-micro/part3/orders-srv/main.go +++ b/microservice-in-micro/part3/orders-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic/common" diff --git a/microservice-in-micro/part3/orders-web/main.go b/microservice-in-micro/part3/orders-web/main.go index dd18e606..ed986f93 100644 --- a/microservice-in-micro/part3/orders-web/main.go +++ b/microservice-in-micro/part3/orders-web/main.go @@ -2,8 +2,6 @@ package main import ( "fmt" - "net/http" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic/config" @@ -13,6 +11,7 @@ import ( "github.com/micro/go-micro/registry/consul" "github.com/micro/go-micro/util/log" "github.com/micro/go-micro/web" + "net/http" ) func main() { diff --git a/microservice-in-micro/part3/payment-srv/main.go b/microservice-in-micro/part3/payment-srv/main.go index 4b937723..a666949d 100644 --- a/microservice-in-micro/part3/payment-srv/main.go +++ b/microservice-in-micro/part3/payment-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic/config" diff --git a/microservice-in-micro/part3/payment-web/main.go b/microservice-in-micro/part3/payment-web/main.go index d2cc95f8..9639e921 100644 --- a/microservice-in-micro/part3/payment-web/main.go +++ b/microservice-in-micro/part3/payment-web/main.go @@ -3,7 +3,6 @@ package main import ( "fmt" "net/http" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic/config" diff --git a/microservice-in-micro/part3/user-srv/main.go b/microservice-in-micro/part3/user-srv/main.go index 2753d790..cb5d1a68 100644 --- a/microservice-in-micro/part3/user-srv/main.go +++ b/microservice-in-micro/part3/user-srv/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic/config" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/user-srv/handler" diff --git a/microservice-in-micro/part3/user-web/main.go b/microservice-in-micro/part3/user-web/main.go index d481d78f..634129e4 100644 --- a/microservice-in-micro/part3/user-web/main.go +++ b/microservice-in-micro/part3/user-web/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/basic/config" "github.com/micro-in-cn/tutorials/microservice-in-micro/part3/user-web/handler" diff --git a/microservice-in-micro/part4/auth/main.go b/microservice-in-micro/part4/auth/main.go index c4628c28..64ea2573 100644 --- a/microservice-in-micro/part4/auth/main.go +++ b/microservice-in-micro/part4/auth/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/auth/handler" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/auth/model" diff --git a/microservice-in-micro/part4/inventory-srv/main.go b/microservice-in-micro/part4/inventory-srv/main.go index 619bc22d..959cbc3b 100644 --- a/microservice-in-micro/part4/inventory-srv/main.go +++ b/microservice-in-micro/part4/inventory-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic/common" diff --git a/microservice-in-micro/part4/orders-srv/main.go b/microservice-in-micro/part4/orders-srv/main.go index b66a2ad2..88876d4f 100644 --- a/microservice-in-micro/part4/orders-srv/main.go +++ b/microservice-in-micro/part4/orders-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic/common" diff --git a/microservice-in-micro/part4/orders-web/main.go b/microservice-in-micro/part4/orders-web/main.go index 60aad0ad..3901c338 100644 --- a/microservice-in-micro/part4/orders-web/main.go +++ b/microservice-in-micro/part4/orders-web/main.go @@ -2,8 +2,6 @@ package main import ( "fmt" - "net/http" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic/common" @@ -15,6 +13,7 @@ import ( "github.com/micro/go-micro/util/log" "github.com/micro/go-micro/web" "github.com/micro/go-plugins/config/source/grpc" + "net/http" ) var ( diff --git a/microservice-in-micro/part4/payment-srv/main.go b/microservice-in-micro/part4/payment-srv/main.go index 897e92d5..e00d57a4 100644 --- a/microservice-in-micro/part4/payment-srv/main.go +++ b/microservice-in-micro/part4/payment-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic/common" diff --git a/microservice-in-micro/part4/payment-web/main.go b/microservice-in-micro/part4/payment-web/main.go index bc9492fc..4e211e60 100644 --- a/microservice-in-micro/part4/payment-web/main.go +++ b/microservice-in-micro/part4/payment-web/main.go @@ -3,7 +3,6 @@ package main import ( "fmt" "net/http" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic/common" diff --git a/microservice-in-micro/part4/user-srv/main.go b/microservice-in-micro/part4/user-srv/main.go index 23d9582e..32bc1be3 100644 --- a/microservice-in-micro/part4/user-srv/main.go +++ b/microservice-in-micro/part4/user-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic/common" diff --git a/microservice-in-micro/part4/user-web/main.go b/microservice-in-micro/part4/user-web/main.go index 979e0ed2..bfe8c1fd 100644 --- a/microservice-in-micro/part4/user-web/main.go +++ b/microservice-in-micro/part4/user-web/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part4/basic/common" diff --git a/microservice-in-micro/part5/auth/main.go b/microservice-in-micro/part5/auth/main.go index 39ec5715..0081db85 100644 --- a/microservice-in-micro/part5/auth/main.go +++ b/microservice-in-micro/part5/auth/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/auth/handler" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/auth/model" diff --git a/microservice-in-micro/part5/inventory-srv/main.go b/microservice-in-micro/part5/inventory-srv/main.go index 30ba1ab3..83068b82 100644 --- a/microservice-in-micro/part5/inventory-srv/main.go +++ b/microservice-in-micro/part5/inventory-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/common" diff --git a/microservice-in-micro/part5/orders-srv/main.go b/microservice-in-micro/part5/orders-srv/main.go index 3b185cac..cfc9afce 100644 --- a/microservice-in-micro/part5/orders-srv/main.go +++ b/microservice-in-micro/part5/orders-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/common" diff --git a/microservice-in-micro/part5/orders-web/main.go b/microservice-in-micro/part5/orders-web/main.go index 9ade39a9..2c41ec79 100644 --- a/microservice-in-micro/part5/orders-web/main.go +++ b/microservice-in-micro/part5/orders-web/main.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/common" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/config" diff --git a/microservice-in-micro/part5/payment-srv/main.go b/microservice-in-micro/part5/payment-srv/main.go index 73d90dd4..5e88f3ea 100644 --- a/microservice-in-micro/part5/payment-srv/main.go +++ b/microservice-in-micro/part5/payment-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/common" diff --git a/microservice-in-micro/part5/payment-web/main.go b/microservice-in-micro/part5/payment-web/main.go index ef837b3a..fc12062f 100644 --- a/microservice-in-micro/part5/payment-web/main.go +++ b/microservice-in-micro/part5/payment-web/main.go @@ -2,8 +2,6 @@ package main import ( "fmt" - "net/http" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/common" @@ -15,6 +13,7 @@ import ( "github.com/micro/go-micro/util/log" "github.com/micro/go-micro/web" "github.com/micro/go-plugins/config/source/grpc" + "net/http" ) var ( diff --git a/microservice-in-micro/part5/user-srv/main.go b/microservice-in-micro/part5/user-srv/main.go index 77893706..72a59deb 100644 --- a/microservice-in-micro/part5/user-srv/main.go +++ b/microservice-in-micro/part5/user-srv/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/common" diff --git a/microservice-in-micro/part5/user-web/main.go b/microservice-in-micro/part5/user-web/main.go index 5018b6b1..ffa94411 100644 --- a/microservice-in-micro/part5/user-web/main.go +++ b/microservice-in-micro/part5/user-web/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic" "github.com/micro-in-cn/tutorials/microservice-in-micro/part5/basic/common" diff --git a/microservice-in-micro/part6/auth/main.go b/microservice-in-micro/part6/auth/main.go index 969c2de4..1768243e 100644 --- a/microservice-in-micro/part6/auth/main.go +++ b/microservice-in-micro/part6/auth/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part6/auth/handler" "github.com/micro-in-cn/tutorials/microservice-in-micro/part6/auth/model" diff --git a/microservice-in-micro/part7/auth/main.go b/microservice-in-micro/part7/auth/main.go index c2675f43..dd884e81 100644 --- a/microservice-in-micro/part7/auth/main.go +++ b/microservice-in-micro/part7/auth/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part7/auth/handler" "github.com/micro-in-cn/tutorials/microservice-in-micro/part7/auth/model" diff --git a/microservice-in-micro/part8/auth/main.go b/microservice-in-micro/part8/auth/main.go index d4ebcb0b..f541be83 100644 --- a/microservice-in-micro/part8/auth/main.go +++ b/microservice-in-micro/part8/auth/main.go @@ -2,7 +2,6 @@ package main import ( "fmt" - "time" "github.com/micro-in-cn/tutorials/microservice-in-micro/part8/auth/handler" "github.com/micro-in-cn/tutorials/microservice-in-micro/part8/auth/model"