working commit

pkg/servcli/gethello.go

@@ -11,21 +11,30 @@ import (
 	"net/http"
 	"strconv"
 
+	"mproxy/app/handler"
 	"mproxy/app/servoper"
 )
 
-func (cli *Client) GetHello(ctx context.Context, rawpath string) error {
+func (cli *Client) GetHello(ctx context.Context, rawpath string) (servoper.GetHelloResult, error) {
 	var err error
+
 	req := servoper.GetHelloParams{}
+	res := servoper.GetHelloResult{}
 	reqdata, err := json.Marshal(req)
 	if err != nil {
-		return err
+		return res, err
 	}
-	_, err = cli.DoCall(ctx, rawpath, reqdata)
+	resdata, err := cli.DoCall(ctx, rawpath, reqdata)
 	if err != nil {
-		return err
+		return res, err
 	}
-	return err
+	response := handler.NewResponse[servoper.GetHelloResult]()
+	err = json.Unmarshal(resdata, &response)
+	if err != nil {
+		return res, err
+	}
+	res = response.Result
+	return res, err
 }
 
 func (cli *Client) DoCall(ctx context.Context, rawpath string, reqdata []byte) ([]byte, error) {
@@ -43,7 +52,7 @@ func (cli *Client) DoCall(ctx context.Context, rawpath string, reqdata []byte) (
 		return res, err
 	}
 	req.Header.Set("User-Agent", cli.userAgent)
-	req.Header.Set("Accept", "*/*")
+	req.Header.Set("Accept", "application/json")
 	resp, err := cli.httpClient.Do(req)
 	if err != nil {
 		return res, err

pkg/servcli/referer.go

@@ -72,7 +72,7 @@ func (ref *Referer) DryRun(yesno bool) {
 }
 
 func (ref *Referer) HelloEP() string {
-	curl := ref.urlobj.JoinPath("/v3/api/service/hello", ref.resource)
+	curl := ref.urlobj.JoinPath("/v3/api/service/hello")
 	return curl.String()
 }