Skip to content

Commit ec87fb2

Browse files
yoyofxyoyofx
authored
Merge pull request yoyofx#174 from yoyofx/dev
v1.7.5
2 parents 862bf67 + f06aa46 commit ec87fb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+103
-251
lines changed

‎README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,17 @@ func main() {
6666
```
6767
![](https://mnur-prod-public.oss-cn-beijing.aliyuncs.com/0/tech/20201209182340.png)
6868

69+
## 依赖框架模块
70+
只涉及框架使用或贡献过的库
71+
```go
72+
github.com/yoyofxteam/dependencyinjection
73+
74+
github.com/yoyofxteam/nacos-viper-remote
75+
76+
github.com/yoyofxteam/reflectx
77+
78+
github.com/shima-park/agollo
79+
```
6980
# 实现进度
7081
## 标准功能
7182
* [X] 打印Logo和日志（YoyoGo）

‎abstractions/di.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package abstractions
22

3-
import "github.com/yoyofx/yoyogo/dependencyinjection"
3+
import "github.com/yoyofxteam/dependencyinjection"
44

55
var (
66
configurationProcessors []func(config IConfiguration, serviceCollection *dependencyinjection.ServiceCollection)

‎abstractions/health/init.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package health
22

33
import (
44
"github.com/yoyofx/yoyogo/abstractions"
5-
"github.com/yoyofx/yoyogo/dependencyinjection"
5+
"github.com/yoyofxteam/dependencyinjection"
66
)
77

88
func init() {

‎abstractions/hostbuilder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"github.com/yoyofx/yoyogo"
66
"github.com/yoyofx/yoyogo/abstractions/hostenv"
7-
"github.com/yoyofx/yoyogo/dependencyinjection"
7+
"github.com/yoyofxteam/dependencyinjection"
88
"net"
99
"os"
1010
"strings"

‎abstractions/hostbuilder_context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package abstractions
22

33
import (
44
"github.com/yoyofx/yoyogo/abstractions/hostenv"
5-
"github.com/yoyofx/yoyogo/dependencyinjection"
5+
"github.com/yoyofxteam/dependencyinjection"
66
)
77

88
type HostBuilderContext struct {

‎abstractions/hostbuilder_decorator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package abstractions
22

3-
import "github.com/yoyofx/yoyogo/dependencyinjection"
3+
import "github.com/yoyofxteam/dependencyinjection"
44

55
// IHostBuilderDecorator Host Builder decorator or extension
66
type IHostBuilderDecorator interface {

‎abstractions/hosting/hosting.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package hosting
22

33
import (
44
"github.com/yoyofx/yoyogo/abstractions"
5-
"github.com/yoyofx/yoyogo/dependencyinjection"
5+
"github.com/yoyofxteam/dependencyinjection"
66
)
77

88
func AddHostService(collection *dependencyinjection.ServiceCollection, serviceCtor interface{}) {

‎abstractions/startuper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package abstractions
22

3-
import "github.com/yoyofx/yoyogo/dependencyinjection"
3+
import "github.com/yoyofxteam/dependencyinjection"
44

55
type IStartup interface {
66
ConfigureServices(collection *dependencyinjection.ServiceCollection)

‎cli/yygctl/generate/projects/version.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package projects
22

33
const (
44
//Application Version, such as v1.x.x pre-release
5-
Version = "v1.7.4"
5+
Version = "v1.7.5"
66
//Application logo
7-
//Logo = "IF8gICAgIF8gICAgICAgICAgICAgICAgICAgIF9fXyAgICAgICAgICAKKCApICAgKCApICAgICAgICAgICAgICAgICAgKCAgX2BcICAgICAgICAKYFxgXF8vJy8nXyAgICBfICAgXyAgICBfICAgfCAoIChfKSAgIF8gICAKICBgXCAvJy8nX2BcICggKSAoICkgLydfYFwgfCB8X19fICAvJ19gXCAKICAgfCB8KCAoXykgKXwgKF8pIHwoIChfKSApfCAoXywgKSggKF8pICkKICAgKF8pYFxfX18vJ2BcX18sIHxgXF9fXy8nKF9fX18vJ2BcX19fLycKICAgICAgICAgICAgICggKV98IHwgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgIGBcX19fLycgICAgICAgICAgICBMaWdodCBhbmQgZmFzdC4gIA=="
87
Logo = `
98
$$\ $$\ $$\ $$\
109
$$ | $$ | $$ |\__|

‎cli/yygctl/generate/templates/console/go.mod.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,8 @@ module {{.ModelName}}
55
66
go 1.16
77
8-
require github.com/yoyofx/yoyogo {{.Version}}
8+
require (
9+
github.com/yoyofxteam/dependencyinjection v1.0.0
10+
github.com/yoyofx/yoyogo {{.Version}}
11+
)
912
`

‎cli/yygctl/generate/templates/console/startup.go.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package {{.CurrentModelName}}
66
import (
77
"github.com/yoyofx/yoyogo/abstractions"
88
"github.com/yoyofx/yoyogo/abstractions/hosting"
9-
"github.com/yoyofx/yoyogo/dependencyinjection"
9+
"github.com/yoyofxteam/dependencyinjection"
1010
)
1111
1212
type AppStartup struct {

‎cli/yygctl/generate/templates/grpc/client_go_tel.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/yoyofx/yoyogo/abstractions"
88
"github.com/yoyofx/yoyogo/abstractions/hosting"
99
"github.com/yoyofx/yoyogo/console"
10-
"github.com/yoyofx/yoyogo/dependencyinjection"
10+
"github.com/yoyofxteam/dependencyinjection"
1111
"github.com/yoyofx/yoyogo/pkg/servicediscovery/nacos"
1212
)
1313

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package main
55
66
import (
77
"github.com/yoyofx/yoyogo/abstractions"
8-
"github.com/yoyofx/yoyogo/dependencyinjection"
8+
"github.com/yoyofxteam/dependencyinjection"
99
yrpc "github.com/yoyofx/yoyogo/grpc"
1010
"github.com/yoyofx/yoyogo/pkg/servicediscovery/nacos"
1111
"google.golang.org/grpc"
@@ -45,6 +45,7 @@ module {{.ModelName}}
4545
go 1.16
4646
4747
require (
48+
github.com/yoyofxteam/dependencyinjection v1.0.0
4849
github.com/yoyofx/yoyogo {{.Version}}
4950
github.com/golang/protobuf v1.5.2
5051
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0

‎cli/yygctl/generate/templates/mvc/mvc_go_tel.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ package {{.CurrentModelName}}
4040
4141
import (
4242
"github.com/yoyofx/yoyogo/abstractions"
43-
"github.com/yoyofx/yoyogo/dependencyinjection"
43+
"github.com/yoyofxteam/dependencyinjection"
4444
"github.com/yoyofx/yoyogo/web"
4545
"github.com/yoyofx/yoyogo/web/actionresult/extension"
4646
"github.com/yoyofx/yoyogo/web/mvc"
@@ -79,7 +79,8 @@ module {{.ModelName}}
7979
go 1.16
8080
8181
require (
82-
github.com/yoyofx/yoyogo {{.Version}}
82+
github.com/yoyofxteam/dependencyinjection v1.0.0
83+
github.com/yoyofx/yoyogo {{.Version}}
8384
)
8485
`
8586

‎cli/yygctl/generate/templates/webapi/main_go.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ module {{.ModelName}}
4141
go 1.16
4242
4343
require (
44-
github.com/yoyofx/yoyogo {{.Version}}
44+
github.com/yoyofxteam/dependencyinjection v1.0.0
45+
github.com/yoyofx/yoyogo {{.Version}}
4546
)
4647
`

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package {{.CurrentModelName}}
55
66
import (
77
"github.com/yoyofx/yoyogo/abstractions/configuration"
8-
"github.com/yoyofx/yoyogo/dependencyinjection"
8+
"github.com/yoyofxteam/dependencyinjection"
99
"github.com/yoyofx/yoyogo/pkg/scheduler"
1010
)
1111
@@ -28,6 +28,7 @@ module "{{.ModelName}}"
2828
go 1.16
2929
3030
require (
31+
github.com/yoyofxteam/dependencyinjection v1.0.0
3132
github.com/yoyofx/yoyogo {{.Version}}
3233
github.com/xxl-job/xxl-job-executor-go v0.6.1
3334
)

‎console/hostbuilderdecorator.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package console
22

33
import (
44
"github.com/yoyofx/yoyogo/abstractions"
5-
"github.com/yoyofx/yoyogo/dependencyinjection"
5+
"github.com/yoyofxteam/dependencyinjection"
66
)
77

88
type HostBuilderDecorator struct {

‎dependencyinjection/default_serviceprovider.go

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎dependencyinjection/default_serviceprovider_factory.go

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎dependencyinjection/servicecollection.go

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎dependencyinjection/servicedescriptor.go

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎dependencyinjection/servicelifetime.go

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎dependencyinjection/serviceprovider.go

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎dependencyinjection/serviceprovider_factory.go

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎examples/console/go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ module console
22

33
go 1.16
44

5-
require github.com/yoyofx/yoyogo v0.0.0
5+
require (
6+
github.com/yoyofxteam/dependencyinjection v1.0.0
7+
github.com/yoyofx/yoyogo v0.0.0
8+
)
69

710
replace github.com/yoyofx/yoyogo => ../../

0 commit comments

Comments
 (0)