修改bug

convenient/entity/service.go

@@ -65,7 +65,7 @@ func Delete(tableName string, callbacks *Callbacks[any]) binding.ServiceFunc[any
 			return nil, fserr.New("需要传递领域对象应该为实体")
 		}
 
-		err := e.CheckFieldID()
+		err := e.CheckFieldID(e.DomainCNName())
 		if err != nil {
 			return callbackOnErrorReturn(callbacks, e, err, i, nil)
 		}
@@ -223,7 +223,7 @@ func GetByID[O any](tableName string, callbacks *Callbacks[O]) binding.ServiceFu
 			return outputZero, fserr.New("需要传递领域对象应该为实体")
 		}
 
-		err := e.CheckFieldID()
+		err := e.CheckFieldID(e.DomainCNName())
 		if err != nil {
 			return callbackOnErrorReturn(callbacks, e, err, i, outputZero)
 		}
@@ -321,7 +321,7 @@ func DeleteTx(tableName string, callbacks *Callbacks[any]) binding.ServiceFunc[a
 			return nil, fserr.New("需要传递领域对象应该为实体")
 		}
 
-		err := e.CheckFieldID()
+		err := e.CheckFieldID(e.DomainCNName())
 		if err != nil {
 			return callbackOnErrorReturn(callbacks, e, err, i, nil)
 		}
@@ -361,7 +361,7 @@ func UpdateTx(tableName string, callbacks *Callbacks[any]) binding.ServiceFunc[a
 			return nil, fserr.New("需要传递领域对象应该为实体")
 		}
 
-		err := e.CheckFieldID()
+		err := e.CheckFieldID(e.DomainCNName())
 		if err != nil {
 			return callbackOnErrorReturn(callbacks, e, err, i, nil)
 		}

domain/common.go

@@ -36,7 +36,7 @@ type TenantIDField struct {
 }
 
 func (field *TenantIDField) CheckFieldTenantID(domainCNName string) error {
-	return CheckID(field.TenantID, domainCNName, "租户ID")
+	return CheckID(domainCNName, "租户ID", field.TenantID)
 }
 
 type UserIDFields struct {
@@ -45,11 +45,11 @@ type UserIDFields struct {
 }
 
 func (field *UserIDFields) CheckFieldCreateUserID(domainCNName string) error {
-	return CheckID(field.CreateUserID, domainCNName, "创建用户ID")
+	return CheckID(domainCNName, "创建用户ID", field.CreateUserID)
 }
 
 func (field *UserIDFields) CheckFieldLastUpdateUserID(domainCNName string) error {
-	return CheckID(field.LastUpdateUserID, domainCNName, "更新用户ID")
+	return CheckID(domainCNName, "更新用户ID", field.LastUpdateUserID)
 }
 
 type TimeFields struct {

domain/entity.go

@@ -9,7 +9,7 @@ type Entity interface {
 	DomainCNName() string
 	GenerateID() error
 	GetID() string
-	CheckFieldID() error
+	CheckFieldID(domainCNName string) error
 	IDColumnName() string
 	ForCreate() error
 	ForUpdate() error
@@ -32,8 +32,8 @@ func (e *BaseEntity) GetID() string {
 	return e.ID
 }
 
-func (e *BaseEntity) CheckFieldID() error {
-	return CheckID(e.ID, e.DomainCNName(), "ID")
+func (e *BaseEntity) CheckFieldID(domainCNName string) error {
+	return CheckID(domainCNName, "ID", e.ID)
 }
 
 func (e *BaseEntity) IDColumnName() string {

examples/example_domain/class/entity.go

@@ -31,7 +31,7 @@ func (e *Entity) DomainCNName() string {
 }
 
 func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID()
+	err := e.CheckFieldID(e.DomainCNName())
 	if err != nil {
 		return err
 	}
@@ -45,7 +45,7 @@ func (e *Entity) ForCreate() error {
 }
 
 func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID()
+	err := e.CheckFieldID(e.DomainCNName())
 	if err != nil {
 		return err
 	}

examples/examples/project/application/domain/class/entity.go

@@ -31,7 +31,7 @@ func (e *Entity) DomainCNName() string {
 }
 
 func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID()
+	err := e.CheckFieldID(e.DomainCNName())
 	if err != nil {
 		return err
 	}
@@ -45,7 +45,7 @@ func (e *Entity) ForCreate() error {
 }
 
 func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID()
+	err := e.CheckFieldID(e.DomainCNName())
 	if err != nil {
 		return err
 	}

examples/examples/project/application/service/class.go

@@ -3,7 +3,7 @@ package service
 import (
 	"git.sxidc.com/go-framework/baize/application"
 	"git.sxidc.com/go-framework/baize/convenient/entity"
-	"git.sxidc.com/go-framework/baize/examples/example_domain/class"
+	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/class"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/service/service_info"
 )
 

examples/examples/project/deployment/config/config.yaml

@@ -3,10 +3,11 @@ api:
   port: 31000
 infrastructure:
   database:
-    user_name: test
-    password: "123456"
-    address: localhost
-    port: 30432
-    database: test
-    max_connections: 20
-    max_idle_connections: 5
+    operations:
+      user_name: test
+      password: "123456"
+      address: localhost
+      port: 30432
+      database: test
+      max_connections: 20
+      max_idle_connections: 5

examples/examples/project/main.go

@@ -8,10 +8,10 @@ import (
 
 // curl -X GET "http://localhost:31000/example/version"
 // curl -X POST -H "Content-Type: application/json" -d '{"name":"test", "studentNum": 10}' "http://localhost:31000/example/v1/class/create"
-// curl -X PUT -H "Content-Type: application/json" -d '{"id":"1a8d5cf5c4574430903e7cfcf2f13e4f", "name":"test-new"}' "http://localhost:31000/example/v1/class/update"
+// curl -X PUT -H "Content-Type: application/json" -d '{"id":"3ca731da91cc42c9b9f413c1b493133d", "name":"test-new"}' "http://localhost:31000/example/v1/class/update"
 // curl -X GET "http://localhost:31000/example/v1/class/query?name=test-new&pageNo=1&pageSize=1"
-// curl -X GET "http://localhost:31000/example/v1/class/get?id=1a8d5cf5c4574430903e7cfcf2f13e4f"
-// curl -X DELETE "http://localhost:31000/example/v1/class/1a8d5cf5c4574430903e7cfcf2f13e4f/delete"
+// curl -X GET "http://localhost:31000/example/v1/class/get?id=3ca731da91cc42c9b9f413c1b493133d"
+// curl -X DELETE "http://localhost:31000/example/v1/class/3ca731da91cc42c9b9f413c1b493133d/delete"
 
 func main() {
 	application.NewApp()

infrastructure/infrastructure.go

@@ -11,8 +11,8 @@ type Config struct {
 }
 
 type DatabaseConfig struct {
-	Operations  *operations.Config
-	DataService *data_service.Config
+	Operations  *operations.Config   `json:"operations" yaml:"operations"`
+	DataService *data_service.Config `json:"data_service" yaml:"data_service"`
 }
 
 type Infrastructure struct {