yjp 1 рік тому
батько
коміт
5794797d3c

+ 3 - 6
project/gateway/api/root/demo_server/configuration.go

@@ -1,13 +1,10 @@
 package demo_server
 
 import (
-	"git.sxidc.com/go-framework/baize/convenient/gwtools"
+	"git.sxidc.com/go-framework/baize/convenient/domain_gateway"
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func configurationService(builder *gateway.Builder) {
-	gwtools.CRUD(builder, &gwtools.CRUDParams{
-		ServiceVersionedUrl: baseUrl,
-		DomainCamelName:     "Configuration",
-	}, gwtools.WithCRUDDisableUpdate())
+func configurationGateway(builder *gateway.Builder) {
+	domain_gateway.ConfigurationGateway(serviceVersionedUrl, builder)
 }

+ 6 - 4
project/gateway/api/root/demo_server/demo_server.go

@@ -5,10 +5,12 @@ import (
 )
 
 const (
-	baseUrl = "http://localhost:31000/example/api"
+	serviceBaseUrlNoPrefix = "http://localhost:31000"
+	serviceVersionedUrl    = serviceBaseUrlNoPrefix + "/example/api"
 )
 
-func InitRouter(builder *gateway.Builder) {
-	versionService(builder)
-	configurationService(builder)
+func InitGateway(builder *gateway.Builder) {
+	versionGateway(builder)
+	configurationGateway(builder)
+	sqlExecutorGateway(builder)
 }

+ 10 - 0
project/gateway/api/root/demo_server/sql_executor.go

@@ -0,0 +1,10 @@
+package demo_server
+
+import (
+	"git.sxidc.com/go-framework/baize/convenient/domain_gateway"
+	"git.sxidc.com/go-framework/baize/framework/gateway"
+)
+
+func sqlExecutorGateway(builder *gateway.Builder) {
+	domain_gateway.SqlExecutorGateway(serviceBaseUrlNoPrefix, builder)
+}

+ 2 - 2
project/gateway/api/root/demo_server/version.go

@@ -6,10 +6,10 @@ import (
 )
 
 const (
-	versionBaseUrl = baseUrl + "/version"
+	versionBaseUrl = serviceVersionedUrl + "/version"
 )
 
-func versionService(builder *gateway.Builder) {
+func versionGateway(builder *gateway.Builder) {
 	gwtools.GetPassThrough(builder, &gwtools.SimplePassThroughParams{
 		RelativePath: "/version",
 		Request: &gateway.GetRequest{

+ 1 - 1
project/gateway/api/root/root.go

@@ -10,5 +10,5 @@ type Router struct{}
 
 func (router *Router) Init(gw *gateway.Gateway) {
 	builder := gw.NewBuilder(api.RouterPrefix, "")
-	demo_server.InitRouter(builder)
+	demo_server.InitGateway(builder)
 }

+ 2 - 2
project/gateway/api/v1/demo_server/class.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func classService(builder *gateway.Builder) {
+func classGateway(builder *gateway.Builder) {
 	gwtools.CRUD(builder, &gwtools.CRUDParams{
-		ServiceVersionedUrl: baseUrl,
+		ServiceVersionedUrl: serviceVersionedUrl,
 		DomainCamelName:     "Class",
 	})
 }

+ 2 - 2
project/gateway/api/v1/demo_server/class_and_student.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func classAndStudentService(builder *gateway.Builder) {
+func classAndStudentGateway(builder *gateway.Builder) {
 	gwtools.One2Many(builder, &gwtools.One2ManyParams{
-		ServiceVersionedUrl:  baseUrl,
+		ServiceVersionedUrl:  serviceVersionedUrl,
 		LeftDomainCamelName:  "Class",
 		RightDomainCamelName: "Student",
 	})

+ 11 - 10
project/gateway/api/v1/demo_server/demo_server.go

@@ -5,16 +5,17 @@ import (
 )
 
 const (
-	baseUrl = "http://localhost:31000/example/api/v1"
+	serviceBaseUrlNoPrefix = "http://localhost:31000"
+	serviceVersionedUrl    = serviceBaseUrlNoPrefix + "/example/api/v1"
 )
 
-func InitRouter(builder *gateway.Builder) {
-	classService(builder)
-	studentService(builder)
-	familyService(builder)
-	identityService(builder)
-	studentAndFamilyService(builder)
-	studentAndIdentityService(builder)
-	studentAndHobbyService(builder)
-	classAndStudentService(builder)
+func InitGateway(builder *gateway.Builder) {
+	classGateway(builder)
+	studentGateway(builder)
+	familyGateway(builder)
+	identityGateway(builder)
+	studentAndFamilyGateway(builder)
+	studentAndIdentityGateway(builder)
+	studentAndHobbyGateway(builder)
+	classAndStudentGateway(builder)
 }

+ 2 - 2
project/gateway/api/v1/demo_server/family.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func familyService(builder *gateway.Builder) {
+func familyGateway(builder *gateway.Builder) {
 	gwtools.CRUD(builder, &gwtools.CRUDParams{
-		ServiceVersionedUrl: baseUrl,
+		ServiceVersionedUrl: serviceVersionedUrl,
 		DomainCamelName:     "Family",
 	})
 }

+ 2 - 2
project/gateway/api/v1/demo_server/identity.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func identityService(builder *gateway.Builder) {
+func identityGateway(builder *gateway.Builder) {
 	gwtools.CRUD(builder, &gwtools.CRUDParams{
-		ServiceVersionedUrl: baseUrl,
+		ServiceVersionedUrl: serviceVersionedUrl,
 		DomainCamelName:     "Identity",
 	})
 }

+ 2 - 2
project/gateway/api/v1/demo_server/student.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func studentService(builder *gateway.Builder) {
+func studentGateway(builder *gateway.Builder) {
 	gwtools.CRUD(builder, &gwtools.CRUDParams{
-		ServiceVersionedUrl: baseUrl,
+		ServiceVersionedUrl: serviceVersionedUrl,
 		DomainCamelName:     "Student",
 	})
 }

+ 2 - 2
project/gateway/api/v1/demo_server/student_and_family.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func studentAndFamilyService(builder *gateway.Builder) {
+func studentAndFamilyGateway(builder *gateway.Builder) {
 	gwtools.One2One(builder, &gwtools.One2OneParams{
-		ServiceVersionedUrl:  baseUrl,
+		ServiceVersionedUrl:  serviceVersionedUrl,
 		LeftDomainCamelName:  "Student",
 		RightDomainCamelName: "Family",
 	})

+ 2 - 2
project/gateway/api/v1/demo_server/student_and_hobby.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func studentAndHobbyService(builder *gateway.Builder) {
+func studentAndHobbyGateway(builder *gateway.Builder) {
 	gwtools.Many2Many(builder, &gwtools.Many2ManyParams{
-		ServiceVersionedUrl:  baseUrl,
+		ServiceVersionedUrl:  serviceVersionedUrl,
 		LeftDomainCamelName:  "Student",
 		RightDomainCamelName: "Hobby",
 	})

+ 2 - 2
project/gateway/api/v1/demo_server/student_and_identity.go

@@ -5,9 +5,9 @@ import (
 	"git.sxidc.com/go-framework/baize/framework/gateway"
 )
 
-func studentAndIdentityService(builder *gateway.Builder) {
+func studentAndIdentityGateway(builder *gateway.Builder) {
 	gwtools.Many2Many(builder, &gwtools.Many2ManyParams{
-		ServiceVersionedUrl:  baseUrl,
+		ServiceVersionedUrl:  serviceVersionedUrl,
 		LeftDomainCamelName:  "Student",
 		RightDomainCamelName: "Identity",
 	})

+ 1 - 1
project/gateway/api/v1/v1.go

@@ -10,5 +10,5 @@ type Router struct{}
 
 func (router *Router) Init(gw *gateway.Gateway) {
 	builder := gw.NewBuilder(api.RouterPrefix, "v1")
-	demo_server.InitRouter(builder)
+	demo_server.InitGateway(builder)
 }

+ 4 - 0
project/gateway/main.go

@@ -77,6 +77,10 @@ import (
 // curl -X POST -H "Content-Type: application/json" -d '{"id":"42b305bb292c4082a3e91a2967f11111", "studentIds": ["7880acb4f5df40a2b98055d15858f13d"]}' "http://localhost:31000/example/api/v1/hobby/student/update"
 // curl -X GET "http://localhost:31000/example/api/v1/hobby/student/query?id=42b305bb292c4082a3e91a2967f11111"
 
+// Sql Executor
+// curl -X POST -H 'Content-Type: application/json' -d '{"urlPrefix": "example", "sql": "SELECT * FROM test.sql_execute_logs", "executorId": "guest-00254b4a7102429db35e6edc8e", "executorName": "test"}' "http://localhost:32000/gateway/api/sql/execute"
+// curl -X GET "http://localhost:32000/gateway/api/sql/execute/log?urlPrefix=example&sql=SELECT&executorId=guest-00254b4a7102429db35e6edc8e&executorName=te&startExecuteTime=2024-05-30%2012:03:45"
+
 func main() {
 	api.NewGateway()
 	defer api.DestroyGateway()