Merge pull request #172 from yoyofx/dev

v1.7.4

cli/yygctl/generate/projects/version.go

@@ -2,7 +2,7 @@ package projects
 
 const (
 	//Application Version, such as v1.x.x pre-release
-	Version = "v1.7.3"
+	Version = "v1.7.4"
 	//Application logo
 	//Logo = "IF8gICAgIF8gICAgICAgICAgICAgICAgICAgIF9fXyAgICAgICAgICAKKCApICAgKCApICAgICAgICAgICAgICAgICAgKCAgX2BcICAgICAgICAKYFxgXF8vJy8nXyAgICBfICAgXyAgICBfICAgfCAoIChfKSAgIF8gICAKICBgXCAvJy8nX2BcICggKSAoICkgLydfYFwgfCB8X19fICAvJ19gXCAKICAgfCB8KCAoXykgKXwgKF8pIHwoIChfKSApfCAoXywgKSggKF8pICkKICAgKF8pYFxfX18vJ2BcX18sIHxgXF9fXy8nKF9fX18vJ2BcX19fLycKICAgICAgICAgICAgICggKV98IHwgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgIGBcX19fLycgICAgICAgICAgICBMaWdodCBhbmQgZmFzdC4gIA=="
 	Logo = `

cli/yygctl/generate/templates/grpc/grpc_go_tel.go

@@ -45,14 +45,10 @@ module {{.ModelName}}
 go 1.16
 
 require (
-	github.com/golang/protobuf v1.5.1 
-	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
 	github.com/yoyofx/yoyogo {{.Version}}
-	golang.org/x/net v0.0.0-20210326220855-61e056675ecf 
-	golang.org/x/sys v0.0.0-20210326220804-49726bf1d181 
-	golang.org/x/text v0.3.5 
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 
-	google.golang.org/grpc v1.29.1
+	github.com/golang/protobuf v1.5.2
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.26.0
 )
 `

cli/yygctl/generate/templates/xxl_job/xxl_job_tel.go

@@ -29,7 +29,7 @@ go 1.16
 
 require (
     github.com/yoyofx/yoyogo {{.Version}}
-	github.com/xxl-job/xxl-job-executor-go v0.5.2
+	github.com/xxl-job/xxl-job-executor-go v0.6.1
 )
 
 `

examples/grpc-demo/go.mod

@@ -3,14 +3,9 @@ module grpc-demo
 go 1.16
 
 require (
-	github.com/golang/protobuf v1.5.1 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/yoyofx/yoyogo v0.0.0
-	golang.org/x/net v0.0.0-20210326220855-61e056675ecf // indirect
-	golang.org/x/sys v0.0.0-20210326220804-49726bf1d181 // indirect
-	golang.org/x/text v0.3.5 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	google.golang.org/grpc v1.29.1
+	google.golang.org/grpc v1.38.0
 	google.golang.org/protobuf v1.26.0
 )
 

examples/simpleweb/go.mod

@@ -4,11 +4,9 @@ go 1.16
 
 require (
 	github.com/fasthttp/websocket v1.4.3
-	github.com/go-sql-driver/mysql v1.5.0
+	github.com/go-sql-driver/mysql v1.6.0
 	github.com/yoyofx/yoyogo v0.0.0
-	gorm.io/gorm v1.20.12
+	gorm.io/gorm v1.21.11
 )
 
 replace github.com/yoyofx/yoyogo => ../../
-
-//require github.com/yoyofx/yoyogo v1.5.5

examples/simpleweb/main.go

@@ -6,7 +6,7 @@ import (
 	"github.com/yoyofx/yoyogo/abstractions"
 	"github.com/yoyofx/yoyogo/abstractions/xlog"
 	"github.com/yoyofx/yoyogo/dependencyinjection"
-	nacosconfig "github.com/yoyofx/yoyogo/pkg/configuration/nacos"
+	"github.com/yoyofx/yoyogo/pkg/configuration/apollo"
 	_ "github.com/yoyofx/yoyogo/pkg/datasources/mysql"
 	_ "github.com/yoyofx/yoyogo/pkg/datasources/redis"
 	"github.com/yoyofx/yoyogo/pkg/servicediscovery/nacos"
@@ -44,8 +44,8 @@ func main() {
 
 //* Create the builder of Web host
 func CreateCustomBuilder() *abstractions.HostBuilder {
-	config := nacosconfig.RemoteConfig("config")
-	//config := apollo.RemoteConfig("config")
+	//config := nacosconfig.RemoteConfig("config")
+	config := apollo.RemoteConfig("config")
 	return web.NewWebHostBuilder().
 		UseConfiguration(config).
 		Configure(func(app *web.ApplicationBuilder) {

examples/xxl-job-console/go.mod

@@ -1,11 +1,7 @@
-module "xxl-job-console"
+module xxl-job-console
 
 go 1.16
 
-require (
-    github.com/yoyofx/yoyogo v0.0.0
-	github.com/xxl-job/xxl-job-executor-go v0.5.2
-)
+require github.com/yoyofx/yoyogo v0.0.0
 
-
-replace github.com/yoyofx/yoyogo => ../../
+replace github.com/yoyofx/yoyogo => ../../

go.mod

@@ -3,50 +3,48 @@ module github.com/yoyofx/yoyogo
 go 1.16
 
 require (
-	github.com/SkyAPM/go2sky v0.6.0
+	github.com/SkyAPM/go2sky v1.1.0
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec // indirect
-	github.com/coreos/etcd v3.3.13+incompatible
 	github.com/defval/inject/v2 v2.2.2
-	github.com/fasthttp/websocket v1.4.1
+	github.com/fasthttp/websocket v1.4.3
 	github.com/fogleman/gg v1.3.0
 	github.com/franela/goblin v0.0.0-20201006155558-6240afcb2eb7 // indirect
 	github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8 // indirect
 	github.com/go-playground/validator/v10 v10.4.1
-	github.com/go-redis/redis/v8 v8.4.4
+	github.com/go-redis/redis/v8 v8.11.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/golang/protobuf v1.5.0
+	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.1.2
-	github.com/grpc-ecosystem/go-grpc-middleware v1.0.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
 	github.com/hashicorp/consul/api v1.1.0
 	github.com/hudl/fargo v1.3.0
-	github.com/json-iterator/go v1.1.9 // indirect
-	github.com/magiconair/properties v1.8.1
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/magiconair/properties v1.8.5
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/nacos-group/nacos-sdk-go v1.0.7
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v0.9.3
-	github.com/shima-park/agollo v1.2.10
-	github.com/sirupsen/logrus v1.2.0
+	github.com/prometheus/client_golang v1.11.0
+	github.com/shima-park/agollo v1.2.11
+	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.7.1
-	github.com/stretchr/testify v1.6.1
+	github.com/spf13/viper v1.8.1
+	github.com/stretchr/testify v1.7.0
 	github.com/ugorji/go/codec v1.2.1
-	github.com/valyala/fasthttp v1.17.0
-	github.com/xxl-job/xxl-job-executor-go v0.5.2
-	github.com/yoyofxteam/nacos-viper-remote v0.2.2
+	github.com/valyala/fasthttp v1.28.0
+	github.com/xxl-job/xxl-job-executor-go v0.6.1
+	github.com/yoyofxteam/nacos-viper-remote v0.3.0
 	github.com/yoyofxteam/reflectx v0.2.3
-	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	go.etcd.io/etcd/client/v3 v3.5.0
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
 	golang.org/x/image v0.0.0-20190802002840-cff245a6509b
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
-	golang.org/x/sys v0.0.0-20210309074719-68d13333faf2
-	google.golang.org/grpc v1.29.1
-	google.golang.org/protobuf v1.26.0 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed
+	golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40
+	google.golang.org/grpc v1.38.0
 	gopkg.in/gcfg.v1 v1.2.3 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0
-	gorm.io/driver/mysql v1.0.4
-	gorm.io/gorm v1.20.12
+	gorm.io/driver/mysql v1.1.1
+	gorm.io/gorm v1.21.11
 )