Browse Source

修改包结构

yjp 11 months ago
parent
commit
d1cc5ad2d4
100 changed files with 147 additions and 147 deletions
  1. 5 5
      baize.go
  2. 5 5
      convenient/domain/configuration/api.go
  3. 1 1
      convenient/domain/configuration/entity.go
  4. 7 7
      convenient/entity_crud/service.go
  5. 3 3
      convenient/entity_crud/service_callbacks.go
  6. 3 3
      convenient/entity_crud/simple.go
  7. 6 6
      convenient/relation/many2many/service.go
  8. 2 2
      convenient/relation/many2many/simple.go
  9. 7 7
      convenient/relation/one2many/service.go
  10. 2 2
      convenient/relation/one2many/simple.go
  11. 7 7
      convenient/relation/one2one/service.go
  12. 2 2
      convenient/relation/one2one/simple.go
  13. 6 6
      convenient/relation/remote/service.go
  14. 2 2
      convenient/relation/remote/simple.go
  15. 7 7
      convenient/value_object_crud/service.go
  16. 3 3
      convenient/value_object_crud/service_callbacks.go
  17. 3 3
      convenient/value_object_crud/simple.go
  18. 3 3
      examples/examples/assign_tag/main.go
  19. 2 2
      examples/examples/project/application/application.go
  20. 1 1
      examples/examples/project/application/domain/class/entity.go
  21. 1 1
      examples/examples/project/application/domain/class/info.go
  22. 1 1
      examples/examples/project/application/domain/family/entity.go
  23. 1 1
      examples/examples/project/application/domain/family/info.go
  24. 1 1
      examples/examples/project/application/domain/hobby/entity.go
  25. 1 1
      examples/examples/project/application/domain/identity/entity.go
  26. 1 1
      examples/examples/project/application/domain/identity/info.go
  27. 1 1
      examples/examples/project/application/domain/student/entity.go
  28. 1 1
      examples/examples/project/application/domain/student/info.go
  29. 1 1
      examples/examples/project/application/service/class.go
  30. 1 1
      examples/examples/project/application/service/class_and_student.go
  31. 1 1
      examples/examples/project/application/service/configuration.go
  32. 1 1
      examples/examples/project/application/service/family.go
  33. 1 1
      examples/examples/project/application/service/identity.go
  34. 1 1
      examples/examples/project/application/service/student.go
  35. 1 1
      examples/examples/project/application/service/student_and_family.go
  36. 1 1
      examples/examples/project/application/service/student_and_hobby.go
  37. 1 1
      examples/examples/project/application/service/student_and_identity.go
  38. 4 4
      examples/examples/project/application/service/version.go
  39. 1 1
      examples/examples/project/config/config.go
  40. 2 2
      examples/examples/sql_mapping_tag/main.go
  41. 2 2
      examples/examples/sql_result_tag/main.go
  42. 2 2
      framwork/binding/bind_item.go
  43. 2 2
      framwork/binding/binder.go
  44. 2 2
      framwork/binding/request/params.go
  45. 1 1
      framwork/binding/request/params_bind_func.go
  46. 2 2
      framwork/binding/response/response.go
  47. 3 3
      framwork/binding/simple_bind_item.go
  48. 0 0
      framwork/core/api/api.go
  49. 1 1
      framwork/core/api/context.go
  50. 0 0
      framwork/core/api/options.go
  51. 0 0
      framwork/core/api/router.go
  52. 4 4
      framwork/core/application/application.go
  53. 1 1
      framwork/core/application/config.go
  54. 0 0
      framwork/core/application/info.go
  55. 0 0
      framwork/core/application/service.go
  56. 0 0
      framwork/core/domain/entity/base.go
  57. 1 1
      framwork/core/domain/entity/entity.go
  58. 0 0
      framwork/core/domain/entity/field.go
  59. 0 0
      framwork/core/domain/entity/utils.go
  60. 0 0
      framwork/core/domain/object.go
  61. 0 0
      framwork/core/domain/value_object/base.go
  62. 0 0
      framwork/core/domain/value_object/utils.go
  63. 1 1
      framwork/core/domain/value_object/value_object.go
  64. 0 0
      framwork/core/infrastructure/database/data_service/client/client.go
  65. 0 0
      framwork/core/infrastructure/database/data_service/client/data_source.go
  66. 0 0
      framwork/core/infrastructure/database/data_service/client/infos.go
  67. 0 0
      framwork/core/infrastructure/database/data_service/client/namespace.go
  68. 0 0
      framwork/core/infrastructure/database/data_service/client/sql.go
  69. 4 4
      framwork/core/infrastructure/database/data_service/data_service.go
  70. 1 1
      framwork/core/infrastructure/database/data_service/grpc_client/grpc_client.go
  71. 0 0
      framwork/core/infrastructure/database/data_service/grpc_client/v1/request/sql.pb.go
  72. 0 0
      framwork/core/infrastructure/database/data_service/grpc_client/v1/request/sql.validator.pb.go
  73. 0 0
      framwork/core/infrastructure/database/data_service/grpc_client/v1/response/sql.pb.go
  74. 2 2
      framwork/core/infrastructure/database/data_service/grpc_client/v1/sql.pb.go
  75. 2 2
      framwork/core/infrastructure/database/data_service/grpc_client/v1/sql_grpc.pb.go
  76. 3 3
      framwork/core/infrastructure/database/data_service/transaction.go
  77. 4 4
      framwork/core/infrastructure/database/database.go
  78. 0 0
      framwork/core/infrastructure/database/error.go
  79. 0 0
      framwork/core/infrastructure/database/operations/db.go
  80. 1 1
      framwork/core/infrastructure/database/operations/operations.go
  81. 0 0
      framwork/core/infrastructure/database/operations/table.go
  82. 0 0
      framwork/core/infrastructure/database/sql/condition.go
  83. 1 1
      framwork/core/infrastructure/database/sql/result.go
  84. 0 0
      framwork/core/infrastructure/database/sql/sql_template.go
  85. 0 0
      framwork/core/infrastructure/database/sql/table_row.go
  86. 0 0
      framwork/core/infrastructure/database/sql/value.go
  87. 3 3
      framwork/core/infrastructure/infrastructure.go
  88. 0 0
      framwork/core/infrastructure/logger/level.go
  89. 0 0
      framwork/core/infrastructure/logger/logger.go
  90. 0 0
      framwork/core/infrastructure/logger/opt_file.go
  91. 0 0
      framwork/core/infrastructure/logger/opt_logger.go
  92. 0 0
      framwork/core/tag/assign/assign.go
  93. 1 1
      framwork/core/tag/assign/tag.go
  94. 0 0
      framwork/core/tag/assign/usage.go
  95. 0 0
      framwork/core/tag/sql/sql_mapping/sql_mapping.go
  96. 1 1
      framwork/core/tag/sql/sql_mapping/tag.go
  97. 0 0
      framwork/core/tag/sql/sql_mapping/usage.go
  98. 0 0
      framwork/core/tag/sql/sql_result/sql_result.go
  99. 1 1
      framwork/core/tag/sql/sql_result/tag.go
  100. 0 0
      framwork/core/tag/sql/sql_result/usage.go

