浏览代码

完成demo修改

yjp 1 年之前
父节点
当前提交
6164d98901

+ 3 - 72
project/mono/application/domain/class/entity.go

@@ -3,9 +3,6 @@ package class
 import (
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -25,7 +22,7 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128"`
+	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128,when=create/update"`
 	StudentNum int      `sqlmapping:"column:student_num;updateClear;" sqlresult:"column:student_num"`
 	StudentNum int      `sqlmapping:"column:student_num;updateClear;" sqlresult:"column:student_num"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	entity.UserIDFields
 	entity.UserIDFields
@@ -40,72 +37,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Class"
 	return "Class"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-	if err != nil {
-		return err
-	}
-
-	err = entity.CheckFieldCreateUserIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	e.LastUpdateUserID = e.CreateUserID
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = entity.CheckFieldLastUpdateUserIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Name) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Name) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }

+ 3 - 60
project/server/application/domain/class/entity.go

@@ -4,9 +4,6 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/domain/operate_log"
 	"git.sxidc.com/go-framework/baize/convenient/domain/operate_log"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -26,7 +23,7 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128"`
+	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128,when=create/update"`
 	StudentNum int      `sqlmapping:"column:student_num;updateClear;" sqlresult:"column:student_num"`
 	StudentNum int      `sqlmapping:"column:student_num;updateClear;" sqlresult:"column:student_num"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	entity.TimeFields
 	entity.TimeFields
@@ -40,47 +37,8 @@ func (e *Entity) DomainCamelName() string {
 	return "Class"
 	return "Class"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }
 
 
 func (e *Entity) ObjectInfo() operate_log.ObjectInfo {
 func (e *Entity) ObjectInfo() operate_log.ObjectInfo {
@@ -100,18 +58,3 @@ func (e *Entity) LogContent() map[string]any {
 		"student_num": e.StudentNum,
 		"student_num": e.StudentNum,
 	}
 	}
 }
 }
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Name) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Name) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

+ 4 - 73
project/server/application/domain/family/entity.go

@@ -3,9 +3,6 @@ package family
 import (
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -25,8 +22,8 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Father    string `sqlmapping:"column:father" sqlresult:"column:father" check:"required,lte=128"`
-	Mother    string `sqlmapping:"column:mother" sqlresult:"column:mother" check:"required,lte=128"`
+	Father    string `sqlmapping:"column:father" sqlresult:"column:father" check:"required,lte=128,when=create/update"`
+	Mother    string `sqlmapping:"column:mother" sqlresult:"column:mother" check:"required,lte=128,when=create/update"`
 	StudentID string `sqlmapping:"column:student_id" sqlresult:"column:student_id" check:"required,eq=32"`
 	StudentID string `sqlmapping:"column:student_id" sqlresult:"column:student_id" check:"required,eq=32"`
 	entity.TimeFields
 	entity.TimeFields
 }
 }
@@ -39,72 +36,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Family"
 	return "Family"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldFather)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldMother)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Father, e.Mother) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Father) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldFather)
-		if err != nil {
-			return err
-		}
-	}
-
-	if strutils.IsStringNotEmpty(e.Mother) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldMother)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }

+ 3 - 34
project/server/application/domain/hobby/entity.go

@@ -1,13 +1,11 @@
 package hobby
 package hobby
 
 
 import (
 import (
-	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 )
 )
 
 
 type Entity struct {
 type Entity struct {
-	ID         string   `sqlmapping:"-" sqlresult:"-" check:"required,len=32"`
+	ID         string   `sqlmapping:"-" sqlresult:"-" check:"required,len=32,when=create/delete/update"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 }
 }
 
 
@@ -28,35 +26,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Hobby"
 	return "Hobby"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	return e.CheckFieldID()
-}
-
-func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) CheckFieldID() error {
-	checkResult := check.Struct(e, map[string]string{entity.FieldID: e.DomainCNName() + "ID"})
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return make(map[string]string)
 }
 }

+ 3 - 60
project/server/application/domain/identity/entity.go

@@ -3,9 +3,6 @@ package identity
 import (
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -22,7 +19,7 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128"`
+	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128,when=create/update"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	entity.TimeFields
 	entity.TimeFields
 }
 }
@@ -35,60 +32,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Identity"
 	return "Identity"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Name) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Name) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }

+ 3 - 59
project/server/application/domain/student/entity.go

