Browse Source

修改包结构

yjp 11 months ago
parent
commit
9062841d16
69 changed files with 81 additions and 81 deletions
  1. 5 5
      baize.go
  2. 2 2
      convenient/binding/bind_item.go
  3. 2 2
      convenient/binding/binder.go
  4. 2 2
      convenient/binding/request/dto.go
  5. 1 1
      convenient/binding/request/dto_func.go
  6. 2 2
      convenient/binding/response/response.go
  7. 3 3
      convenient/binding/simple_bind_item.go
  8. 5 5
      convenient/domain/configuration/api.go
  9. 6 6
      convenient/entity/service.go
  10. 3 3
      convenient/entity/service_callbacks.go
  11. 2 2
      convenient/entity/simple.go
  12. 6 6
      convenient/value_object/service.go
  13. 3 3
      convenient/value_object/service_callbacks.go
  14. 2 2
      convenient/value_object/simple.go
  15. 1 1
      examples/examples/project/application/application.go
  16. 1 1
      examples/examples/project/application/domain/class/entity.go
  17. 1 1
      examples/examples/project/application/domain/class/info.go
  18. 1 1
      examples/examples/project/application/service/class.go
  19. 1 1
      examples/examples/project/application/service/configuration.go
  20. 4 4
      examples/examples/project/application/service/version.go
  21. 1 1
      examples/examples/project/config/config.go
  22. 0 0
      framwork/api/api.go
  23. 1 1
      framwork/api/context.go
  24. 0 0
      framwork/api/options.go
  25. 0 0
      framwork/api/router.go
  26. 3 3
      framwork/application/application.go
  27. 1 1
      framwork/application/config.go
  28. 0 0
      framwork/application/info.go
  29. 0 0
      framwork/domain/common.go
  30. 0 0
      framwork/domain/entity.go
  31. 0 0
      framwork/domain/object.go
  32. 0 0
      framwork/domain/value_object.go
  33. 0 0
      framwork/infrastructure/database/data_service/client/client.go
  34. 0 0
      framwork/infrastructure/database/data_service/client/data_source.go
  35. 0 0
      framwork/infrastructure/database/data_service/client/infos.go
  36. 0 0
      framwork/infrastructure/database/data_service/client/namespace.go
  37. 0 0
      framwork/infrastructure/database/data_service/client/sql.go
  38. 4 4
      framwork/infrastructure/database/data_service/data_service.go
  39. 1 1
      framwork/infrastructure/database/data_service/grpc_client/grpc_client.go
  40. 0 0
      framwork/infrastructure/database/data_service/grpc_client/v1/request/sql.pb.go
  41. 0 0
      framwork/infrastructure/database/data_service/grpc_client/v1/request/sql.validator.pb.go
  42. 0 0
      framwork/infrastructure/database/data_service/grpc_client/v1/response/sql.pb.go
  43. 2 2
      framwork/infrastructure/database/data_service/grpc_client/v1/sql.pb.go
  44. 2 2
      framwork/infrastructure/database/data_service/grpc_client/v1/sql_grpc.pb.go
  45. 3 3
      framwork/infrastructure/database/data_service/transaction.go
  46. 4 4
      framwork/infrastructure/database/database.go
  47. 0 0
      framwork/infrastructure/database/error.go
  48. 0 0
      framwork/infrastructure/database/operations/db.go
  49. 1 1
      framwork/infrastructure/database/operations/operations.go
  50. 0 0
      framwork/infrastructure/database/operations/table.go
  51. 0 0
      framwork/infrastructure/database/sql/condition.go
  52. 1 1
      framwork/infrastructure/database/sql/result.go
  53. 0 0
      framwork/infrastructure/database/sql/sql_template.go
  54. 0 0
      framwork/infrastructure/database/sql/table_row.go
  55. 0 0
      framwork/infrastructure/database/sql/value.go
  56. 3 3
      framwork/infrastructure/infrastructure.go
  57. 0 0
      framwork/infrastructure/logger/level.go
  58. 0 0
      framwork/infrastructure/logger/logger.go
  59. 0 0
      framwork/infrastructure/logger/opt_file.go
  60. 0 0
      framwork/infrastructure/logger/opt_logger.go
  61. 0 0
      framwork/tag/assign/assign.go
  62. 1 1
      framwork/tag/assign/tag.go
  63. 0 0
      framwork/tag/assign/usage.go
  64. 0 0
      framwork/tag/sql/sql_mapping/sql_mapping.go
  65. 0 0
      framwork/tag/sql/sql_mapping/tag.go
  66. 0 0
      framwork/tag/sql/sql_mapping/usage.go
  67. 0 0
      framwork/tag/sql/sql_result/sql_result.go
  68. 0 0
      framwork/tag/sql/sql_result/tag.go
  69. 0 0
      framwork/tag/sql/sql_result/usage.go

