Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,28 @@ import (

import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/client"
_ "dubbo.apache.org/dubbo-go/v3/imports"
)

var grpcGreeterImpl = new(api.GreeterClientImpl)

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yaml
func main() {
config.SetConsumerService(grpcGreeterImpl)
if err := config.Load(); err != nil {
cli, err := client.NewClient(
client.WithClientURL("tri://localhost:20000"),
)
if err != nil {
panic(err)
}

greeterClient, err := api.NewGreeterClient(cli)
if err != nil {
panic(err)
}

logger.Info("start to test dubbo")
req := &api.HelloRequest{
Name: "laurence",
}
reply, err := grpcGreeterImpl.SayHello(context.Background(), req)
reply, err := greeterClient.SayHello(context.Background(), req)
if err != nil {
logger.Error(err)
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import (

import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/server"
"dubbo.apache.org/dubbo-go/v3/protocol"
_ "dubbo.apache.org/dubbo-go/v3/imports"
)

Expand All @@ -40,11 +41,22 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (*
return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
}

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-server/conf/dubbogo.yaml
func main() {
config.SetProviderService(&GreeterProvider{})
if err := config.Load(); err != nil {
srv, err := server.NewServer(
server.WithServerProtocol(
protocol.WithPort(20000),
protocol.WithTriple(),
),
)
if err != nil {
panic(err)
}

if err := api.RegisterGreeterServer(srv, &GreeterProvider{}); err != nil {
panic(err)
}

if err := srv.Serve(); err != nil {
panic(err)
}
select {}
}

This file was deleted.

16 changes: 9 additions & 7 deletions tools/dubbogo-cli/generator/sample/gen_c_conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,12 @@ dubbo:
interface: "" # read from pb`
)

func init() {
fileMap["clientConfigFile"] = &fileGenerator{
path: "./go-client/conf",
file: "dubbogo.yaml",
context: clientConfigFile,
}
}
// Config files are no longer needed in the new config-free pattern
// The client now uses programmatic configuration via client.NewClient()
// func init() {
// fileMap["clientConfigFile"] = &fileGenerator{
// path: "./go-client/conf",
// file: "dubbogo.yaml",
// context: clientConfigFile,
// }
// }
18 changes: 11 additions & 7 deletions tools/dubbogo-cli/generator/sample/gen_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,28 @@ import (

import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/client"
_ "dubbo.apache.org/dubbo-go/v3/imports"
)

var grpcGreeterImpl = new(api.GreeterClientImpl)

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-client/conf/dubbogo.yaml
func main() {
config.SetConsumerService(grpcGreeterImpl)
if err := config.Load(); err != nil {
cli, err := client.NewClient(
client.WithClientURL("tri://localhost:20000"),
)
if err != nil {
panic(err)
}

greeterClient, err := api.NewGreeterClient(cli)
if err != nil {
panic(err)
}

logger.Info("start to test dubbo")
req := &api.HelloRequest{
Name: "laurence",
}
reply, err := grpcGreeterImpl.SayHello(context.Background(), req)
reply, err := greeterClient.SayHello(context.Background(), req)
if err != nil {
logger.Error(err)
}
Expand Down
16 changes: 9 additions & 7 deletions tools/dubbogo-cli/generator/sample/gen_s_conf.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ dubbo:
interface: "" # read from pb`
)

func init() {
fileMap["srvConfGenerator"] = &fileGenerator{
path: "./go-server/conf",
file: "dubbogo.yaml",
context: serverConfigFile,
}
}
// Config files are no longer needed in the new config-free pattern
// The server now uses programmatic configuration via server.NewServer()
// func init() {
// fileMap["srvConfGenerator"] = &fileGenerator{
// path: "./go-server/conf",
// file: "dubbogo.yaml",
// context: serverConfigFile,
// }
// }
22 changes: 17 additions & 5 deletions tools/dubbogo-cli/generator/sample/gen_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ import (

import (
"dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/server"
"dubbo.apache.org/dubbo-go/v3/protocol"
_ "dubbo.apache.org/dubbo-go/v3/imports"
)

Expand All @@ -43,13 +44,24 @@ func (s *GreeterProvider) SayHello(ctx context.Context, in *api.HelloRequest) (*
return &api.User{Name: "Hello " + in.Name, Id: "12345", Age: 21}, nil
}

// export DUBBO_GO_CONFIG_PATH= PATH_TO_SAMPLES/helloworld/go-server/conf/dubbogo.yaml
func main() {
config.SetProviderService(&GreeterProvider{})
if err := config.Load(); err != nil {
srv, err := server.NewServer(
server.WithServerProtocol(
protocol.WithPort(20000),
protocol.WithTriple(),
),
)
if err != nil {
panic(err)
}

if err := api.RegisterGreeterServer(srv, &GreeterProvider{}); err != nil {
panic(err)
}

if err := srv.Serve(); err != nil {
panic(err)
}
select {}
}
`
)
Expand Down
Loading