Merge pull request #17 from rubinus/master

fix: local and container update to zgo v1.0.9

Author: rubinus

Dockerfile

@@ -17,7 +17,6 @@ COPY entrypoint.sh /opt/origin/
 COPY config /opt/origin/config
 COPY views /opt/origin/views
 COPY public /opt/origin/public
-COPY deploy /opt/origin/deploy
 
 RUN ["chmod", "+x", "origin-linux-amd64"]
 RUN ["chmod", "+x", "entrypoint.sh"]

Dockerfile-arm64

@@ -19,7 +19,6 @@ COPY entrypoint.sh /opt/origin/
 COPY config /opt/origin/config
 COPY views /opt/origin/views
 COPY public /opt/origin/public
-COPY deploy /opt/origin/deploy
 
 RUN ["chmod", "+x", "origin-linux-arm64"]
 RUN ["chmod", "+x", "entrypoint.sh"]

Dockerfile.debug

@@ -17,7 +17,6 @@ COPY entrypoint.sh /opt/origin/
 COPY config /opt/origin/config
 COPY views /opt/origin/views
 COPY public /opt/origin/public
-COPY deploy /opt/origin/deploy
 
 RUN ["chmod", "+x", "origin-linux-amd64"]
 RUN ["chmod", "+x", "entrypoint.sh"]

config/container.json

