fix v0.1.2

mengdj · Jul 1, 2023 · 6446d72 · 6446d72
1 parent 76941b5
commit 6446d72
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/examples/test/etc/test_api.yaml b/examples/test/etc/test_api.yaml
@@ -18,7 +18,7 @@ HelloDiscoverConf:
     InsecureSkipVerify: true
   TLS: false
   Hosts:
-    - "192.168.10.30:7000"
+    #- "192.168.10.30:7000"
     - "192.168.10.30:7001"
   Resolver: endpoint
   Transfer:

diff --git a/examples/test/internal/logic/hello/hello_logic.go b/examples/test/internal/logic/hello/hello_logic.go
@@ -2,6 +2,8 @@ package hello
 
 import (
 	"context"
+	"github.com/mengdj/goctl-rest-client/examples/exa1/client"
+	"github.com/mengdj/goctl-rest-client/examples/exa1/client/exa"
 	"github.com/mengdj/goctl-rest-client/examples/test/internal/svc"
 	"github.com/mengdj/goctl-rest-client/examples/test/internal/types"
 
@@ -12,16 +14,26 @@ type HelloLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
+	exac   exa.Client
 }
 
 func NewHelloLogic(ctx context.Context, svcCtx *svc.ServiceContext) *HelloLogic {
 	return &HelloLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
 		svcCtx: svcCtx,
+		exac:   exa.MustClient(svcCtx.Config.HelloDiscoverConf),
 	}
 }
 
 func (l *HelloLogic) Hello(req *types.HelloRequest) (*types.Response, error) {
+	resp, err := l.exac.Hello(l.ctx, &client.HelloRequest{
+		Msg: "hello",
+	})
+	if nil != err {
+		logx.Error("请求错误", err)
+	} else {
+		logx.Info(resp)
+	}
 	return nil, nil
 }
diff --git a/factory/client.go b/factory/client.go
@@ -8,6 +8,7 @@ package factory
 
 import (
 	"context"
+	"fmt"
 	"github.com/google/uuid"
 	"github.com/mengdj/goctl-rest-client/conf"
 	"github.com/mengdj/goctl-rest-client/factory/rest"
@@ -111,6 +112,7 @@ func (f *restDiscoverClient) Invoke(ctx context.Context, method string, path str
 		host = ""
 		err  error
 		urls strings.Builder
+		tar  string
 	)
 	if host, err = f.subscriber.GetHost(); nil == err {
 		urls.WriteString(f.subscriber.Scheme())
@@ -123,15 +125,15 @@ func (f *restDiscoverClient) Invoke(ctx context.Context, method string, path str
 		urls.WriteString(f.contextPath)
 		urls.WriteString(path)
 	}
-	//execute
+	tar = urls.String()
 	if _, err = f.service.Do(
 		ctx,
 		method,
-		urls.String(),
+		tar,
 		data,
 		result,
 	); nil != err {
-		return err
+		return fmt.Errorf("%s(%s)", tar, err.Error())
 	}
 	return nil
 }