yjp 1 år sedan
förälder
incheckning
2208209aa3

+ 3 - 3
assign_tag/main.go

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

+ 46 - 2
project/gateway/main.go

@@ -1,7 +1,51 @@
 package main
 
-import "git.sxidc.com/go-framework/baize/convenient/gateway"
+import (
+	"git.sxidc.com/go-framework/baize"
+	"git.sxidc.com/go-framework/baize/convenient/gateway"
+	"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/application"
+	DEATH "github.com/vrecan/death"
+	"net/http"
+	"syscall"
+)
 
 func main() {
-	gateway.NewGateway()
+	app := baize.NewApplication(application.Config{
+		ApiConfig: application.ApiConfig{
+			UrlPrefix: "/gateway/api",
+			Port:      "11000",
+		},
+	})
+
+	app.Api().
+		PrefixRouter().
+		RegisterVersionedRouter("v1")
+
+	prefixRootBinder := binding.NewBinder(app.ChooseRouter(api.RouterPrefix, ""), app.Infrastructure())
+
+	gw := gateway.NewGateway()
+	defer gateway.DestroyGateway(gw)
+
+	gw.BindPassThrough(prefixRootBinder, &gateway.PassThrough{
+		HttpMethod:   http.MethodGet,
+		RelativePath: "/version",
+		ToUrl:        "http://localhost:31000/example/api/version",
+	})
+
+	go func() {
+		if err := app.Start(); err != nil {
+			panic(err)
+		}
+	}()
+
+	defer func() {
+		if err := app.Finish(); err != nil {
+			panic(err)
+		}
+	}()
+
+	death := DEATH.NewDeath(syscall.SIGINT, syscall.SIGTERM)
+	_ = death.WaitForDeath()
 }

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

@@ -1,9 +1,9 @@
 package application
 
 import (
+	"baize-demo/project/server/application/service"
+	"baize-demo/project/server/config"
 	"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/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"
 	"net/http"

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

@@ -1,8 +1,8 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/class"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

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

@@ -1,9 +1,9 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/class"
+	"baize-demo/project/server/application/domain/student"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

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

@@ -1,8 +1,8 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/family"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

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

@@ -1,8 +1,8 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/identity"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

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

@@ -1,8 +1,8 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/student"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

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

@@ -1,9 +1,9 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/family"
+	"baize-demo/project/server/application/domain/student"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

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

@@ -1,9 +1,9 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/hobby"
+	"baize-demo/project/server/application/domain/student"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

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

@@ -1,9 +1,9 @@
 package service
 
 import (
+	"baize-demo/project/server/application/domain/identity"
+	"baize-demo/project/server/application/domain/student"
 	"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/framework/binding"
 	"git.sxidc.com/go-framework/baize/framework/core/api"
 	"git.sxidc.com/go-framework/baize/framework/core/application"

+ 1 - 1
project/server/main.go

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

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

@@ -1,9 +1,9 @@
 package test
 
 import (
+	"baize-demo/project/server/application"
 	"bytes"
 	"encoding/json"
-	"git.sxidc.com/go-framework/baize/examples/examples/project/application"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"github.com/stretchr/testify/assert"
 	"io"

+ 2 - 2
sql_mapping_tag/main.go

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

+ 2 - 2
sql_result_tag/main.go

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