Browse Source

添加参数

yjp 1 year ago
parent
commit
0feecd4021

+ 8 - 5
convenient/gwtools/entity_crud/entity_crud.go

@@ -50,6 +50,9 @@ type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
+	// 服务缩写
+	ServiceShortName string
+
 	// 领域名称
 	DomainCamelName string
 
@@ -76,7 +79,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !createOptions.disable {
 		createMiddlewares := append(globalOptions.middlewares, createOptions.middlewares...)
 
-		builder.PostRouteWithTenantIDAndUserIDCommon(domainPath+"/create", "tenantId", "createUserId",
+		builder.PostRouteWithTenantIDAndUserIDCommon("/"+simple.ServiceShortName+domainPath+"/create", "tenantId", "createUserId",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.Post(
 					&gateway.PostRequest{
@@ -112,7 +115,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !deleteOptions.disable {
 		deleteMiddlewares := append(globalOptions.middlewares, deleteOptions.middlewares...)
 
-		builder.DeleteRoute(domainPath+"/delete",
+		builder.DeleteRoute("/"+simple.ServiceShortName+domainPath+"/delete",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.
 					Delete(
@@ -149,7 +152,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !updateOptions.disable {
 		updateMiddlewares := append(globalOptions.middlewares, updateOptions.middlewares...)
 
-		builder.PutRouteWithUserIDCommon(domainPath+"/update", "updateUserId",
+		builder.PutRouteWithUserIDCommon("/"+simple.ServiceShortName+domainPath+"/update", "updateUserId",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.
 					Put(
@@ -185,7 +188,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !queryOptions.disable {
 		queryMiddlewares := append(globalOptions.middlewares, queryOptions.middlewares...)
 
-		builder.GetRouteWithTenantID(domainPath+"/query",
+		builder.GetRouteWithTenantID("/"+simple.ServiceShortName+domainPath+"/query",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.
 					Get(
@@ -221,7 +224,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !getByIDOptions.disable {
 		getByIDMiddlewares := append(globalOptions.middlewares, getByIDOptions.middlewares...)
 
-		builder.GetRoute(domainPath+"/get",
+		builder.GetRoute("/"+simple.ServiceShortName+domainPath+"/get",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.
 					Get(

+ 7 - 4
convenient/gwtools/relation/many2many/many2many.go

@@ -22,6 +22,9 @@ type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
+	// 服务缩写
+	ServiceShortName string
+
 	// 左领域名称
 	LeftDomainCamelName string
 
@@ -41,7 +44,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !options.disableLeft {
 		if !options.disableLeftUpdate {
 			// 左到右更新
-			builder.PostRoute(leftDomainPath+rightDomainPath+"/update",
+			builder.PostRoute("/"+simple.ServiceShortName+leftDomainPath+rightDomainPath+"/update",
 				func(requestBuilder *gateway.RequestBuilder) {
 					requestBuilder.
 						Post(&gateway.PostRequest{
@@ -54,7 +57,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableLeftQuery {
 			// 左到右查询
 			builder.
-				GetRoute(leftDomainPath+rightDomainPath+"/query",
+				GetRoute("/"+simple.ServiceShortName+leftDomainPath+rightDomainPath+"/query",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{
@@ -69,7 +72,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableRightUpdate {
 			// 右到左更新
 			builder.
-				PostRoute(rightDomainPath+leftDomainPath+"/update",
+				PostRoute("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/update",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Post(&gateway.PostRequest{
@@ -82,7 +85,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableRightQuery {
 			// 右到左查询
 			builder.
-				GetRoute(rightDomainPath+leftDomainPath+"/query",
+				GetRoute("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/query",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{

+ 8 - 5
convenient/gwtools/relation/one2many/one2many.go

@@ -22,6 +22,9 @@ type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
+	// 服务缩写
+	ServiceShortName string
+
 	// 左领域名称
 	LeftDomainCamelName string
 
@@ -42,7 +45,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableLeftUpdate {
 			// 左到右更新
 			builder.
-				PostRoute(leftDomainPath+rightDomainPath+"/update",
+				PostRoute("/"+simple.ServiceShortName+leftDomainPath+rightDomainPath+"/update",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Post(&gateway.PostRequest{
@@ -55,7 +58,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableLeftQuery {
 			// 左到右查询
 			builder.
-				GetRoute(leftDomainPath+rightDomainPath+"/query",
+				GetRoute("/"+simple.ServiceShortName+leftDomainPath+rightDomainPath+"/query",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{
@@ -70,7 +73,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableRightUpdate {
 			// 右到左更新
 			builder.
-				PostRoute(rightDomainPath+leftDomainPath+"/update",
+				PostRoute("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/update",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Post(&gateway.PostRequest{
@@ -82,7 +85,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 
 		if !options.disableRightQuery {
 			builder.
-				GetRoute(rightDomainPath+leftDomainPath+"/query",
+				GetRoute("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/query",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{
@@ -95,7 +98,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableRightWithLeftQuery {
 			// 右到左查询,携带左方信息
 			builder.
-				GetRouteWithTenantID(rightDomainPath+leftDomainPath+"/queryWith",
+				GetRouteWithTenantID("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/queryWith",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{

+ 9 - 6
convenient/gwtools/relation/one2one/one2one.go

@@ -22,6 +22,9 @@ type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
+	// 服务缩写
+	ServiceShortName string
+
 	// 左领域名称
 	LeftDomainCamelName string
 
@@ -42,7 +45,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableLeftUpdate {
 			// 左到右更新
 			builder.
-				PostRoute(leftDomainPath+rightDomainPath+"/update",
+				PostRoute("/"+simple.ServiceShortName+leftDomainPath+rightDomainPath+"/update",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Post(&gateway.PostRequest{
@@ -55,7 +58,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableLeftQuery {
 			// 左到右查询
 			builder.
-				GetRoute(leftDomainPath+rightDomainPath+"/query",
+				GetRoute("/"+simple.ServiceShortName+leftDomainPath+rightDomainPath+"/query",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{
@@ -68,7 +71,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableLeftWithRightQuery {
 			// 左到右查询,携带右方信息
 			builder.
-				GetRouteWithTenantID(leftDomainPath+rightDomainPath+"/queryWith",
+				GetRouteWithTenantID("/"+simple.ServiceShortName+leftDomainPath+rightDomainPath+"/queryWith",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{
@@ -83,7 +86,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableRightUpdate {
 			// 右到左更新
 			builder.
-				PostRoute(rightDomainPath+leftDomainPath+"/update",
+				PostRoute("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/update",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Post(&gateway.PostRequest{
@@ -96,7 +99,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableRightQuery {
 			// 右到左查询
 			builder.
-				GetRoute(rightDomainPath+leftDomainPath+"/query",
+				GetRoute("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/query",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{
@@ -109,7 +112,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 		if !options.disableRightWithLeftQuery {
 			// 右到左查询,携带左方信息
 			builder.
-				GetRouteWithTenantID(rightDomainPath+leftDomainPath+"/queryWith",
+				GetRouteWithTenantID("/"+simple.ServiceShortName+rightDomainPath+leftDomainPath+"/queryWith",
 					func(requestBuilder *gateway.RequestBuilder) {
 						requestBuilder.
 							Get(&gateway.GetRequest{

+ 6 - 3
convenient/gwtools/value_object_crud/value_object_crud.go

@@ -40,6 +40,9 @@ type Simple struct {
 	// 除去后缀的服务URL,如http://localhost:8080/example/api/v1
 	ServiceVersionedUrl string
 
+	// 服务缩写
+	ServiceShortName string
+
 	// 领域名称
 	DomainCamelName string
 
@@ -62,7 +65,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !createOptions.disable {
 		createMiddlewares := append(globalOptions.middlewares, createOptions.middlewares...)
 
-		builder.PostRouteWithTenantIDAndUserIDCommon(domainPath+"/create", "tenantId", "createUserId",
+		builder.PostRouteWithTenantIDAndUserIDCommon("/"+simple.ServiceShortName+domainPath+"/create", "tenantId", "createUserId",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.
 					Post(
@@ -99,7 +102,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !deleteOptions.disable {
 		deleteMiddlewares := append(globalOptions.middlewares, deleteOptions.middlewares...)
 
-		builder.PostRoute(domainPath+"/delete",
+		builder.PostRoute("/"+simple.ServiceShortName+domainPath+"/delete",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.
 					Post(
@@ -136,7 +139,7 @@ func (simple *Simple) bind(builder *gateway.Builder) {
 	if !queryOptions.disable {
 		queryMiddlewares := append(globalOptions.middlewares, queryOptions.middlewares...)
 
-		builder.GetRouteWithTenantID(domainPath+"/query",
+		builder.GetRouteWithTenantID("/"+simple.ServiceShortName+domainPath+"/query",
 			func(requestBuilder *gateway.RequestBuilder) {
 				requestBuilder.
 					Get(