修改bug

convenient/entity/service_callbacks.go

@@ -18,7 +18,7 @@ func callbackBeforeDBOperate[O any](callbacks *Callbacks[O], e domain.Entity, i
 		return nil
 	}
 
-	if callbacks.BeforeDBOperate == nil {
+	if callbacks.BeforeDBOperate != nil {
 		return callbacks.BeforeDBOperate(e, i, dbExecutor)
 	}
 
@@ -30,7 +30,7 @@ func callbackAfterDBOperate[O any](callbacks *Callbacks[O], e domain.Entity, i *
 		return nil
 	}
 
-	if callbacks.AfterDBOperate == nil {
+	if callbacks.AfterDBOperate != nil {
 		return callbacks.AfterDBOperate(e, i, dbExecutor)
 	}
 
@@ -42,7 +42,7 @@ func callbackOnSuccessReturn[O any](callbacks *Callbacks[O], e domain.Entity, i
 		return output, nil
 	}
 
-	if callbacks.OnSuccessReturn == nil {
+	if callbacks.OnSuccessReturn != nil {
 		return callbacks.OnSuccessReturn(e, i, output)
 	}
 
@@ -54,7 +54,7 @@ func callbackOnErrorReturn[O any](callbacks *Callbacks[O], e domain.Entity, err
 		return defaultErrOutput, err
 	}
 
-	if callbacks.OnErrorReturn == nil {
+	if callbacks.OnErrorReturn != nil {
 		return callbacks.OnErrorReturn(e, err, i, defaultErrOutput)
 	}
 

convenient/value_object/service_callbacks.go

@@ -18,7 +18,7 @@ func callbackBeforeDBOperate[O any](callbacks *Callbacks[O], valueObject domain.
 		return nil
 	}
 
-	if callbacks.BeforeDBOperate == nil {
+	if callbacks.BeforeDBOperate != nil {
 		return callbacks.BeforeDBOperate(valueObject, i, dbExecutor)
 	}
 
@@ -30,7 +30,7 @@ func callbackAfterDBOperate[O any](callbacks *Callbacks[O], valueObject domain.V
 		return nil
 	}
 
-	if callbacks.AfterDBOperate == nil {
+	if callbacks.AfterDBOperate != nil {
 		return callbacks.AfterDBOperate(valueObject, i, dbExecutor)
 	}
 
@@ -42,7 +42,7 @@ func callbackOnSuccessReturn[O any](callbacks *Callbacks[O], valueObject domain.
 		return output, nil
 	}
 
-	if callbacks.OnSuccessReturn == nil {
+	if callbacks.OnSuccessReturn != nil {
 		return callbacks.OnSuccessReturn(valueObject, i, output)
 	}
 
@@ -54,7 +54,7 @@ func callbackOnErrorReturn[O any](callbacks *Callbacks[O], valueObject domain.Va
 		return defaultErrOutput, err
 	}
 
-	if callbacks.OnErrorReturn == nil {
+	if callbacks.OnErrorReturn != nil {
 		return callbacks.OnErrorReturn(valueObject, err, i, defaultErrOutput)
 	}
 

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

@@ -21,9 +21,9 @@ type (
 	}
 
 	QueryQueryParams struct {
+		request.BaseQuery
 		Name       string `form:"name" assign:"toField:Name"`
 		StudentNum int    `form:"studentNum" assign:"toField:StudentNum"`
-		request.BaseQuery
 	}
 
 	GetByIDQueryParams struct {

examples/examples/project/config/config.go

@@ -6,7 +6,6 @@ import (
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fslog"
 	"git.sxidc.com/service-supports/scm-sdk"
-	"gopkg.in/yaml.v3"
 	"os"
 )
 
@@ -40,12 +39,13 @@ func initConfigFromSCM() {
 		panic(err)
 	}
 
-	err = yaml.Unmarshal([]byte(info.Content), conf)
+	applicationConfig, err := application.LoadFromYaml(info.Content)
 	if err != nil {
-		fslog.Error(err)
 		panic(err)
 	}
 
+	conf.ApplicationConfig = applicationConfig
+
 	fslog.Info("Load config from scm finish")
 }
 

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

@@ -11,10 +11,10 @@ infrastructure:
       database: test
       max_connections: 20
       max_idle_connections: 5
-    data_service:
-      token: "8qe+uPgpQ2JWxu3lSyOx5NjX+INp5WsnoD1ZWb7PBm4="
-      base_url: http://localhost:10000
-      grpc_address: localhost:10001
-      namespace: "baize"
-      data_source: "baize"
-      timeout_sec: 30
+#    data_service:
+#      token: "8qe+uPgpQ2JWxu3lSyOx5NjX+INp5WsnoD1ZWb7PBm4="
+#      base_url: http://localhost:10000
+#      grpc_address: localhost:10001
+#      namespace: "baize"
+#      data_source: "baize"
+#      timeout_sec: 30

framwork/domain/common.go

@@ -19,7 +19,7 @@ const (
 	FieldIDLen = 32
 )
 
-func CheckID(domainCNName, fieldCNName string, id string) error {
+func CheckID(domainCNName string, fieldCNName string, id string) error {
 	if strutils.IsStringEmpty(id) {
 		return fserr.New(domainCNName + fieldCNName + "为空")
 	}