@@ -4,9 +4,7 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/domain/query_rule/definition"
 	"git.sxidc.com/go-framework/baize/convenient/domain/query_rule/definition"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -23,7 +21,7 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Name        string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128" rule:"column:name"`
+	Name        string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128,when=create/update" rule:"column:name"`
 	FamilyID    string   `sqlmapping:"column:family_id" sqlresult:"column:family_id" check:"required,len=32"`
 	FamilyID    string   `sqlmapping:"column:family_id" sqlresult:"column:family_id" check:"required,len=32"`
 	ClassID     string   `sqlmapping:"column:class_id" sqlresult:"column:class_id" check:"required,len=32"`
 	ClassID     string   `sqlmapping:"column:class_id" sqlresult:"column:class_id" check:"required,len=32"`
 	IdentityIDs []string `sqlmapping:"-" sqlresult:"-"`
 	IdentityIDs []string `sqlmapping:"-" sqlresult:"-"`
@@ -46,62 +44,8 @@ func (e *Entity) DomainCamelName() string {
 	return "Student"
 	return "Student"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Name) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Name) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }
 
 
 func (e *Entity) FormQueryRuleParams() map[string]any {
 func (e *Entity) FormQueryRuleParams() map[string]any {

+ 2 - 2
project/server_ds/application/application.go

@@ -1,8 +1,8 @@
 package application
 package application
 
 
 import (
 import (
-	"baize-demo/project/server/application/service"
-	"baize-demo/project/server/config"
+	"baize-demo/project/server_ds/application/service"
+	"baize-demo/project/server_ds/config"
 	"git.sxidc.com/go-framework/baize"
 	"git.sxidc.com/go-framework/baize"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

+ 3 - 60
project/server_ds/application/domain/class/entity.go

@@ -4,9 +4,6 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/domain/operate_log"
 	"git.sxidc.com/go-framework/baize/convenient/domain/operate_log"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -26,7 +23,7 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128"`
+	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128,when=create/update"`
 	StudentNum int      `sqlmapping:"column:student_num;updateClear;" sqlresult:"column:student_num"`
 	StudentNum int      `sqlmapping:"column:student_num;updateClear;" sqlresult:"column:student_num"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	entity.TimeFields
 	entity.TimeFields
@@ -40,47 +37,8 @@ func (e *Entity) DomainCamelName() string {
 	return "Class"
 	return "Class"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }
 
 
 func (e *Entity) ObjectInfo() operate_log.ObjectInfo {
 func (e *Entity) ObjectInfo() operate_log.ObjectInfo {
@@ -100,18 +58,3 @@ func (e *Entity) LogContent() map[string]any {
 		"student_num": e.StudentNum,
 		"student_num": e.StudentNum,
 	}
 	}
 }
 }
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Name) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Name) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

+ 4 - 73
project/server_ds/application/domain/family/entity.go

@@ -3,9 +3,6 @@ package family
 import (
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -25,8 +22,8 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Father    string `sqlmapping:"column:father" sqlresult:"column:father" check:"required,lte=128"`
-	Mother    string `sqlmapping:"column:mother" sqlresult:"column:mother" check:"required,lte=128"`
+	Father    string `sqlmapping:"column:father" sqlresult:"column:father" check:"required,lte=128,when=create/update"`
+	Mother    string `sqlmapping:"column:mother" sqlresult:"column:mother" check:"required,lte=128,when=create/update"`
 	StudentID string `sqlmapping:"column:student_id" sqlresult:"column:student_id" check:"required,eq=32"`
 	StudentID string `sqlmapping:"column:student_id" sqlresult:"column:student_id" check:"required,eq=32"`
 	entity.TimeFields
 	entity.TimeFields
 }
 }
@@ -39,72 +36,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Family"
 	return "Family"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldFather)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldMother)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Father, e.Mother) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Father) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldFather)
-		if err != nil {
-			return err
-		}
-	}
-
-	if strutils.IsStringNotEmpty(e.Mother) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldMother)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }

+ 3 - 34
project/server_ds/application/domain/hobby/entity.go

@@ -1,13 +1,11 @@
 package hobby
 package hobby
 
 
 import (
 import (
-	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 )
 )
 
 
 type Entity struct {
 type Entity struct {
-	ID         string   `sqlmapping:"-" sqlresult:"-" check:"required,len=32"`
+	ID         string   `sqlmapping:"-" sqlresult:"-" check:"required,len=32,when=create/delete/update"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 }
 }
 
 
@@ -28,35 +26,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Hobby"
 	return "Hobby"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	err := e.CheckFieldID()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	return e.CheckFieldID()
-}
-
-func (e *Entity) ForUpdate() error {
-	err := e.CheckFieldID()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) CheckFieldID() error {
-	checkResult := check.Struct(e, map[string]string{entity.FieldID: e.DomainCNName() + "ID"})
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return make(map[string]string)
 }
 }

