refactor(项目): 完成基于依赖注入重构框架

Author: storezhang

argument.go

@@ -1,12 +1,13 @@
 package boot
 
 import (
+	"github.com/harluo/boot/internal/application"
 	"github.com/harluo/boot/internal/argument"
 	"github.com/harluo/boot/internal/constraint"
 )
 
 // Argument 参数
-type Argument[T constraint.Argument] = argument.Default[T]
+type Argument = application.Argument
 
 // NewArgument 创建参数
 func NewArgument[T constraint.Argument](name string, target *T) *argument.Builder[T] {

command.go

@@ -1,12 +1,12 @@
 package boot
 
 import (
+	"github.com/harluo/boot/internal/application"
 	"github.com/harluo/boot/internal/builder"
-	"github.com/harluo/boot/internal/core"
 )
 
 // Command 命令
-type Command = core.Command
+type Command = application.Command
 
 // NewCommand 创建命令
 func NewCommand(name string) *builder.Command {

initializer.go

@@ -0,0 +1,7 @@
+package boot
+
+import (
+	"github.com/harluo/boot/internal/application"
+)
+
+type Initializer = application.Initializer

internal/application/after.go

@@ -0,0 +1,9 @@
+package application
+
+import (
+	"context"
+)
+
+type After interface {
+	After(ctx context.Context) error
+}

internal/application/before.go

@@ -0,0 +1,9 @@
+package application
+
+import (
+	"context"
+)
+
+type Before interface {
+	Before(ctx context.Context) error
+}

internal/application/command.go

@@ -7,8 +7,6 @@ import (
 // Command 描述一个可以被执行的命令
 type Command interface {
 	Parameter
-	Stopper
-	Lifecycle
 
 	// Run 执行命令
 	Run(ctx context.Context) error

internal/application/initializer.go

@@ -0,0 +1,9 @@
+package application
+
+import (
+	"context"
+)
+
+type Initializer interface {
+	Initialize(ctx context.Context) error
+}

internal/application/lifecycle.go

@@ -4,8 +4,6 @@ import (
 	"context"
 )
 
-// Stopper 可停止
 type Stopper interface {
-	// Stop 停止
-	Stop(ctx context.Context) (err error)
+	Stop(ctx context.Context) error
 }

internal/application/serve.go

@@ -1,6 +1,7 @@
 package argument
 
 import (
+	"github.com/harluo/boot/internal/application"
 	"github.com/harluo/boot/internal/constraint"
 )
 
@@ -16,7 +17,7 @@ func New[T constraint.Argument](name string, target *T) *Builder[T] {
 	}
 }
 
-func (b *Builder[T]) Build() *Default[T] {
+func (b *Builder[T]) Build() application.Argument {
 	return b.argument
 }
 

internal/application/stopper.go

@@ -3,15 +3,12 @@ package argument
 import (
 	"time"
 
-	"github.com/goexl/gox"
 	"github.com/harluo/boot/internal/application"
 	"github.com/harluo/boot/internal/constraint"
 	"github.com/harluo/boot/internal/runtime"
 	"github.com/urfave/cli/v2"
 )
 
-var _ application.Argument = (*Default[int])(nil)
-
 type Default[T constraint.Argument] struct {
 	// 名称
 	name string
@@ -35,8 +32,6 @@ type Default[T constraint.Argument] struct {
 	text string
 	// 动作
 	action Action[T]
-
-	_ gox.Pointerized
 }
 
 func NewDefault[T constraint.Argument](name string, target *T) *Default[T] {

internal/argument/builder.go

@@ -5,14 +5,14 @@ import (
 	"github.com/harluo/boot/internal/builder/internal/function"
 	"github.com/harluo/boot/internal/builder/internal/once"
 	"github.com/harluo/boot/internal/core"
+	"github.com/harluo/boot/internal/internal/config"
 	"github.com/harluo/boot/internal/internal/kernel"
-	"github.com/harluo/boot/internal/internal/param"
 )
 
 var shadow *Application
 
 type Application struct {
-	params  *param.Application
+	params  *config.Application
 	timeout *Timeout
 	banner  *Banner
 	help    *Help
@@ -28,7 +28,7 @@ func NewApplication() (application *Application) {
 
 func newApplication() {
 	shadow = new(Application)
-	shadow.params = param.NewApplication()
+	shadow.params = config.NewApplication()
 
 	// !预创建，保证单例
 	shadow.timeout = newTimeout(shadow)

internal/argument/default.go

@@ -2,11 +2,11 @@ package builder
 
 import (
 	"github.com/harluo/boot/internal/internal/banner"
-	"github.com/harluo/boot/internal/internal/param"
+	"github.com/harluo/boot/internal/internal/config"
 )
 
 type Banner struct {
-	params      *param.Banner
+	params      *config.Banner
 	application *Application
 }
 

internal/builder/application.go

@@ -1,11 +1,11 @@
 package builder
 
 import (
-	"github.com/harluo/boot/internal/internal/param"
+	"github.com/harluo/boot/internal/internal/config"
 )
 
 type Code struct {
-	params      *param.Code
+	params      *config.Code
 	application *Application
 }
 

internal/builder/banner.go

@@ -3,16 +3,16 @@ package builder
 import (
 	"github.com/harluo/boot/internal/builder/internal/function"
 	"github.com/harluo/boot/internal/internal/command"
-	"github.com/harluo/boot/internal/internal/param"
+	"github.com/harluo/boot/internal/internal/config"
 )
 
 type Command struct {
-	params *param.Command
+	params *config.Command
 }
 
 func NewCommand(name string) *Command {
 	return &Command{
-		params: param.NewCommand(name),
+		params: config.NewCommand(name),
 	}
 }
 

internal/builder/code.go

@@ -1,11 +1,11 @@
 package builder
 
 import (
-	"github.com/harluo/boot/internal/internal/param"
+	"github.com/harluo/boot/internal/internal/config"
 )
 
 type Help struct {
-	params      *param.Help
+	params      *config.Help
 	application *Application
 }
 

internal/builder/command.go

@@ -3,11 +3,11 @@ package builder
 import (
 	"time"
 
-	"github.com/harluo/boot/internal/internal/param"
+	"github.com/harluo/boot/internal/internal/config"
 )
 
 type Timeout struct {
-	params      *param.Timeout
+	params      *config.Timeout
 	application *Application
 }