@@ -1,5 +1,4 @@
 {
-  "cpath": "/opt/origin/config",
   "version": "1.0.0",
   "env": "container",
   "project": "origin",

config/defs.go

@@ -1,12 +1,9 @@
 package config
 
 import (
-  "errors"
   "fmt"
   "github.com/gitcpu-io/zgo"
   "io/ioutil"
-  "path/filepath"
-  "runtime"
   "strconv"
 )
 
@@ -50,23 +47,12 @@ type allConfig struct {
   DemoHostForPayCanChangeAnyName string `json:"demo_host_for_pay_can_change_any_name"`
 }
 
-func InitConfig(e, project, etcdHosts, port, rpcPort string) {
-  initConfig(e, project, etcdHosts, port, rpcPort)
+func InitConfig(cpath, env, project, etcdHosts, port, rpcPort string) {
+  initConfig(cpath,env, project, etcdHosts, port, rpcPort)
 }
 
-func initConfig(e, project, etcdHosts, port, rpcPort string) {
-  var cf string
-  if e == "local" {
-    _, f, _, ok := runtime.Caller(1)
-    if !ok {
-      panic(errors.New("Can not get current file info"))
-    }
-    cf = fmt.Sprintf("%s/%s.json", filepath.Dir(f), e)
-
-  } else {
-    cf = fmt.Sprintf("./config/%s.json", e)
-  }
-
+func initConfig(cpath,env, project, etcdHosts, port, rpcPort string) {
+  var cf = fmt.Sprintf("%s/%s.json", cpath, env)
   bf, err := ioutil.ReadFile(cf)
   if err != nil {
     fmt.Println("报错: ",cf)
@@ -79,6 +65,10 @@ func initConfig(e, project, etcdHosts, port, rpcPort string) {
     panic(err)
   }
 
+  if Conf.CPath == "" { //cpath没有，就用默认的项目所在路径
+    Conf.CPath = cpath
+  }
+
   if project != "" {
     Conf.Project = project
   }

engine/zgo.go

@@ -31,7 +31,7 @@ func Run() error {
       //"redis_label_sh",	//测试时可以放开注释，通过配置文件来调试连接中间件redis
     },
     Mongo: []string{
-      "mongo_label_bj",	//测试时可以放开注释，通过配置文件来调试连接中间件mongodb
+      //"mongo_label_bj",	//测试时可以放开注释，通过配置文件来调试连接中间件mongodb
     },
     Mysql: []string{
       //"mysql_sell_1",

go.mod

@@ -4,14 +4,12 @@ go 1.16
 
 require (
 	github.com/0x19/goesl v0.0.0-20191107044804-3efcc2f41ccb
-	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/fiorix/go-eventsocket v0.0.0-20180331081222-a4a0ee7bd315
-	github.com/gitcpu-io/zgo v1.0.8
+	github.com/gitcpu-io/zgo v1.0.9
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang/protobuf v1.5.2
 	github.com/kataras/iris/v12 v12.1.8
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
-	github.com/ryanuber/columnize v2.1.2+incompatible // indirect
 	github.com/spf13/pflag v1.0.5
 	golang.org/x/net v0.0.0-20211209124913-491a49abca63
 	google.golang.org/grpc v1.45.0

go.sum

@@ -41,9 +41,8 @@ github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSY
 github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
 github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v0.4.1 h1:GaI7EiDXDRfa8VshkTj7Fym7ha+y8/XxIgD2okUIjLw=
-github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ClickHouse/clickhouse-go v1.4.5 h1:FfhyEnv6/BaWldyjgT2k4gDDmeNwJ9C4NbY/MXxJlXk=
 github.com/ClickHouse/clickhouse-go v1.4.5/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
@@ -163,8 +162,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/gavv/httpexpect v2.0.0+incompatible h1:1X9kcRshkSKEjNJJxX9Y9mQ5BRfbxU5kORdjhlA1yX8=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gitcpu-io/zgo v1.0.8 h1:8zkiHpey8QwEQ7DvtQrsgh6ZivypX++PTz1UJjOmWLc=
-github.com/gitcpu-io/zgo v1.0.8/go.mod h1:zgQMJfagDRbUnT8Rg+Am0P2LTWdc+cYzmOt25sV3WBA=
+github.com/gitcpu-io/zgo v1.0.9 h1:UDwVWxQbRcr6kH+ou5et67YwBN7M7Ef6DK5UbUoa2P4=
+github.com/gitcpu-io/zgo v1.0.9/go.mod h1:zgQMJfagDRbUnT8Rg+Am0P2LTWdc+cYzmOt25sV3WBA=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127 h1:0gkP6mzaMqkmpcJYCFOLkIBwI7xFExG03bbkOkCvUPI=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
@@ -449,9 +448,8 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L
 github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/ryanuber/columnize v2.1.0+incompatible h1:j1Wcmh8OrK4Q7GXY+V7SVSY8nUWQxHW5TkBe7YUl+2s=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/columnize v2.1.2+incompatible h1:C89EOx/XBWwIXl8wm8OPJBd7kPF25UfsK2X7Ph/zCAk=
-github.com/ryanuber/columnize v2.1.2+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=

main.go

@@ -37,7 +37,7 @@ var (
 )
 
 func init() {
-  flag.StringVar(&cpath, "cpath", "", "当不使用etcd作为配置中心时，通过配置文件cpath和env=local一起使用")
+  flag.StringVar(&cpath, "cpath", "", "当不使用etcd作为配置中心时，通过配置文件cpath和env=local或env=container一起使用")
 
   flag.StringVar(&env, "env", "local", "start local/dev/qa/pro env config，本机开发使用local，打包容器后使用container")
 
@@ -90,16 +90,13 @@ func init() {
   }
 
   //load config from dev/qa/pro
-  config.InitConfig(env, project, etcdHosts, port, rpcPort)
-
-  if cpath != "" {
-    config.Conf.CPath = cpath
-  }else{
+  if cpath == "" {
     pwd, err := os.Getwd()
     if err == nil {
-      config.Conf.CPath = fmt.Sprintf("%s/%s",pwd,"config")
+      cpath = fmt.Sprintf("%s/%s",pwd,"config")
     }
   }
+  config.InitConfig(cpath, env, project, etcdHosts, port, rpcPort)
 
   if os.Getenv("PROJECT") != "" {
     config.Conf.Project = os.Getenv("PROJECT") //从os的env取得PROJECT，用来在yaml文件中的配置
@@ -156,9 +153,6 @@ func init() {
     config.Conf.ServiceInfo.SvcGrpcPort = config.Conf.RpcPort
   }
 
-  if (env == "local" || env == "container") && config.Conf.CPath == "" {
-    panic("请输入配置文件所在路径,必须提供cpath参数值")
-  }
   fmt.Println()
   fmt.Printf("Apply config: %#v", zgo.Utils.StructToMap(&config.Conf))
   fmt.Println()

samples/demo_cache/demo.go

@@ -12,7 +12,7 @@ type CacheDemo struct {
 }
 
 func init() {
-  config.InitConfig("local", "", "", "", "")
+  config.InitConfig("","local", "", "", "", "")
 }
 
 //QueryMysql 测试读取Mysqldb数据，wait for sdk init connection