locate config file

deeponder · Aug 9, 2021 · bb364f7 · bb364f7
1 parent 6241655
commit bb364f7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/tools/goctl/api/gogen/genetc.go b/tools/goctl/api/gogen/genetc.go
@@ -10,7 +10,7 @@ import (
 )
 
 const (
-	defaultPort = 8888
+	defaultPort = 8080
 	etcDir      = "etc"
 	etcTemplate = `Name: {{.serviceName}}
 Host: {{.host}}

diff --git a/tools/goctl/api/gogen/genmain.go b/tools/goctl/api/gogen/genmain.go
@@ -16,6 +16,7 @@ const mainTemplate = `package main
 import (
 	"flag"
 	"fmt"
+	"os"
 
 	{{.importPackages}}
 )
@@ -26,6 +27,9 @@ func main() {
 	flag.Parse()
 
 	var c config.Config
+	if env := os.Getenv("ENV"); env != "" {
+		*configFile = "etc/{{.serviceName}}-" + env + ".yaml"
+	}
 	conf.MustLoad(*configFile, &c)
 
 	ctx := svc.NewServiceContext(c)

diff --git a/tools/goctl/goctl.go b/tools/goctl/goctl.go
@@ -31,7 +31,7 @@ import (
 )
 
 var (
-	buildVersion = "1.2.2"
+	buildVersion = "1.2.3"
 	commands     = []cli.Command{
 		{
 			Name:   "upgrade",

diff --git a/tools/goctl/rpc/generator/genetc.go b/tools/goctl/rpc/generator/genetc.go
@@ -13,7 +13,7 @@ import (
 )
 
 const etcTemplate = `Name: {{.serviceName}}.rpc
-ListenOn: 127.0.0.1:8080
+ListenOn: 127.0.0.1:8090
 `
 
 // GenEtc generates the yaml configuration file of the rpc service,