adjustment code

Author: zhufuyi

cmd/protoc-gen-go-rpc-tmpl/internal/generate/service/template.go

@@ -407,7 +407,11 @@ func Test_service_{{.LowerName}}_benchmark(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-	host := fmt.Sprintf("127.0.0.1:%d", config.Get().Grpc.Port)
+	if len(config.Get().GrpcClient) == 0 {
+		t.Error("grpcClient is not set in serverNameExample.yml")
+		return
+	}
+	host := fmt.Sprintf("%s:%d", config.Get().GrpcClient[0].Host, config.Get().GrpcClient[0].Port)
 	protoFile := configs.Path("../api/serverNameExample/v1/{{.ProtoName}}")
 	// If third-party dependencies are missing during the press test,
 	// copy them to the project's third_party directory.

internal/routers/userExample_router.go

@@ -43,15 +43,15 @@ func userExampleServiceRouter(
 		groupPathMiddlewares,
 		singlePathMiddlewares,
 		iService,
-		serverNameExampleV1.WithUserExampleRPCResponse(),
 		serverNameExampleV1.WithUserExampleLogger(logger.Get()),
+		serverNameExampleV1.WithUserExampleRPCResponse(),
+		serverNameExampleV1.WithUserExampleWrapCtx(fn),
 		serverNameExampleV1.WithUserExampleRPCStatusToHTTPCode(
 		// Set some error codes to standard http return codes,
 		// by default there is already ecode.StatusInternalServerError and ecode.StatusServiceUnavailable
 		// example:
 		// 	ecode.StatusUnimplemented, ecode.StatusAborted,
 		),
-		serverNameExampleV1.WithUserExampleWrapCtx(fn),
 	)
 }
 

internal/service/service_test.go

@@ -44,16 +44,20 @@ func getRPCClientConnForTest(grpcClient ...config.GrpcClient) *grpc.ClientConn {
 	var grpcClientCfg config.GrpcClient
 
 	if len(grpcClient) == 0 {
-		// default config from configuration file serverNameExample.yml
-		grpcClientCfg = config.GrpcClient{
-			Host: config.Get().App.Host,
-			Port: config.Get().Grpc.Port,
-			// If RegistryDiscoveryType is not empty, service discovery is used, and Host and Port values are invalid
-			RegistryDiscoveryType: config.Get().App.RegistryDiscoveryType, // supports consul, etcd and nacos
-			Name:                  config.Get().App.Name,
-		}
-		if grpcClientCfg.RegistryDiscoveryType != "" {
-			grpcClientCfg.EnableLoadBalance = true
+		// the default priority is to use the GrpcClient's 0th grpc server address
+		if len(config.Get().GrpcClient) > 0 {
+			grpcClientCfg = config.Get().GrpcClient[0]
+		} else {
+			grpcClientCfg = config.GrpcClient{
+				Host: config.Get().App.Host,
+				Port: config.Get().Grpc.Port,
+				// If RegistryDiscoveryType is not empty, service discovery is used, and Host and Port values are invalid
+				RegistryDiscoveryType: config.Get().App.RegistryDiscoveryType, // supports consul, etcd and nacos
+				Name:                  config.Get().App.Name,
+			}
+			if grpcClientCfg.RegistryDiscoveryType != "" {
+				grpcClientCfg.EnableLoadBalance = true
+			}
 		}
 	} else {
 		// custom config

internal/service/userExample_client_test.go

@@ -187,7 +187,11 @@ func Test_service_userExample_benchmark(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-	host := fmt.Sprintf("127.0.0.1:%d", config.Get().Grpc.Port)
+	if len(config.Get().GrpcClient) == 0 {
+		t.Error("grpcClient is not set in serverNameExample.yml")
+		return
+	}
+	host := fmt.Sprintf("%s:%d", config.Get().GrpcClient[0].Host, config.Get().GrpcClient[0].Port)
 	protoFile := configs.Path("../api/serverNameExample/v1/userExample.proto")
 	// If third-party dependencies are missing during the press test,
 	// copy them to the project's third_party directory.

internal/service/userExample_client_test.go.mgo

@@ -187,7 +187,11 @@ func Test_service_userExample_benchmark(t *testing.T) {
 	if err != nil {
 		panic(err)
 	}
-	host := fmt.Sprintf("127.0.0.1:%d", config.Get().Grpc.Port)
+	if len(config.Get().GrpcClient) == 0 {
+		t.Error("grpcClient is not set in serverNameExample.yml")
+		return
+	}
+	host := fmt.Sprintf("%s:%d", config.Get().GrpcClient[0].Host, config.Get().GrpcClient[0].Port)
 	protoFile := configs.Path("../api/serverNameExample/v1/userExample.proto")
 	// If third-party dependencies are missing during the press test,
 	// copy them to the project's third_party directory.

pkg/grpc/benchmark/benchmark.go

@@ -116,6 +116,6 @@ func (b *bench) saveReport(callMethod string, report *runner.Report) error {
 		Report: report,
 	}
 
-	fmt.Printf("\nend of performance pressure testing api '%s', copy the report file path to your browser to view,\nreport file: %s\n\n", callMethod, outputFile)
+	fmt.Printf("\nperformance testing of api '%s' is now complete, copy the report file path to your browser to view,\nreport file: %s\n\n", callMethod, outputFile)
 	return rp.Print("html")
 }