TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-03 16:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove router、ioc is adjusted to inject by type

Browse Source
This commit is contained in:
meilin.huang
2024-12-16 23:29:18 +08:00
parent 7f2a49ba3c
commit 68f553f4b0
142 changed files with 1403 additions and 1905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/pkg/ioc/component.go
View File

@@ -15,11 +15,14 @@ func WithComponentName(name string) ComponentOption {
type Component struct {
Name string // 组件名
Type reflect.Type // 组件类型
Value any // 组件实例
}
// GetType 获取组件实例类型
func (c *Component) GetType() reflect.Type {
return reflect.TypeOf(c.Value)
}
func NewComponent(val any, opts ...ComponentOption) *Component {
component := &Component{
Value: val,

12
server/pkg/ioc/default.go
View File

@@ -1,5 +1,10 @@
package ioc
import (
"mayfly-go/pkg/utils/collx"
"reflect"
)
// 全局默认实例容器
var DefaultContainer = NewContainer()
@@ -14,6 +19,13 @@ func Get[T any](name string) T {
return c.(T)
}
// GetBeansByType 根据组件实例类型从全局默认ioc容器获取实例
func GetBeansByType[T any](valueType reflect.Type) []T {
return collx.ArrayMap(DefaultContainer.GetBeansByType(valueType), func(val any) T {
return val.(T)
})
}
// 使用全局默认ioc容器中已注册的组件实例 -> 注入到指定实例所依赖的组件实例
func Inject(component any) error {
return DefaultContainer.Inject(component)

109
server/pkg/ioc/ioc.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"
"mayfly-go/pkg/contextx"
"mayfly-go/pkg/logx"
"mayfly-go/pkg/utils/collx"
"mayfly-go/pkg/utils/structx"
@@ -39,16 +40,13 @@ func (c *Container) Register(bean any, opts ...ComponentOption) {
component := NewComponent(bean, opts...)
componentName := component.Name
cType := reflect.TypeOf(component.Value)
indirectCType := structx.IndirectType(cType)
// 组件名为空，则取组件类型名称作为组件名
indirectCType := structx.IndirectType(component.GetType())
// 组件名为空，则取组件类型`包名路径.名称`作为组件名
if componentName == "" {
componentName = indirectCType.Name()
componentName = fmt.Sprintf("%s.%s", indirectCType.PkgPath(), indirectCType.Name())
component.Name = componentName
}
component.Type = cType
if _, ok := c.components[componentName]; ok {
logx.Warnf("the component name [%s] has been registered to the container. Repeat the registration...", componentName)
}
@@ -64,10 +62,11 @@ func (c *Container) Inject(obj any) error {
return nil
}
if err := c.injectWithField(objValue); err != nil {
ctx := contextx.NewTraceId()
if err := c.injectWithField(ctx, objValue); err != nil {
return err
}
if err := c.injectWithMethod(objValue); err != nil {
if err := c.injectWithMethod(ctx, objValue); err != nil {
return err
}
return nil
@@ -101,8 +100,17 @@ func (c *Container) InjectComponents() error {
return nil
}
// 根据组件实例名，获取对应实例信息
// Get 根据组件实例名，获取对应实例信息
func (c *Container) Get(name string) (any, error) {
if comp, err := c.GetComponent(name); err == nil {
return comp.Value, nil
} else {
return nil, err
}
}
// GetComponent 根据组件名，获取对应组件信息
func (c *Container) GetComponent(name string) (*Component, error) {
c.mu.RLock()
defer c.mu.RUnlock()
@@ -111,29 +119,58 @@ func (c *Container) Get(name string) (any, error) {
return nil, errors.New("component not found: " + name)
}
return component.Value, nil
return component, nil
}
// GetByType 根据组件实例类型获取组件实例
func (c *Container) GetByType(fieldType reflect.Type) (any, error) {
if comp, err := c.GetComponentByType(fieldType); err == nil {
return comp.Value, nil
} else {
return nil, err
}
}
// GetComponentByType 根据组件实例类型获取组件信息
func (c *Container) GetComponentByType(fieldType reflect.Type) (*Component, error) {
c.mu.RLock()
defer c.mu.RUnlock()
for _, component := range c.components {
if component.Type.AssignableTo(fieldType) {
return component.Value, nil
if component.GetType().AssignableTo(fieldType) {
return component, nil
}
}
return nil, errors.New("component type not found: " + fmt.Sprintf("%s.%s", fieldType.PkgPath(), fieldType.Name()))
}
// GetBeansByType 根据组件实例类型获取所有对应类型的组件实例
func (c *Container) GetBeansByType(fieldType reflect.Type) []any {
return collx.ArrayMap(c.GetComponentsByType(fieldType), func(comp *Component) any { return comp.Value })
}
// GetComponentsByType 根据组件实例类型获取指定类型的所有组件信息
func (c *Container) GetComponentsByType(fieldType reflect.Type) []*Component {
c.mu.RLock()
defer c.mu.RUnlock()
components := make([]*Component, 0)
for _, component := range c.components {
if component.GetType().AssignableTo(fieldType) {
components = append(components, component)
}
}
return components
}
// injectWithField 根据实例字段的inject:"xxx"或injectByType:""标签进行依赖注入
func (c *Container) injectWithField(objValue reflect.Value) error {
func (c *Container) injectWithField(context context.Context, objValue reflect.Value) error {
objValue = structx.Indirect(objValue)
objType := objValue.Type()
logx.Debugf("start ioc inject with field: %s.%s", objType.PkgPath(), objType.Name())
logx.DebugfContext(context, "start ioc inject with field: %s.%s", objType.PkgPath(), objType.Name())
for i := 0; i < objType.NumField(); i++ {
field := objType.Field(i)
@@ -141,7 +178,7 @@ func (c *Container) injectWithField(objValue reflect.Value) error {
// 检查字段是否是通过组合包含在当前结构体中的，即嵌套结构体
if field.Anonymous && structx.IndirectType(field.Type).Kind() == reflect.Struct {
c.injectWithField(fieldValue)
c.injectWithField(context, fieldValue)
continue
}
@@ -152,13 +189,13 @@ func (c *Container) injectWithField(objValue reflect.Value) error {
// 如果组件名为指定的根据类型注入值，则根据类型注入
if componentName == ByTypeComponentName {
if err := c.injectByType(objType, field, fieldValue); err != nil {
if err := c.injectByType(context, objType, field, fieldValue); err != nil {
return err
}
continue
}
if err := c.injectByName(objType, field, fieldValue, componentName); err != nil {
if err := c.injectByName(context, objType, field, fieldValue, componentName); err != nil {
return err
}
}
@@ -167,28 +204,29 @@ func (c *Container) injectWithField(objValue reflect.Value) error {
}
// injectByName 根据实例组件名进行依赖注入
func (c *Container) injectByName(structType reflect.Type, field reflect.StructField, fieldValue reflect.Value, componentName string) error {
func (c *Container) injectByName(context context.Context, structType reflect.Type, field reflect.StructField, fieldValue reflect.Value, componentName string) error {
// inject tag字段名为空则默认为字段名
if componentName == "" {
componentName = field.Name
}
injectInfo := fmt.Sprintf("ioc field inject [%s -> %s.%s#%s]", componentName, structType.PkgPath(), structType.Name(), field.Name)
logx.Debugf(injectInfo)
injectInfo := fmt.Sprintf("ioc field inject by name => [%s -> %s.%s#%s]", componentName, structType.PkgPath(), structType.Name(), field.Name)
component, err := c.Get(componentName)
component, err := c.GetComponent(componentName)
if err != nil {
return fmt.Errorf("%s error: %s", injectInfo, err.Error())
}
// 判断字段类型与需要注入的组件类型是否为可赋值关系
componentType := reflect.TypeOf(component)
componentType := component.GetType()
if !componentType.AssignableTo(field.Type) {
indirectComponentType := structx.IndirectType(componentType)
return fmt.Errorf("%s error: injection types are inconsistent(Expected type -> %s.%s, Component type -> %s.%s)", injectInfo, field.Type.PkgPath(), field.Type.Name(), indirectComponentType.PkgPath(), indirectComponentType.Name())
}
if err := setFieldValue(fieldValue, component); err != nil {
logx.DebugfContext(context, fmt.Sprintf("ioc field inject by name => [%s (%s) -> %s.%s#%s]", componentName, getComponentValueDesc(componentType), structType.PkgPath(), structType.Name(), field.Name))
if err := setFieldValue(fieldValue, component.Value); err != nil {
return fmt.Errorf("%s error: %s", injectInfo, err.Error())
}
@@ -196,18 +234,19 @@ func (c *Container) injectByName(structType reflect.Type, field reflect.StructFi
}
// injectByType 根据实例类型进行依赖注入
func (c *Container) injectByType(structType reflect.Type, field reflect.StructField, fieldValue reflect.Value) error {
func (c *Container) injectByType(context context.Context, structType reflect.Type, field reflect.StructField, fieldValue reflect.Value) error {
fieldType := field.Type
injectInfo := fmt.Sprintf("ioc field inject by type [%s.%s -> %s.%s#%s]", fieldType.PkgPath(), fieldType.Name(), structType.PkgPath(), structType.Name(), field.Name)
logx.Debugf(injectInfo)
injectInfo := fmt.Sprintf("ioc field inject by type => [%s.%s -> %s.%s#%s]", fieldType.PkgPath(), fieldType.Name(), structType.PkgPath(), structType.Name(), field.Name)
component, err := c.GetByType(fieldType)
component, err := c.GetComponentByType(fieldType)
if err != nil {
return fmt.Errorf("%s error: %s", injectInfo, err.Error())
}
if err := setFieldValue(fieldValue, component); err != nil {
logx.DebugfContext(context, fmt.Sprintf("ioc field inject by type => [%s.%s (%s) -> %s.%s#%s]", fieldType.PkgPath(), fieldType.Name(), getComponentValueDesc(component.GetType()), structType.PkgPath(), structType.Name(), field.Name))
if err := setFieldValue(fieldValue, component.Value); err != nil {
return fmt.Errorf("%s error: %s", injectInfo, err.Error())
}
@@ -215,7 +254,7 @@ func (c *Container) injectByType(structType reflect.Type, field reflect.StructFi
}
// 根据实例的Inject方法进行依赖注入
func (c *Container) injectWithMethod(objValue reflect.Value) error {
func (c *Container) injectWithMethod(context context.Context, objValue reflect.Value) error {
objType := objValue.Type()
for i := 0; i < objType.NumMethod(); i++ {
@@ -231,10 +270,10 @@ func (c *Container) injectWithMethod(objValue reflect.Value) error {
componentName := methodName[6:]
injectInfo := fmt.Sprintf("ioc method inject [%s.%s#%s(%s)]", objType.Elem().PkgPath(), objType.Elem().Name(), methodName, componentName)
logx.Debugf(injectInfo)
logx.DebugfContext(context, injectInfo)
if method.Type.NumIn() != 2 {
logx.Warnf("%s error: the method cannot be injected if it does not have one parameter", injectInfo)
logx.WarnfContext(context, "%s error: the method cannot be injected if it does not have one parameter", injectInfo)
continue
}
@@ -270,3 +309,11 @@ func setFieldValue(fieldValue reflect.Value, component any) error {
fieldValue.Set(reflect.ValueOf(component))
return nil
}
func getComponentValueDesc(componentValueType reflect.Type) string {
if componentValueType.Kind() == reflect.Ptr {
componentValueType = structx.IndirectType(componentValueType)
return fmt.Sprintf("*%s.%s", componentValueType.PkgPath(), componentValueType.Name())
}
return fmt.Sprintf("%s.%s", componentValueType.PkgPath(), componentValueType.Name())
}

9
server/pkg/req/conf.go
View File

@@ -15,6 +15,15 @@ type Conf struct {
noRes bool // 无需返回结果，即文件下载等
}
type Confs struct {
Group string
Confs []*Conf
}
func NewConfs(group string, confs ...*Conf) *Confs {
return &Confs{group, confs}
}
func New(method, path string, handler HandlerFunc) *Conf {
return &Conf{method: method, path: path, handler: handler, noRes: false}
}

8
server/pkg/starter/gorm.go
View File

@@ -29,7 +29,7 @@ func initGormDb() *gorm.DB {
}
func initMysql(m config.Mysql) *gorm.DB {
logx.Infof("连接mysql [%s]", m.Host)
logx.Infof("connecting to mysql [%s]", m.Host)
mysqlConfig := mysql.Config{
DSN: m.Dsn(), // DSN data source name
DefaultStringSize: 191, // string 类型字段的默认长度
@@ -40,7 +40,7 @@ func initMysql(m config.Mysql) *gorm.DB {
}
if db, err := gorm.Open(mysql.New(mysqlConfig), getGormConfig()); err != nil {
logx.Panicf("连接mysql失败! [%s]", err.Error())
logx.Panicf("failed to connect to mysql! [%s]", err.Error())
return nil
} else {
sqlDB, _ := db.DB()
@@ -51,9 +51,9 @@ func initMysql(m config.Mysql) *gorm.DB {
}
func initSqlite(sc config.Sqlite) *gorm.DB {
logx.Infof("连接sqlite [%s]", sc.Path)
logx.Infof("connecting to sqlite [%s]", sc.Path)
if db, err := gorm.Open(sqlite.Open(sc.Path), getGormConfig()); err != nil {
logx.Panicf("连接sqlite失败! [%s]", err.Error())
logx.Panicf("failed to connect to sqlite! [%s]", err.Error())
return nil
} else {
sqlDB, _ := db.DB()