+ 5 - 5
baize.go

@@ -1,11 +1,11 @@
 package baize
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
-	"git.sxidc.com/go-framework/baize/framwork/application"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/operations"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/operations"
 )
 
 func NewApplication(conf application.Config) *application.App {

+ 5 - 5
convenient/domain/configuration/api.go

@@ -2,14 +2,14 @@ package configuration
 
 import (
 	"git.sxidc.com/go-framework/baize/convenient/value_object_crud"
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"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"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 1 - 1
convenient/domain/configuration/entity.go

@@ -1,7 +1,7 @@
 package configuration
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain/value_object"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/value_object"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 7 - 7
convenient/entity_crud/service.go

@@ -1,16 +1,16 @@
 package entity_crud
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
-	"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"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_mapping"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_mapping"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/service-supports/fserr"
 	"reflect"

+ 3 - 3
convenient/entity_crud/service_callbacks.go

@@ -1,9 +1,9 @@
 package entity_crud
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
 )
 
 type Callbacks[O any] struct {

+ 3 - 3
convenient/entity_crud/simple.go

@@ -1,12 +1,12 @@
 package entity_crud
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 )
 
 // Simple 实体CRUD的Bind参数

+ 6 - 6
convenient/relation/many2many/service.go

@@ -1,15 +1,15 @@
 package many2many
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
-	"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"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
 	"git.sxidc.com/go-tools/utils/slice"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 2 - 2
convenient/relation/many2many/simple.go

@@ -5,8 +5,8 @@ import (
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"github.com/iancoleman/strcase"
 )
 

+ 7 - 7
convenient/relation/one2many/service.go

@@ -1,16 +1,16 @@
 package one2many
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
-	"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"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_mapping"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_mapping"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/slice"
 	"git.sxidc.com/go-tools/utils/strutils"

+ 2 - 2
convenient/relation/one2many/simple.go

@@ -5,8 +5,8 @@ import (
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"github.com/iancoleman/strcase"
 )
 

+ 7 - 7
convenient/relation/one2one/service.go

@@ -1,16 +1,16 @@
 package one2one
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
-	"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"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_mapping"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_mapping"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"

+ 2 - 2
convenient/relation/one2one/simple.go

@@ -5,8 +5,8 @@ import (
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"github.com/iancoleman/strcase"
 )
 

+ 6 - 6
convenient/relation/remote/service.go

@@ -1,15 +1,15 @@
 package remote
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
-	"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"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
 	"git.sxidc.com/go-tools/utils/slice"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 2 - 2
convenient/relation/remote/simple.go

@@ -5,8 +5,8 @@ import (
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"github.com/iancoleman/strcase"
 	"reflect"
 )

+ 7 - 7
convenient/value_object_crud/service.go

@@ -1,16 +1,16 @@
 package value_object_crud
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"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"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_mapping"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/value_object"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_mapping"
 	"git.sxidc.com/service-supports/fserr"
 	"reflect"
 )

