修改结构

convenient/domain/configuration/api.go

@@ -7,7 +7,6 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/value_object"
 	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/domain"
-	domainValueObject "git.sxidc.com/go-framework/baize/framwork/domain/value_object"
 	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
 	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database"
 	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/sql"
@@ -27,7 +26,7 @@ type Simple struct {
 func (simple *Simple) bind(binder *binding.Binder) {
 	options := simple.options
 
-	configurationTableName := domainValueObject.TableName(simple.Schema, &Entity{})
+	configurationTableName := domain.TableName(simple.Schema, &Entity{})
 	valueObjectOptions := []value_object.Option[any]{value_object.WithDisableQuery[any]()}
 
 	if options.disableCreate {

convenient/entity/simple.go

@@ -40,8 +40,8 @@ type Simple[I any] struct {
 func (simple *Simple[I]) bind(binder *binding.Binder) {
 	options := simple.options
 
-	tableName := entity.TableName(simple.Schema, simple.Entity)
-	domainPath := entity.RelativeDomainPath(simple.Entity)
+	tableName := domain.TableName(simple.Schema, simple.Entity)
+	domainPath := domain.RelativeDomainPath(simple.Entity)
 
 	// 创建
 	if !options.disableCreate {

convenient/relation/many2many/simple.go

@@ -42,16 +42,16 @@ type Simple[LI any, RI any] struct {
 func (simple *Simple[LI, RI]) bind(binder *binding.Binder) {
 	options := simple.options
 
-	leftDomainPath := entity.RelativeDomainPath(simple.Left)
-	rightDomainPath := entity.RelativeDomainPath(simple.Right)
+	leftDomainPath := domain.RelativeDomainPath(simple.Left)
+	rightDomainPath := domain.RelativeDomainPath(simple.Right)
 
 	leftRelationFieldName := fmt.Sprintf("%sIDs", simple.Right.DomainCamelName())
 	rightRelationFieldName := fmt.Sprintf("%sIDs", simple.Left.DomainCamelName())
 
-	middleTableName := entity.SnakeDomainName(simple.Left) + "_and_" + entity.SnakeDomainName(simple.Right)
-	leftTableName := entity.TableName(simple.Schema, simple.Left)
+	middleTableName := domain.SnakeDomainName(simple.Left) + "_and_" + domain.SnakeDomainName(simple.Right)
+	leftTableName := domain.TableName(simple.Schema, simple.Left)
 	leftRelationColumnName := fmt.Sprintf("%s_id", strcase.ToSnake(simple.Right.DomainCamelName()))
-	rightTableName := entity.TableName(simple.Schema, simple.Right)
+	rightTableName := domain.TableName(simple.Schema, simple.Right)
 	rightRelationColumnName := fmt.Sprintf("%s_id", strcase.ToSnake(simple.Left.DomainCamelName()))
 
 	if !options.disableLeft {

convenient/relation/one2many/simple.go

@@ -45,14 +45,14 @@ type Simple[LI any, RI any] struct {
 func (simple *Simple[LI, RI]) bind(binder *binding.Binder) {
 	options := simple.options
 
-	leftDomainPath := entity.RelativeDomainPath(simple.Left)
-	rightDomainPath := entity.RelativeDomainPath(simple.Right)
+	leftDomainPath := domain.RelativeDomainPath(simple.Left)
+	rightDomainPath := domain.RelativeDomainPath(simple.Right)
 
 	leftRelationFieldName := fmt.Sprintf("%sIDs", simple.Right.DomainCamelName())
 	rightRelationFieldName := fmt.Sprintf("%sID", simple.Left.DomainCamelName())
 
-	leftTableName := entity.TableName(simple.Schema, simple.Left)
-	rightTableName := entity.TableName(simple.Schema, simple.Right)
+	leftTableName := domain.TableName(simple.Schema, simple.Left)
+	rightTableName := domain.TableName(simple.Schema, simple.Right)
 	rightRelationColumnName := fmt.Sprintf("%s_id", strcase.ToSnake(simple.Left.DomainCamelName()))
 
 	if !options.disableLeft {

convenient/relation/one2one/simple.go

@@ -48,15 +48,15 @@ type Simple[LI any, RI any] struct {
 func (simple *Simple[LI, RI]) bind(binder *binding.Binder) {
 	options := simple.options
 
-	leftDomainPath := entity.RelativeDomainPath(simple.Left)
-	rightDomainPath := entity.RelativeDomainPath(simple.Right)
+	leftDomainPath := domain.RelativeDomainPath(simple.Left)
+	rightDomainPath := domain.RelativeDomainPath(simple.Right)
 
 	leftRelationFieldName := fmt.Sprintf("%sID", simple.Right.DomainCamelName())
 	rightRelationFieldName := fmt.Sprintf("%sID", simple.Left.DomainCamelName())
 
-	leftTableName := entity.TableName(simple.Schema, simple.Left)
+	leftTableName := domain.TableName(simple.Schema, simple.Left)
 	leftRelationColumnName := fmt.Sprintf("%s_id", strcase.ToSnake(simple.Right.DomainCamelName()))
-	rightTableName := entity.TableName(simple.Schema, simple.Right)
+	rightTableName := domain.TableName(simple.Schema, simple.Right)
 	rightRelationColumnName := fmt.Sprintf("%s_id", strcase.ToSnake(simple.Left.DomainCamelName()))
 
 	if !options.disableLeft {

convenient/relation/remote/simple.go

@@ -47,16 +47,16 @@ type Simple[I any] struct {
 func (simple *Simple[I]) bind(binder *binding.Binder) {
 	options := simple.options
 
-	leftDomainPath := entity.RelativeDomainPath(simple.Left)
-	rightDomainPath := entity.RelativeDomainPath(simple.Right)
+	leftDomainPath := domain.RelativeDomainPath(simple.Left)
+	rightDomainPath := domain.RelativeDomainPath(simple.Right)
 
 	leftRelationFieldName := fmt.Sprintf("%sIDs", simple.Right.DomainCamelName())
 	rightRelationFieldName := fmt.Sprintf("%sIDs", simple.Left.DomainCamelName())
 
-	middleTableName := entity.SnakeDomainName(simple.Left) + "_and_" + entity.SnakeDomainName(simple.Right)
-	leftTableName := entity.TableName(simple.Schema, simple.Left)
+	middleTableName := domain.SnakeDomainName(simple.Left) + "_and_" + domain.SnakeDomainName(simple.Right)
+	leftTableName := domain.TableName(simple.Schema, simple.Left)
 	leftRelationColumnName := fmt.Sprintf("%s_id", strcase.ToSnake(simple.Right.DomainCamelName()))
-	rightTableName := entity.TableName(simple.Schema, simple.Right)
+	rightTableName := domain.TableName(simple.Schema, simple.Right)
 	rightRelationColumnName := fmt.Sprintf("%s_id", strcase.ToSnake(simple.Left.DomainCamelName()))
 
 	if !options.disableLeft {

convenient/value_object/simple.go

@@ -34,8 +34,8 @@ type Simple[I any] struct {
 func (simple *Simple[I]) bind(binder *binding.Binder) {
 	options := simple.options
 
-	tableName := value_object.TableName(simple.Schema, simple.ValueObject)
-	domainPath := value_object.RelativeDomainPath(simple.ValueObject)
+	tableName := domain.TableName(simple.Schema, simple.ValueObject)
+	domainPath := domain.RelativeDomainPath(simple.ValueObject)
 
 	// 创建
 	if !options.disableCreate {

framwork/domain/entity/utils.go

@@ -2,31 +2,9 @@ package entity
 
 import (
 	"git.sxidc.com/go-tools/utils/strutils"
-	"git.sxidc.com/go-tools/utils/template"
 	"git.sxidc.com/service-supports/fserr"
-	"github.com/iancoleman/strcase"
 )
 
-func TableName(schema string, e Entity) string {
-	if strutils.IsStringNotEmpty(e.DBSchema()) {
-		schema = e.DBSchema()
-	}
-
-	if strutils.IsStringEmpty(schema) {
-		return template.Plural(strcase.ToSnake(template.Id(e.DomainCamelName())))
-	} else {
-		return schema + "." + template.Plural(strcase.ToSnake(template.Id(e.DomainCamelName())))
-	}
-}
-
-func RelativeDomainPath(e Entity) string {
-	return "/" + strcase.ToLowerCamel(template.Id(e.DomainCamelName()))
-}
-
-func SnakeDomainName(e Entity) string {
-	return strcase.ToSnake(template.Id(e.DomainCamelName()))
-}
-
 const (
 	fieldIDLen = 32
 )

framwork/domain/object.go

@@ -2,7 +2,10 @@ package domain
 
 import (
 	"git.sxidc.com/go-tools/utils/reflectutils"
+	"git.sxidc.com/go-tools/utils/strutils"
+	"git.sxidc.com/go-tools/utils/template"
 	"git.sxidc.com/service-supports/fserr"
+	"github.com/iancoleman/strcase"
 	"reflect"
 )
 
@@ -107,3 +110,23 @@ func getFieldValue(object Object, fieldName string) (*reflect.Value, error) {
 
 	return &fieldValue, nil
 }
+
+func TableName(schema string, object Object) string {
+	if strutils.IsStringNotEmpty(object.DBSchema()) {
+		schema = object.DBSchema()
+	}
+
+	if strutils.IsStringEmpty(schema) {
+		return template.Plural(strcase.ToSnake(template.Id(object.DomainCamelName())))
+	} else {
+		return schema + "." + template.Plural(strcase.ToSnake(template.Id(object.DomainCamelName())))
+	}
+}
+
+func RelativeDomainPath(object Object) string {
+	return "/" + strcase.ToLowerCamel(template.Id(object.DomainCamelName()))
+}
+
+func SnakeDomainName(object Object) string {
+	return strcase.ToSnake(template.Id(object.DomainCamelName()))
+}

framwork/domain/value_object/utils.go

@@ -1,27 +1,2 @@
 package value_object
 
-import (
-	"git.sxidc.com/go-tools/utils/strutils"
-	"git.sxidc.com/go-tools/utils/template"
-	"github.com/iancoleman/strcase"
-)
-
-func TableName(schema string, valueObject ValueObject) string {
-	if strutils.IsStringNotEmpty(valueObject.DBSchema()) {
-		schema = valueObject.DBSchema()
-	}
-
-	if strutils.IsStringEmpty(schema) {
-		return template.Plural(strcase.ToSnake(template.Id(valueObject.DomainCamelName())))
-	} else {
-		return schema + "." + template.Plural(strcase.ToSnake(template.Id(valueObject.DomainCamelName())))
-	}
-}
-
-func RelativeDomainPath(valueObject ValueObject) string {
-	return "/" + strcase.ToLowerCamel(template.Id(valueObject.DomainCamelName()))
-}
-
-func SnakeDomainName(valueObject ValueObject) string {
-	return strcase.ToSnake(template.Id(valueObject.DomainCamelName()))
-}