zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: quickstart wrong package when go.mod exists in parent dir (#2048)

Browse Source 
* chore: fix typo

* fix: quickstart in dir with go.mod

* fix: runner failed

* chore: refine code

* chore: simplify quickstart mono
This commit is contained in:
Kevin Wan
2022-06-26 22:37:15 +08:00
committed by GitHub
parent 630dfa0887
commit 555c4ecd1a
11 changed files with 111 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/goctl/quickstart/micro.go
View File

@@ -17,8 +17,7 @@ var (
protocContent string
//go:embed idl/rpc.yaml
rpcEtcContent string
zRPCWorkDir string
zrpcWorkDir string
)
type serviceImpl struct {
@@ -32,12 +31,12 @@ func (s serviceImpl) Start() {
func (s serviceImpl) Stop() {}
func initRPCProto() error {
zRPCWorkDir = filepath.Join(projectDir, "rpc")
if err := pathx.MkdirIfNotExist(zRPCWorkDir); err != nil {
zrpcWorkDir = filepath.Join(projectDir, "rpc")
if err := pathx.MkdirIfNotExist(zrpcWorkDir); err != nil {
return err
}
protoFilename := filepath.Join(zRPCWorkDir, protoName)
protoFilename := filepath.Join(zrpcWorkDir, protoName)
rpcBytes := []byte(protocContent)
return ioutil.WriteFile(protoFilename, rpcBytes, 0666)
}
@@ -54,8 +53,8 @@ func (m micro) mustStartRPCProject() {
logx.Must(initRPCProto())
log.Debug(">> Generating quickstart zRPC project...")
arg := "goctl rpc protoc " + protoName + " --go_out=. --go-grpc_out=. --zrpc_out=. --verbose"
execCommand(zRPCWorkDir, arg)
etcFile := filepath.Join(zRPCWorkDir, "etc", "greet.yaml")
execCommand(zrpcWorkDir, arg)
etcFile := filepath.Join(zrpcWorkDir, "etc", "greet.yaml")
logx.Must(ioutil.WriteFile(etcFile, []byte(rpcEtcContent), 0666))
}
@@ -65,7 +64,7 @@ func (m micro) start() {
sg := service.NewServiceGroup()
sg.Add(serviceImpl{func() {
log.Debug(">> Ready to start a zRPC server...")
goStart(zRPCWorkDir)
goStart(zrpcWorkDir)
}})
sg.Add(serviceImpl{func() {
mono.start()