+ 3 - 60
project/server_ds/application/domain/identity/entity.go

@@ -3,9 +3,6 @@ package identity
 import (
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -22,7 +19,7 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128"`
+	Name       string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128,when=create/update"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	StudentIDs []string `sqlmapping:"-" sqlresult:"-"`
 	entity.TimeFields
 	entity.TimeFields
 }
 }
@@ -35,60 +32,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Identity"
 	return "Identity"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Name) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Name) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }

+ 3 - 60
project/server_ds/application/domain/student/entity.go

@@ -3,9 +3,6 @@ package student
 import (
 import (
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
 	"git.sxidc.com/go-framework/baize/framework/core/domain/entity"
-	"git.sxidc.com/go-framework/baize/framework/core/tag/check"
-	"git.sxidc.com/go-tools/utils/strutils"
-	"github.com/pkg/errors"
 )
 )
 
 
 const (
 const (
@@ -22,7 +19,7 @@ var fieldMap = map[string]string{
 
 
 type Entity struct {
 type Entity struct {
 	entity.Base
 	entity.Base
-	Name        string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128"`
+	Name        string   `sqlmapping:"column:name" sqlresult:"column:name" check:"required,lte=128,when=create/update"`
 	FamilyID    string   `sqlmapping:"column:family_id" sqlresult:"column:family_id" check:"required,len=32"`
 	FamilyID    string   `sqlmapping:"column:family_id" sqlresult:"column:family_id" check:"required,len=32"`
 	ClassID     string   `sqlmapping:"column:class_id" sqlresult:"column:class_id" check:"required,len=32"`
 	ClassID     string   `sqlmapping:"column:class_id" sqlresult:"column:class_id" check:"required,len=32"`
 	IdentityIDs []string `sqlmapping:"-" sqlresult:"-"`
 	IdentityIDs []string `sqlmapping:"-" sqlresult:"-"`
@@ -38,60 +35,6 @@ func (e *Entity) DomainCamelName() string {
 	return "Student"
 	return "Student"
 }
 }
 
 
-func (e *Entity) ForCreate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForDelete() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) ForUpdate() error {
-	checkResult := check.Struct(e, fieldMap)
-
-	err := entity.CheckFieldIDResult(checkResult)
-	if err != nil {
-		return err
-	}
-
-	err = e.checkUpdateFields(checkResult)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (e *Entity) checkUpdateFields(checkResult check.Result) error {
-	if strutils.AllBlank(e.Name) {
-		return errors.New(e.DomainCNName() + "没有传递需要更新的字段")
-	}
-
-	if strutils.IsStringNotEmpty(e.Name) {
-		err := domain.CheckField(checkResult, e.DomainCNName(), FieldName)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
+func (e *Entity) GetFieldMap() map[string]string {
+	return fieldMap
 }
 }

+ 1 - 1
project/server_ds/application/service/class.go

@@ -1,7 +1,7 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/class"
+	"baize-demo/project/server_ds/application/domain/class"
 	"git.sxidc.com/go-framework/baize/convenient/domain/operate_log"
 	"git.sxidc.com/go-framework/baize/convenient/domain/operate_log"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"

+ 2 - 2
project/server_ds/application/service/class_and_student.go

@@ -1,8 +1,8 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/class"
-	"baize-demo/project/server/application/domain/student"
+	"baize-demo/project/server_ds/application/domain/class"
+	"baize-demo/project/server_ds/application/domain/student"
 	"git.sxidc.com/go-framework/baize/convenient/relation/one2many"
 	"git.sxidc.com/go-framework/baize/convenient/relation/one2many"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"

+ 1 - 1
project/server_ds/application/service/family.go

@@ -1,7 +1,7 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/family"
+	"baize-demo/project/server_ds/application/domain/family"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"

+ 1 - 1
project/server_ds/application/service/identity.go

@@ -1,7 +1,7 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/identity"
+	"baize-demo/project/server_ds/application/domain/identity"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"

+ 1 - 1
project/server_ds/application/service/student.go

@@ -1,7 +1,7 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/student"
+	"baize-demo/project/server_ds/application/domain/student"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"

+ 2 - 2
project/server_ds/application/service/student_and_family.go

@@ -1,8 +1,8 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/family"
-	"baize-demo/project/server/application/domain/student"
+	"baize-demo/project/server_ds/application/domain/family"
+	"baize-demo/project/server_ds/application/domain/student"
 	"git.sxidc.com/go-framework/baize/convenient/relation/one2one"
 	"git.sxidc.com/go-framework/baize/convenient/relation/one2one"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"

+ 2 - 2
project/server_ds/application/service/student_and_hobby.go

@@ -1,8 +1,8 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/hobby"
-	"baize-demo/project/server/application/domain/student"
+	"baize-demo/project/server_ds/application/domain/hobby"
+	"baize-demo/project/server_ds/application/domain/student"
 	"git.sxidc.com/go-framework/baize/convenient/relation/remote"
 	"git.sxidc.com/go-framework/baize/convenient/relation/remote"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"

+ 2 - 2
project/server_ds/application/service/student_and_identity.go

@@ -1,8 +1,8 @@
 package service
 package service
 
 
 import (
 import (
-	"baize-demo/project/server/application/domain/identity"
-	"baize-demo/project/server/application/domain/student"
+	"baize-demo/project/server_ds/application/domain/identity"
+	"baize-demo/project/server_ds/application/domain/student"
 	"git.sxidc.com/go-framework/baize/convenient/relation/many2many"
 	"git.sxidc.com/go-framework/baize/convenient/relation/many2many"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/api"

+ 1 - 1
project/server_ds/main.go

@@ -1,7 +1,7 @@
 package main
 package main
 
 
 import (
 import (
-	"baize-demo/project/server/application"
+	"baize-demo/project/server_ds/application"
 	DEATH "github.com/vrecan/death"
 	DEATH "github.com/vrecan/death"
 	"syscall"
 	"syscall"
 )
 )

+ 1 - 1
project/server_ds/test/tool_kit.go

@@ -1,7 +1,7 @@
 package test
 package test
 
 
 import (
 import (
-	"baize-demo/project/server/application"
+	"baize-demo/project/server_ds/application"
 	"bytes"
 	"bytes"
 	"encoding/json"
 	"encoding/json"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/go-tools/utils/strutils"

+ 4 - 4
quick_start/main.go

@@ -44,11 +44,11 @@ func main() {
 			c.String(http.StatusOK, "pong")
 			c.String(http.StatusOK, "pong")
 			return nil, nil
 			return nil, nil
 		},
 		},
-	}, func(c *api.Context) {
+	}, func(c *api.Context, i *infrastructure.Infrastructure) {
 		fmt.Println("Root Route Before1")
 		fmt.Println("Root Route Before1")
 		c.Next()
 		c.Next()
 		fmt.Println("Root Route After1")
 		fmt.Println("Root Route After1")
-	}, func(c *api.Context) {
+	}, func(c *api.Context, i *infrastructure.Infrastructure) {
 		fmt.Println("Root Route Before2")
 		fmt.Println("Root Route Before2")
 		c.Next()
 		c.Next()
 		fmt.Println("Root Route After2")
 		fmt.Println("Root Route After2")
@@ -75,11 +75,11 @@ func main() {
 			c.String(http.StatusOK, "pong")
 			c.String(http.StatusOK, "pong")
 			return nil, nil
 			return nil, nil
 		},
 		},
-	}, func(c *api.Context) {
+	}, func(c *api.Context, i *infrastructure.Infrastructure) {
 		fmt.Println("Versioned Route Before1")
 		fmt.Println("Versioned Route Before1")
 		c.Next()
 		c.Next()
 		fmt.Println("Versioned Route After1")
 		fmt.Println("Versioned Route After1")
-	}, func(c *api.Context) {
+	}, func(c *api.Context, i *infrastructure.Infrastructure) {
 		fmt.Println("Versioned Route Before2")
 		fmt.Println("Versioned Route Before2")
 		c.Next()
 		c.Next()
 		fmt.Println("Versioned Route After2")
 		fmt.Println("Versioned Route After2")