+ 3 - 3
convenient/value_object_crud/service_callbacks.go

@@ -1,9 +1,9 @@
 package value_object_crud
 
 import (
-	"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/core/domain/value_object"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
 )
 
 type Callbacks[O any] struct {

+ 3 - 3
convenient/value_object_crud/simple.go

@@ -1,12 +1,12 @@
 package value_object_crud
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/domain/value_object"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/value_object"
 )
 
 // Simple 值对象CRD的Bind参数

+ 3 - 3
examples/examples/assign_tag/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"git.sxidc.com/go-framework/baize/framwork/tag/assign"
+	assign2 "git.sxidc.com/go-framework/baize/framwork/core/tag/assign"
 	"reflect"
 	"time"
 )
@@ -31,8 +31,8 @@ type ClassDomain struct {
 func main() {
 	class := new(ClassDomain)
 
-	err := assign.UseTag(&UpdateClassJsonBody{}, class,
-		func(fromFieldName string, fromFieldElemValue reflect.Value, retFieldElementValue reflect.Value, assignTag *assign.Tag) error {
+	err := assign2.UseTag(&UpdateClassJsonBody{}, class,
+		func(fromFieldName string, fromFieldElemValue reflect.Value, retFieldElementValue reflect.Value, assignTag *assign2.Tag) error {
 			fmt.Println("Field Name:", fromFieldName)
 			fmt.Println("Type:", fromFieldElemValue.Type().String())
 			if fromFieldElemValue.Kind() == reflect.String {

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

@@ -4,8 +4,8 @@ import (
 	"git.sxidc.com/go-framework/baize"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/service"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/config"
-	"git.sxidc.com/go-framework/baize/framwork/api"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 	"net/http"
 )
 

+ 1 - 1
examples/examples/project/application/domain/class/entity.go

@@ -1,7 +1,7 @@
 package class
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 1 - 1
examples/examples/project/application/domain/class/info.go

@@ -1,7 +1,7 @@
 package class
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type Info struct {

+ 1 - 1
examples/examples/project/application/domain/family/entity.go

@@ -1,7 +1,7 @@
 package family
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 1 - 1
examples/examples/project/application/domain/family/info.go

@@ -1,7 +1,7 @@
 package family
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type Info struct {

+ 1 - 1
examples/examples/project/application/domain/hobby/entity.go

@@ -1,7 +1,7 @@
 package hobby
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"git.sxidc.com/go-tools/utils/strutils"
 )
 

+ 1 - 1
examples/examples/project/application/domain/identity/entity.go

@@ -1,7 +1,7 @@
 package identity
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 1 - 1
examples/examples/project/application/domain/identity/info.go

@@ -1,7 +1,7 @@
 package identity
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type Info struct {

+ 1 - 1
examples/examples/project/application/domain/student/entity.go

@@ -1,7 +1,7 @@
 package student
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain/entity"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain/entity"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 )

+ 1 - 1
examples/examples/project/application/domain/student/info.go

@@ -1,7 +1,7 @@
 package student
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type Info struct {

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

@@ -3,7 +3,7 @@ package service
 import (
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/class"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type ClassService struct{}

+ 1 - 1
examples/examples/project/application/service/class_and_student.go

@@ -4,7 +4,7 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/relation/one2many"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/class"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/student"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type ClassAndStudentService struct{}

+ 1 - 1
examples/examples/project/application/service/configuration.go

@@ -2,7 +2,7 @@ package service
 
 import (
 	"git.sxidc.com/go-framework/baize/convenient/domain/configuration"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type ConfigurationService struct{}

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

@@ -3,7 +3,7 @@ package service
 import (
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/family"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type FamilyService struct{}

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

@@ -3,7 +3,7 @@ package service
 import (
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/identity"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type IdentityService struct{}

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

@@ -3,7 +3,7 @@ package service
 import (
 	"git.sxidc.com/go-framework/baize/convenient/entity_crud"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/student"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type StudentService struct{}

+ 1 - 1
examples/examples/project/application/service/student_and_family.go

@@ -4,7 +4,7 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/relation/one2one"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/family"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/student"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type StudentAndFamilyService struct{}

+ 1 - 1
examples/examples/project/application/service/student_and_hobby.go

@@ -4,7 +4,7 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/relation/remote"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/hobby"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/student"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type StudentAndHobbyService struct{}

+ 1 - 1
examples/examples/project/application/service/student_and_identity.go

@@ -4,7 +4,7 @@ import (
 	"git.sxidc.com/go-framework/baize/convenient/relation/many2many"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/identity"
 	"git.sxidc.com/go-framework/baize/examples/examples/project/application/domain/student"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 )
 
 type StudentAndIdentityService struct{}

+ 4 - 4
examples/examples/project/application/service/version.go

@@ -1,13 +1,13 @@
 package service
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
-	"git.sxidc.com/go-framework/baize/framwork/application"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
 	"git.sxidc.com/go-framework/baize/framwork/binding/response"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
 )
 
 type VersionService struct{}

+ 1 - 1
examples/examples/project/config/config.go

@@ -2,7 +2,7 @@ package config
 
 import (
 	"fmt"
-	"git.sxidc.com/go-framework/baize/framwork/application"
+	"git.sxidc.com/go-framework/baize/framwork/core/application"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fslog"
 	"git.sxidc.com/service-supports/scm-sdk"

+ 2 - 2
examples/examples/sql_mapping_tag/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_mapping"
+	sql_mapping2 "git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_mapping"
 	"reflect"
 	"time"
 )
@@ -32,7 +32,7 @@ type Class struct {
 }
 
 func main() {
-	err := sql_mapping.UseTag(&Class{}, func(fieldName string, entityFieldElemValue reflect.Value, sqlMappingTag *sql_mapping.Tag) error {
+	err := sql_mapping2.UseTag(&Class{}, func(fieldName string, entityFieldElemValue reflect.Value, sqlMappingTag *sql_mapping2.Tag) error {
 		fmt.Println("Field Name:", fieldName)
 		fmt.Println("Type:", entityFieldElemValue.Type().String())
 		if entityFieldElemValue.Kind() == reflect.String {

+ 2 - 2
examples/examples/sql_result_tag/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_result"
+	sql_result2 "git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_result"
 	"reflect"
 	"time"
 )
@@ -32,7 +32,7 @@ type Class struct {
 }
 
 func main() {
-	err := sql_result.UseTag(&Class{}, func(fieldName string, entityFieldElemValue reflect.Value, sqlResultTag *sql_result.Tag) error {
+	err := sql_result2.UseTag(&Class{}, func(fieldName string, entityFieldElemValue reflect.Value, sqlResultTag *sql_result2.Tag) error {
 		fmt.Println("Field Name:", fieldName)
 		fmt.Println("Type:", entityFieldElemValue.Type().String())
 		if entityFieldElemValue.Kind() == reflect.String {

+ 2 - 2
framwork/binding/bind_item.go

@@ -1,9 +1,9 @@
 package binding
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"

+ 2 - 2
framwork/binding/binder.go

@@ -1,8 +1,8 @@
 package binding
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
 )
 
 type Binder struct {

+ 2 - 2
framwork/binding/request/params.go

@@ -1,8 +1,8 @@
 package request
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/tag/assign"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/tag/assign"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/service-supports/fserr"
 	"reflect"

+ 1 - 1
framwork/binding/request/params_bind_func.go

@@ -1,7 +1,7 @@
 package request
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
 	"github.com/gin-gonic/gin/binding"
 )
 

+ 2 - 2
framwork/binding/response/response.go

@@ -2,8 +2,8 @@ package response
 
 import (
 	"encoding/json"
-	"git.sxidc.com/go-framework/baize/framwork/api"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/logger"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/logger"
 	"git.sxidc.com/service-supports/fserr"
 	"git.sxidc.com/service-supports/websocket"
 )

+ 3 - 3
framwork/binding/simple_bind_item.go

@@ -1,10 +1,10 @@
 package binding
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding/request"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
 	"net/http"
 )
 

+ 0 - 0
framwork/api/api.go → framwork/core/api/api.go


+ 1 - 1
framwork/api/context.go → framwork/core/api/context.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/logger"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/logger"
 	"github.com/gin-gonic/gin"
 	"io"
 	"mime/multipart"

+ 0 - 0
framwork/api/options.go → framwork/core/api/options.go


+ 0 - 0
framwork/api/router.go → framwork/core/api/router.go


+ 4 - 4
framwork/application/application.go → framwork/core/application/application.go

@@ -1,11 +1,11 @@
 package application
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/api"
 	"git.sxidc.com/go-framework/baize/framwork/binding"
-	"git.sxidc.com/go-framework/baize/framwork/domain"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/logger"
+	"git.sxidc.com/go-framework/baize/framwork/core/api"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/logger"
 	"git.sxidc.com/go-tools/utils/strutils"
 )
 

+ 1 - 1
framwork/application/config.go → framwork/core/application/config.go

@@ -2,7 +2,7 @@ package application
 
 import (
 	"encoding/json"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure"
 	"git.sxidc.com/go-tools/utils/fileutils"
 	"git.sxidc.com/service-supports/fserr"
 	"gopkg.in/yaml.v3"

+ 0 - 0
framwork/application/info.go → framwork/core/application/info.go


+ 0 - 0
framwork/application/service.go → framwork/core/application/service.go


+ 0 - 0
framwork/domain/entity/base.go → framwork/core/domain/entity/base.go


+ 1 - 1
framwork/domain/entity/entity.go → framwork/core/domain/entity/entity.go

@@ -1,7 +1,7 @@
 package entity
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/domain"
+	"git.sxidc.com/go-framework/baize/framwork/core/domain"
 )
 
 type Entity interface {

+ 0 - 0
framwork/domain/entity/field.go → framwork/core/domain/entity/field.go


+ 0 - 0
framwork/domain/entity/utils.go → framwork/core/domain/entity/utils.go


+ 0 - 0
framwork/domain/object.go → framwork/core/domain/object.go


+ 0 - 0
framwork/domain/value_object/base.go → framwork/core/domain/value_object/base.go


+ 0 - 0
framwork/domain/value_object/utils.go → framwork/core/domain/value_object/utils.go


+ 1 - 1
framwork/domain/value_object/value_object.go → framwork/core/domain/value_object/value_object.go

@@ -1,6 +1,6 @@
 package value_object
 
-import "git.sxidc.com/go-framework/baize/framwork/domain"
+import "git.sxidc.com/go-framework/baize/framwork/core/domain"
 
 type ValueObject interface {
 	domain.Object

+ 0 - 0
framwork/infrastructure/database/data_service/client/client.go → framwork/core/infrastructure/database/data_service/client/client.go


+ 0 - 0
framwork/infrastructure/database/data_service/client/data_source.go → framwork/core/infrastructure/database/data_service/client/data_source.go


+ 0 - 0
framwork/infrastructure/database/data_service/client/infos.go → framwork/core/infrastructure/database/data_service/client/infos.go


+ 0 - 0
framwork/infrastructure/database/data_service/client/namespace.go → framwork/core/infrastructure/database/data_service/client/namespace.go


+ 0 - 0
framwork/infrastructure/database/data_service/client/sql.go → framwork/core/infrastructure/database/data_service/client/sql.go


+ 4 - 4
framwork/infrastructure/database/data_service/data_service.go → framwork/core/infrastructure/database/data_service/data_service.go

@@ -1,10 +1,10 @@
 package data_service
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/client"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1/request"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/client"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1/request"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 	"io"

+ 1 - 1
framwork/infrastructure/database/data_service/grpc_client/grpc_client.go → framwork/core/infrastructure/database/data_service/grpc_client/grpc_client.go

@@ -2,7 +2,7 @@ package grpc_client
 
 import (
 	"context"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

+ 0 - 0
framwork/infrastructure/database/data_service/grpc_client/v1/request/sql.pb.go → framwork/core/infrastructure/database/data_service/grpc_client/v1/request/sql.pb.go


+ 0 - 0
framwork/infrastructure/database/data_service/grpc_client/v1/request/sql.validator.pb.go → framwork/core/infrastructure/database/data_service/grpc_client/v1/request/sql.validator.pb.go


+ 0 - 0
framwork/infrastructure/database/data_service/grpc_client/v1/response/sql.pb.go → framwork/core/infrastructure/database/data_service/grpc_client/v1/response/sql.pb.go


+ 2 - 2
framwork/infrastructure/database/data_service/grpc_client/v1/sql.pb.go → framwork/core/infrastructure/database/data_service/grpc_client/v1/sql.pb.go

@@ -7,8 +7,8 @@
 package v1
 
 import (
-	request "git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1/request"
-	response "git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1/response"
+	request "git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1/request"
+	response "git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1/response"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"

+ 2 - 2
framwork/infrastructure/database/data_service/grpc_client/v1/sql_grpc.pb.go → framwork/core/infrastructure/database/data_service/grpc_client/v1/sql_grpc.pb.go

@@ -8,8 +8,8 @@ package v1
 
 import (
 	context "context"
-	request "git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1/request"
-	response "git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1/response"
+	request "git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1/request"
+	response "git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1/response"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"

+ 3 - 3
framwork/infrastructure/database/data_service/transaction.go → framwork/core/infrastructure/database/data_service/transaction.go

@@ -2,9 +2,9 @@ package data_service
 
 import (
 	"encoding/json"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service/grpc_client/v1/request"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service/grpc_client/v1/request"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
 	"git.sxidc.com/service-supports/fserr"
 )
 

+ 4 - 4
framwork/infrastructure/database/database.go → framwork/core/infrastructure/database/database.go

@@ -1,10 +1,10 @@
 package database
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/operations"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/sql"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_mapping"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/operations"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_mapping"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"

+ 0 - 0
framwork/infrastructure/database/error.go → framwork/core/infrastructure/database/error.go


+ 0 - 0
framwork/infrastructure/database/operations/db.go → framwork/core/infrastructure/database/operations/db.go


+ 1 - 1
framwork/infrastructure/database/operations/operations.go → framwork/core/infrastructure/database/operations/operations.go

@@ -3,7 +3,7 @@ package operations
 import (
 	dbSql "database/sql"
 	"encoding/json"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/sql"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/sql"
 	"git.sxidc.com/go-tools/utils/template"
 	"git.sxidc.com/service-supports/fslog"
 	"gorm.io/gorm"

+ 0 - 0
framwork/infrastructure/database/operations/table.go → framwork/core/infrastructure/database/operations/table.go


+ 0 - 0
framwork/infrastructure/database/sql/condition.go → framwork/core/infrastructure/database/sql/condition.go


+ 1 - 1
framwork/infrastructure/database/sql/result.go → framwork/core/infrastructure/database/sql/result.go

@@ -2,7 +2,7 @@ package sql
 
 import (
 	"fmt"
-	"git.sxidc.com/go-framework/baize/framwork/tag/sql/sql_result"
+	"git.sxidc.com/go-framework/baize/framwork/core/tag/sql/sql_result"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/service-supports/fserr"
 	"reflect"

+ 0 - 0
framwork/infrastructure/database/sql/sql_template.go → framwork/core/infrastructure/database/sql/sql_template.go


+ 0 - 0
framwork/infrastructure/database/sql/table_row.go → framwork/core/infrastructure/database/sql/table_row.go


+ 0 - 0
framwork/infrastructure/database/sql/value.go → framwork/core/infrastructure/database/sql/value.go


+ 3 - 3
framwork/infrastructure/infrastructure.go → framwork/core/infrastructure/infrastructure.go

@@ -1,9 +1,9 @@
 package infrastructure
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/data_service"
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/database/operations"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/data_service"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/database/operations"
 )
 
 type Config struct {

+ 0 - 0
framwork/infrastructure/logger/level.go → framwork/core/infrastructure/logger/level.go


+ 0 - 0
framwork/infrastructure/logger/logger.go → framwork/core/infrastructure/logger/logger.go


+ 0 - 0
framwork/infrastructure/logger/opt_file.go → framwork/core/infrastructure/logger/opt_file.go


+ 0 - 0
framwork/infrastructure/logger/opt_logger.go → framwork/core/infrastructure/logger/opt_logger.go


+ 0 - 0
framwork/tag/assign/assign.go → framwork/core/tag/assign/assign.go


+ 1 - 1
framwork/tag/assign/tag.go → framwork/core/tag/assign/tag.go

@@ -1,7 +1,7 @@
 package assign
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/logger"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/logger"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"

+ 0 - 0
framwork/tag/assign/usage.go → framwork/core/tag/assign/usage.go


+ 0 - 0
framwork/tag/sql/sql_mapping/sql_mapping.go → framwork/core/tag/sql/sql_mapping/sql_mapping.go


+ 1 - 1
framwork/tag/sql/sql_mapping/tag.go → framwork/core/tag/sql/sql_mapping/tag.go

@@ -1,7 +1,7 @@
 package sql_mapping
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/logger"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/logger"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"

+ 0 - 0
framwork/tag/sql/sql_mapping/usage.go → framwork/core/tag/sql/sql_mapping/usage.go


+ 0 - 0
framwork/tag/sql/sql_result/sql_result.go → framwork/core/tag/sql/sql_result/sql_result.go


+ 1 - 1
framwork/tag/sql/sql_result/tag.go → framwork/core/tag/sql/sql_result/tag.go

@@ -1,7 +1,7 @@
 package sql_result
 
 import (
-	"git.sxidc.com/go-framework/baize/framwork/infrastructure/logger"
+	"git.sxidc.com/go-framework/baize/framwork/core/infrastructure/logger"
 	"git.sxidc.com/go-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"

+ 0 - 0
framwork/tag/sql/sql_result/usage.go → framwork/core/tag/sql/sql_result/usage.go