From a4f84e27ea45c82595d440ea1c49df84a9c73295 Mon Sep 17 00:00:00 2001 From: rogerogers Date: Fri, 5 Jan 2024 10:43:41 +0800 Subject: [PATCH] refactor: move common mod Signed-off-by: rogerogers --- gomall/app/checkout/go.mod | 4 ++-- gomall/app/checkout/infra/rpc/client.go | 2 +- gomall/{app => }/common/go.mod | 2 +- gomall/{app => }/common/go.sum | 0 gomall/{app => }/common/suite/client.go | 2 +- gomall/{app => }/common/suite/server.go | 0 gomall/{app => }/common/utils/kitex.go | 0 gomall/go.work | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename gomall/{app => }/common/go.mod (98%) rename gomall/{app => }/common/go.sum (100%) rename gomall/{app => }/common/suite/client.go (96%) rename gomall/{app => }/common/suite/server.go (100%) rename gomall/{app => }/common/utils/kitex.go (100%) diff --git a/gomall/app/checkout/go.mod b/gomall/app/checkout/go.mod index dbc0fa98..98e61a28 100644 --- a/gomall/app/checkout/go.mod +++ b/gomall/app/checkout/go.mod @@ -5,7 +5,7 @@ go 1.21 replace github.com/apache/thrift => github.com/apache/thrift v0.13.0 require ( - github.com/cloudwego/biz-demo/gomall/app/common v0.0.0-00010101000000-000000000000 + github.com/cloudwego/biz-demo/gomall/common v0.0.0-00010101000000-000000000000 github.com/cloudwego/fastpb v0.0.4 github.com/cloudwego/kitex v0.8.0 github.com/joho/godotenv v1.5.1 @@ -120,4 +120,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/cloudwego/biz-demo/gomall/app/common => ../common +replace github.com/cloudwego/biz-demo/gomall/common => ./../../common diff --git a/gomall/app/checkout/infra/rpc/client.go b/gomall/app/checkout/infra/rpc/client.go index 73ce0d99..411be5fd 100644 --- a/gomall/app/checkout/infra/rpc/client.go +++ b/gomall/app/checkout/infra/rpc/client.go @@ -27,7 +27,7 @@ import ( "github.com/cloudwego/biz-demo/gomall/app/checkout/kitex_gen/payment/paymentservice" "github.com/cloudwego/biz-demo/gomall/app/checkout/kitex_gen/product/productcatalogservice" checkoututils "github.com/cloudwego/biz-demo/gomall/app/checkout/utils" - "github.com/cloudwego/biz-demo/gomall/app/common/suite" + "github.com/cloudwego/biz-demo/gomall/common/suite" "github.com/cloudwego/kitex/client" "github.com/cloudwego/kitex/pkg/rpcinfo" consul "github.com/kitex-contrib/registry-consul" diff --git a/gomall/app/common/go.mod b/gomall/common/go.mod similarity index 98% rename from gomall/app/common/go.mod rename to gomall/common/go.mod index 32f78da8..e18abf32 100644 --- a/gomall/app/common/go.mod +++ b/gomall/common/go.mod @@ -1,4 +1,4 @@ -module github.com/cloudwego/biz-demo/gomall/app/common +module github.com/cloudwego/biz-demo/gomall/common go 1.21 diff --git a/gomall/app/common/go.sum b/gomall/common/go.sum similarity index 100% rename from gomall/app/common/go.sum rename to gomall/common/go.sum diff --git a/gomall/app/common/suite/client.go b/gomall/common/suite/client.go similarity index 96% rename from gomall/app/common/suite/client.go rename to gomall/common/suite/client.go index 36b70cfc..5edc9fd8 100644 --- a/gomall/app/common/suite/client.go +++ b/gomall/common/suite/client.go @@ -17,7 +17,7 @@ package suite import ( "os" - "github.com/cloudwego/biz-demo/gomall/app/common/utils" + "github.com/cloudwego/biz-demo/gomall/common/utils" "github.com/cloudwego/kitex/client" "github.com/cloudwego/kitex/pkg/rpcinfo" "github.com/cloudwego/kitex/pkg/transmeta" diff --git a/gomall/app/common/suite/server.go b/gomall/common/suite/server.go similarity index 100% rename from gomall/app/common/suite/server.go rename to gomall/common/suite/server.go diff --git a/gomall/app/common/utils/kitex.go b/gomall/common/utils/kitex.go similarity index 100% rename from gomall/app/common/utils/kitex.go rename to gomall/common/utils/kitex.go diff --git a/gomall/go.work b/gomall/go.work index c0544512..7f2cbd29 100644 --- a/gomall/go.work +++ b/gomall/go.work @@ -3,12 +3,12 @@ go 1.21 use ( ./app/cart ./app/checkout - ./app/common ./app/frontend ./app/order ./app/payment ./app/product ./app/user + ./common ) replace github.com/apache/thrift => github.com/apache/thrift v0.13.0