refactor(gRPC): update go proto file

appleboy · Nov 9, 2022 · 8b4424c · 8b4424c
1 parent e13a05b
commit 8b4424c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/Makefile b/Makefile
@@ -12,6 +12,9 @@ GOFILES := $(shell find . -name "*.go" -type f)
 TAGS ?= sqlite
 LDFLAGS ?= -X 'main.Version=$(VERSION)'
 
+PROTOC_GEN_GO=v1.28
+PROTOC_GEN_GO_GRPC=v1.2
+
 ifneq ($(shell uname), Darwin)
 	EXTLDFLAGS = -extldflags "-static" $(null)
 else
@@ -163,6 +166,11 @@ clean:
 	find . -name *.db -delete
 	-rm -rf release dist .cover
 
+.PHONY: proto_install
+proto_install:
+	$(GO) install google.golang.org/protobuf/cmd/protoc-gen-go@$(PROTOC_GEN_GO)
+	$(GO) install google.golang.org/grpc/cmd/protoc-gen-go-grpc@$(PROTOC_GEN_GO_GRPC)
+
 generate_proto_js:
 	npm install grpc-tools
 	protoc -I rpc/proto rpc/proto/gorush.proto --js_out=import_style=commonjs,binary:rpc/example/node/ --grpc_out=rpc/example/node/ --plugin=protoc-gen-grpc="node_modules/.bin/grpc_tools_node_protoc_plugin"

diff --git a/rpc/proto/gorush.pb.go b/rpc/proto/gorush.pb.go
diff --git a/rpc/proto/gorush.proto b/rpc/proto/gorush.proto
@@ -2,8 +2,7 @@ syntax = "proto3";
 import "google/protobuf/struct.proto";
 
 package proto;
-
-// option go_package = "./;proto";
+option go_package = "./;proto";
 
 message Alert {
   string title = 1;

diff --git a/rpc/proto/gorush_grpc.pb.go b/rpc/proto/gorush_grpc.pb.go