From b1a19ffba7a9f57f8717b5bf8229f7c198a9f258 Mon Sep 17 00:00:00 2001 From: "daniel.w" Date: Sun, 25 Aug 2024 22:07:24 +0800 Subject: [PATCH] fix proto name --- .gitignore | 5 +++-- Makefile | 2 +- etc/{service.example.yaml => member.example.yaml} | 0 generate/protobuf/{service.proto => member.proto} | 0 internal/server/account/account_server.go | 2 +- service.go => member.go | 7 +++---- 6 files changed, 8 insertions(+), 8 deletions(-) rename etc/{service.example.yaml => member.example.yaml} (100%) rename generate/protobuf/{service.proto => member.proto} (100%) rename service.go => member.go (82%) diff --git a/.gitignore b/.gitignore index 0a56a16..ffc894c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,5 +2,6 @@ go.sum account/ gen_result/ -etc/service.yaml -client/ \ No newline at end of file +etc/member.yaml +client/ +.DS_Store \ No newline at end of file diff --git a/Makefile b/Makefile index bb182f6..f891d30 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ fmt: # 格式優化 .PHONY: gen-rpc gen-rpc: # 建立 rpc code - goctl rpc protoc ./generate/protobuf/service.proto -m --style=$(GO_ZERO_STYLE) --go_out=./gen_result/pb --go-grpc_out=./gen_result/pb --zrpc_out=. + goctl rpc protoc ./generate/protobuf/member.proto -m --style=$(GO_ZERO_STYLE) --go_out=./gen_result/pb --go-grpc_out=./gen_result/pb --zrpc_out=. go mod tidy @echo "Generate core-api files successfully" diff --git a/etc/service.example.yaml b/etc/member.example.yaml similarity index 100% rename from etc/service.example.yaml rename to etc/member.example.yaml diff --git a/generate/protobuf/service.proto b/generate/protobuf/member.proto similarity index 100% rename from generate/protobuf/service.proto rename to generate/protobuf/member.proto diff --git a/internal/server/account/account_server.go b/internal/server/account/account_server.go index 254a7df..281a47a 100644 --- a/internal/server/account/account_server.go +++ b/internal/server/account/account_server.go @@ -1,5 +1,5 @@ // Code generated by goctl. DO NOT EDIT. -// Source: service.proto +// Source: member.proto package server diff --git a/service.go b/member.go similarity index 82% rename from service.go rename to member.go index f6a8cc9..2bde2b7 100644 --- a/service.go +++ b/member.go @@ -2,8 +2,7 @@ package main import ( "flag" - - "github.com/zeromicro/go-zero/core/logx" + "fmt" "app-cloudep-member-server/gen_result/pb/member" "app-cloudep-member-server/internal/config" @@ -17,7 +16,7 @@ import ( "google.golang.org/grpc/reflection" ) -var configFile = flag.String("f", "etc/service.yaml", "the config file") +var configFile = flag.String("f", "etc/member.yaml", "the config file") func main() { flag.Parse() @@ -35,6 +34,6 @@ func main() { }) defer s.Stop() - logx.Info("Starting rpc server at %s...\n", c.ListenOn) + fmt.Printf("Starting rpc server at %s...\n", c.ListenOn) s.Start() }