+ 5 - 5
baize.go

@@ -1,11 +1,11 @@
 package baize
 
 import (
-	"git.sxidc.com/go-framework/baize/api"
-	"git.sxidc.com/go-framework/baize/application"
-	"git.sxidc.com/go-framework/baize/infrastructure"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/operations"
+	"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"
 )
 
 func NewApplication(conf application.Config) *application.App {

+ 2 - 2
convenient/binding/bind_item.go

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

+ 2 - 2
convenient/binding/binder.go

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

+ 2 - 2
convenient/binding/request/dto.go

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

+ 1 - 1
convenient/binding/request/dto_func.go

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

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

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

+ 3 - 3
convenient/binding/simple_bind_item.go

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

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

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

+ 6 - 6
convenient/entity/service.go

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

+ 3 - 3
convenient/entity/service_callbacks.go

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

+ 2 - 2
convenient/entity/simple.go

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

+ 6 - 6
convenient/value_object/service.go

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

+ 3 - 3
convenient/value_object/service_callbacks.go

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

+ 2 - 2
convenient/value_object/simple.go

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

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

@@ -2,9 +2,9 @@ package application
 
 import (
 	"git.sxidc.com/go-framework/baize"
-	"git.sxidc.com/go-framework/baize/application"
 	"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/application"
 )
 
 var appInstance *application.App

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

@@ -1,7 +1,7 @@
 package class
 
 import (
-	"git.sxidc.com/go-framework/baize/domain"
+	"git.sxidc.com/go-framework/baize/framwork/domain"
 	"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/application"
+	"git.sxidc.com/go-framework/baize/framwork/application"
 )
 
 type Info struct {

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

@@ -1,9 +1,9 @@
 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/examples/project/application/domain/class"
+	"git.sxidc.com/go-framework/baize/framwork/application"
 )
 
 type Class struct{}

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

@@ -1,8 +1,8 @@
 package service
 
 import (
-	"git.sxidc.com/go-framework/baize/application"
 	"git.sxidc.com/go-framework/baize/convenient/domain/configuration"
+	"git.sxidc.com/go-framework/baize/framwork/application"
 )
 
 type Configuration struct{}

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

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

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

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

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


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

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

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


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


+ 3 - 3
application/application.go → framwork/application/application.go

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

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

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

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


+ 0 - 0
domain/common.go → framwork/domain/common.go


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


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


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


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


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


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


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


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


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

@@ -1,10 +1,10 @@
 package data_service
 
 import (
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service/client"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service/grpc_client"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service/grpc_client/v1/request"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/sql"
+	"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-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"
 	"io"

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

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

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


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


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


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

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

+ 2 - 2
infrastructure/database/data_service/grpc_client/v1/sql_grpc.pb.go → framwork/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/infrastructure/database/data_service/grpc_client/v1/request"
-	response "git.sxidc.com/go-framework/baize/infrastructure/database/data_service/grpc_client/v1/response"
+	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"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"

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

@@ -2,9 +2,9 @@ package data_service
 
 import (
 	"encoding/json"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service/grpc_client/v1"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service/grpc_client/v1/request"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/sql"
+	"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/service-supports/fserr"
 )
 

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

@@ -1,10 +1,10 @@
 package database
 
 import (
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/operations"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/sql"
-	"git.sxidc.com/go-framework/baize/tag/sql/sql_mapping"
+	"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-tools/utils/reflectutils"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"git.sxidc.com/service-supports/fserr"

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


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


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

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

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


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


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

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

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


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


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


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

@@ -1,9 +1,9 @@
 package infrastructure
 
 import (
-	"git.sxidc.com/go-framework/baize/infrastructure/database"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/data_service"
-	"git.sxidc.com/go-framework/baize/infrastructure/database/operations"
+	"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"
 )
 
 type Config struct {

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


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


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


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


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


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

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

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


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


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


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


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


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


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