optimize grpc generation env check (#900)

* optimize grpc generation env check

* optimize grpc generation env check

* format code

* fix postgresql data type convert error

Co-authored-by: anqiansong <anqiansong@xiaoheiban.cn>
master
anqiansong 3 years ago committed by GitHub
parent c6642bc2e6
commit dc43430812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -8,12 +8,13 @@ import (
) )
var p2m = map[string]string{ var p2m = map[string]string{
"int8": "bigint", "int8": "bigint",
"numeric": "bigint", "numeric": "bigint",
"float8": "double", "float8": "double",
"float4": "float", "float4": "float",
"int2": "smallint", "int2": "smallint",
"int4": "integer", "int4": "integer",
"timestamptz": "timestamp",
} }
// PostgreSqlModel gets table information from information_schema、pg_catalog // PostgreSqlModel gets table information from information_schema、pg_catalog

@ -4,9 +4,11 @@ import (
"errors" "errors"
"fmt" "fmt"
"path/filepath" "path/filepath"
"runtime"
"github.com/tal-tech/go-zero/tools/goctl/rpc/generator" "github.com/tal-tech/go-zero/tools/goctl/rpc/generator"
"github.com/tal-tech/go-zero/tools/goctl/util" "github.com/tal-tech/go-zero/tools/goctl/util"
"github.com/tal-tech/go-zero/tools/goctl/util/env"
"github.com/urfave/cli" "github.com/urfave/cli"
) )
@ -14,6 +16,10 @@ import (
// you can specify a target folder for code generation, when the proto file has import, you can specify // you can specify a target folder for code generation, when the proto file has import, you can specify
// the import search directory through the proto_path command, for specific usage, please refer to protoc -h // the import search directory through the proto_path command, for specific usage, please refer to protoc -h
func RPC(c *cli.Context) error { func RPC(c *cli.Context) error {
if err := prepare(); err != nil {
return err
}
src := c.String("src") src := c.String("src")
out := c.String("dir") out := c.String("dir")
style := c.String("style") style := c.String("style")
@ -41,6 +47,22 @@ func RPC(c *cli.Context) error {
return g.Generate(src, out, protoImportPath, goOptions...) return g.Generate(src, out, protoImportPath, goOptions...)
} }
func prepare() error {
if !env.CanExec() {
return fmt.Errorf("%s: can not start new processes using os.StartProcess or exec.Command", runtime.GOOS)
}
if _, err := env.LookUpGo(); err != nil {
return err
}
if _, err := env.LookUpProtoc(); err != nil {
return err
}
if _, err := env.LookUpProtocGenGo(); err != nil {
return err
}
return nil
}
// RPCNew is to generate rpc greet service, this greet service can speed // RPCNew is to generate rpc greet service, this greet service can speed
// up your understanding of the zrpc service structure // up your understanding of the zrpc service structure
func RPCNew(c *cli.Context) error { func RPCNew(c *cli.Context) error {

@ -0,0 +1,80 @@
package env
import (
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"github.com/tal-tech/go-zero/tools/goctl/vars"
)
const bin = "bin"
const binGo = "go"
const binProtoc = "protoc"
const binProtocGenGo = "protoc-gen-go"
// LookUpGo searches an executable go in the directories
// named by the GOROOT/bin or PATH environment variable.
func LookUpGo() (string, error) {
goRoot := runtime.GOROOT()
suffix := getExeSuffix()
xGo := binGo + suffix
path := filepath.Join(goRoot, bin, xGo)
if _, err := os.Stat(path); err == nil {
return path, nil
}
return LookPath(xGo)
}
// LookUpProtoc searches an executable protoc in the directories
// named by the PATH environment variable.
func LookUpProtoc() (string, error) {
suffix := getExeSuffix()
xProtoc := binProtoc + suffix
return LookPath(xProtoc)
}
// LookUpProtocGenGo searches an executable protoc-gen-go in the directories
// named by the PATH environment variable.
func LookUpProtocGenGo() (string, error) {
suffix := getExeSuffix()
xProtocGenGo := binProtocGenGo + suffix
return LookPath(xProtocGenGo)
}
// LookPath searches for an executable named file in the
// directories named by the PATH environment variable,
// for the os windows, the named file will be spliced with the
// .exe suffix.
func LookPath(xBin string) (string, error) {
suffix := getExeSuffix()
if len(suffix) > 0 && !strings.HasSuffix(xBin, suffix) {
xBin = xBin + suffix
}
bin, err := exec.LookPath(xBin)
if err != nil {
return "", err
}
return bin, nil
}
// CanExec reports whether the current system can start new processes
// using os.StartProcess or (more commonly) exec.Command.
func CanExec() bool {
switch runtime.GOOS {
case vars.OsJs, vars.OsIOS:
return false
default:
return true
}
}
func getExeSuffix() string {
if runtime.GOOS == vars.OsWindows {
return ".exe"
}
return ""
}

@ -5,10 +5,14 @@ const (
ProjectName = "zero" ProjectName = "zero"
// ProjectOpenSourceURL the github url of go-zero // ProjectOpenSourceURL the github url of go-zero
ProjectOpenSourceURL = "github.com/tal-tech/go-zero" ProjectOpenSourceURL = "github.com/tal-tech/go-zero"
// OsWindows windows os // OsWindows represents os windows
OsWindows = "windows" OsWindows = "windows"
// OsMac mac os // OsMac represents os mac
OsMac = "darwin" OsMac = "darwin"
// OsLinux linux os // OsLinux represents os linux
OsLinux = "linux" OsLinux = "linux"
// OsJs represents os js
OsJs = "js"
// OsIOS represents os ios
OsIOS = "ios"
) )

Loading…
Cancel
Save