From f994b2de9c70ac69490a7c4fe33ec4e4f15afbe2 Mon Sep 17 00:00:00 2001 From: yanweidong Date: Mon, 10 Aug 2026 10:03:46 +0800 Subject: [PATCH] refactor: add unified all service gateway --- README.md | 8 +- all/cmd/main/main.go | 110 ++++++++++++ all/etc/all_dev.yaml | 63 +++++++ {cmd => all}/go.mod | 35 ++-- {cmd => all}/go.sum | 39 ++--- all/internal/config/config.go | 48 ++++++ all/internal/impl/impl.go | 21 +++ all/internal/server/server.go | 90 ++++++++++ all/internal/server/server_test.go | 21 +++ cmd/main/main.go | 116 ------------- cmd/main/main_test.go | 19 --- go.work | 2 +- go.work.sum | 2 + module/base/ads/cmd/main/main.go | 4 +- module/base/ads/internal/server/new.go | 13 +- module/base/ads/pb/const.pb.go | 170 +++++++++---------- module/base/ads/proto/const.proto | 2 +- module/base/ads/service/expose.go | 25 +++ module/base/cloud/cmd/main/main.go | 4 +- module/base/cloud/internal/server/new.go | 13 +- module/base/cloud/pb/album.pb.go | 62 +++---- module/base/cloud/pb/bookmark.pb.go | 36 ++-- module/base/cloud/pb/const.pb.go | 170 +++++++++---------- module/base/cloud/pb/disk.pb.go | 74 ++++---- module/base/cloud/pb/note.pb.go | 56 +++--- module/base/cloud/pb/private.pb.go | 48 +++--- module/base/cloud/pb/share.pb.go | 32 ++-- module/base/cloud/pb/space.pb.go | 16 +- module/base/cloud/proto/album.proto | 26 +-- module/base/cloud/proto/bookmark.proto | 12 +- module/base/cloud/proto/const.proto | 2 +- module/base/cloud/proto/disk.proto | 30 ++-- module/base/cloud/proto/note.proto | 20 +-- module/base/cloud/proto/private.proto | 18 +- module/base/cloud/proto/share.proto | 10 +- module/base/cloud/proto/space.proto | 4 +- module/base/cloud/service/expose.go | 43 +++++ module/base/cms/cmd/main/main.go | 4 +- module/base/cms/internal/server/new.go | 13 +- module/base/cms/pb/category.pb.go | 50 +++--- module/base/cms/pb/const.pb.go | 170 +++++++++---------- module/base/cms/pb/pages.pb.go | 38 ++--- module/base/cms/pb/post.pb.go | 98 +++++------ module/base/cms/pb/site.pb.go | 32 ++-- module/base/cms/pb/tags.pb.go | 40 ++--- module/base/cms/proto/category.proto | 16 +- module/base/cms/proto/const.proto | 2 +- module/base/cms/proto/pages.proto | 10 +- module/base/cms/proto/post.proto | 38 ++--- module/base/cms/proto/site.proto | 12 +- module/base/cms/proto/tags.proto | 12 +- module/base/cms/service/expose.go | 37 ++++ module/base/feedback/cmd/main/main.go | 4 +- module/base/feedback/internal/server/new.go | 13 +- module/base/feedback/pb/const.pb.go | 166 +++++++++--------- module/base/feedback/proto/const.proto | 2 +- module/base/feedback/service/expose.go | 25 +++ module/base/fts/cmd/main/main.go | 2 +- module/base/fts/service/expose.go | 11 ++ module/base/initial/cmd/main/main.go | 4 +- module/base/initial/internal/server/new.go | 13 +- module/base/initial/pb/const.pb.go | 154 ++++++++--------- module/base/initial/proto/const.proto | 2 +- module/base/initial/service/expose.go | 28 +++ module/base/logs/cmd/main/main.go | 2 +- module/base/logs/service/expose.go | 11 ++ module/base/mgt/cmd/main/main.go | 2 +- module/base/mgt/service/expose.go | 11 ++ module/base/passport/cmd/main/main.go | 4 +- module/base/passport/internal/server/new.go | 13 +- module/base/passport/pb/account.pb.go | 42 ++--- module/base/passport/pb/const.pb.go | 170 +++++++++---------- module/base/passport/pb/forget.pb.go | 14 +- module/base/passport/pb/login.pb.go | 10 +- module/base/passport/pb/register.pb.go | 10 +- module/base/passport/pb/verify.pb.go | 14 +- module/base/passport/proto/account.proto | 14 +- module/base/passport/proto/const.proto | 2 +- module/base/passport/proto/forget.proto | 6 +- module/base/passport/proto/login.proto | 2 +- module/base/passport/proto/register.proto | 2 +- module/base/passport/proto/verify.proto | 6 +- module/base/passport/service/expose.go | 37 ++++ module/base/sender/cmd/main/main.go | 4 +- module/base/sender/internal/server/new.go | 13 +- module/base/sender/pb/const.pb.go | 170 +++++++++---------- module/base/sender/proto/const.proto | 2 +- module/base/sender/service/expose.go | 28 +++ module/ec/address/cmd/main/main.go | 4 +- module/ec/address/internal/server/new.go | 13 +- module/ec/address/pb/const.pb.go | 154 ++++++++--------- module/ec/address/proto/const.proto | 2 +- module/ec/address/service/expose.go | 25 +++ module/ec/mall/cmd/main/main.go | 4 +- module/ec/mall/internal/server/new.go | 13 +- module/ec/mall/pb/ads.pb.go | 28 +-- module/ec/mall/pb/category.pb.go | 22 +-- module/ec/mall/pb/const.pb.go | 170 +++++++++---------- module/ec/mall/pb/freight.pb.go | 50 +++--- module/ec/mall/pb/notice.pb.go | 28 +-- module/ec/mall/pb/product.pb.go | 101 ++++++----- module/ec/mall/pb/staff.pb.go | 36 ++-- module/ec/mall/pb/store.pb.go | 40 ++--- module/ec/mall/proto/ads.proto | 10 +- module/ec/mall/proto/category.proto | 8 +- module/ec/mall/proto/const.proto | 2 +- module/ec/mall/proto/freight.proto | 20 +-- module/ec/mall/proto/notice.proto | 8 +- module/ec/mall/proto/product.proto | 40 ++--- module/ec/mall/proto/staff.proto | 14 +- module/ec/mall/proto/store.proto | 16 +- module/ec/mall/service/expose.go | 43 +++++ module/ec/market/cmd/main/main.go | 4 +- module/ec/market/internal/server/new.go | 13 +- module/ec/market/pb/agency.pb.go | 50 +++--- module/ec/market/pb/const.pb.go | 170 +++++++++---------- module/ec/market/pb/data.pb.go | 30 ++-- module/ec/market/pb/supply.pb.go | 32 ++-- module/ec/market/proto/agency.proto | 20 +-- module/ec/market/proto/const.proto | 2 +- module/ec/market/proto/data.proto | 12 +- module/ec/market/proto/supply.proto | 12 +- module/ec/market/service/expose.go | 31 ++++ module/ec/order/cmd/main/main.go | 4 +- module/ec/order/internal/server/new.go | 13 +- module/ec/order/pb/cart.pb.go | 18 +- module/ec/order/pb/const.pb.go | 170 +++++++++---------- module/ec/order/pb/mgt.pb.go | 58 +++---- module/ec/order/pb/summary.pb.go | 66 +++---- module/ec/order/proto/cart.proto | 8 +- module/ec/order/proto/const.proto | 2 +- module/ec/order/proto/mgt.proto | 16 +- module/ec/order/proto/summary.proto | 20 +-- module/ec/order/service/expose.go | 34 ++++ module/finance/wallet/cmd/main/main.go | 4 +- module/finance/wallet/internal/server/new.go | 13 +- module/finance/wallet/pb/const.pb.go | 170 +++++++++---------- module/finance/wallet/pb/payment.pb.go | 26 +-- module/finance/wallet/pb/wallet.pb.go | 30 ++-- module/finance/wallet/proto/const.proto | 2 +- module/finance/wallet/proto/payment.proto | 8 +- module/finance/wallet/proto/wallet.proto | 10 +- module/finance/wallet/service/expose.go | 34 ++++ 143 files changed, 2853 insertions(+), 2129 deletions(-) create mode 100644 all/cmd/main/main.go create mode 100644 all/etc/all_dev.yaml rename {cmd => all}/go.mod (88%) rename {cmd => all}/go.sum (96%) create mode 100644 all/internal/config/config.go create mode 100644 all/internal/impl/impl.go create mode 100644 all/internal/server/server.go create mode 100644 all/internal/server/server_test.go delete mode 100644 cmd/main/main.go delete mode 100644 cmd/main/main_test.go create mode 100644 module/base/ads/service/expose.go create mode 100644 module/base/cloud/service/expose.go create mode 100644 module/base/cms/service/expose.go create mode 100644 module/base/feedback/service/expose.go create mode 100644 module/base/fts/service/expose.go create mode 100644 module/base/initial/service/expose.go create mode 100644 module/base/logs/service/expose.go create mode 100644 module/base/mgt/service/expose.go create mode 100644 module/base/passport/service/expose.go create mode 100644 module/base/sender/service/expose.go create mode 100644 module/ec/address/service/expose.go create mode 100644 module/ec/mall/service/expose.go create mode 100644 module/ec/market/service/expose.go create mode 100644 module/ec/order/service/expose.go create mode 100644 module/finance/wallet/service/expose.go diff --git a/README.md b/README.md index 980eb44..db8895a 100644 --- a/README.md +++ b/README.md @@ -71,11 +71,11 @@ go run ./cmd/main 运行聚合入口： ```bash -cd cmd -go run ./main +cd all +go run ./cmd/main ``` -默认启动全部可聚合组件。通过 `BSM_SERVICES` 选择服务，名称以逗号分隔： +`all/etc/all_dev.yaml` 统一配置监听端口、数据库、Redis 以及 `Services.` 服务专属配置。聚合入口在同一端口通过 h2c 同时承载 gRPC、HTTP Gateway 和 Gin 路由。可以使用 `BSM_SERVICES` 临时覆盖启用的服务： ```bash # Linux/macOS @@ -86,7 +86,7 @@ $env:BSM_SERVICES = "passport,order,wallet" go run ./main ``` -可选组件为：`ads`、`cloud`、`cms`、`feedback`、`fts`、`initial`、`logs`、`mgt`、`passport`、`sender`、`address`、`delivery`、`mall`、`market`、`order`、`wallet`。社交服务目前作为独立模块运行，尚未接入聚合入口。 +可选组件为：`ads`、`cloud`、`cms`、`feedback`、`fts`、`initial`、`logs`、`mgt`、`passport`、`sender`、`address`、`mall`、`market`、`order`、`wallet`。社交服务目前作为独立模块运行，尚未接入聚合入口。 ## 测试 diff --git a/all/cmd/main/main.go b/all/cmd/main/main.go new file mode 100644 index 0000000..de23e5e --- /dev/null +++ b/all/cmd/main/main.go @@ -0,0 +1,110 @@ +package main + +import ( + "context" + "fmt" + "net/http" + "os" + "os/signal" + "syscall" + "time" + + "bsm/full/all/internal/config" + "bsm/full/all/internal/impl" + allserver "bsm/full/all/internal/server" + ads "bsm/full/module/base/ads/service" + cloud "bsm/full/module/base/cloud/service" + cms "bsm/full/module/base/cms/service" + feedback "bsm/full/module/base/feedback/service" + fts "bsm/full/module/base/fts/service" + initial "bsm/full/module/base/initial/service" + logs "bsm/full/module/base/logs/service" + mgt "bsm/full/module/base/mgt/service" + passport "bsm/full/module/base/passport/service" + sender "bsm/full/module/base/sender/service" + address "bsm/full/module/ec/address/service" + mall "bsm/full/module/ec/mall/service" + market "bsm/full/module/ec/market/service" + order "bsm/full/module/ec/order/service" + wallet "bsm/full/module/finance/wallet/service" + "github.com/gin-contrib/sessions" + "github.com/gin-contrib/sessions/cookie" + "google.golang.org/grpc" +) + +func main() { + config.New() + impl.NewImpl() + srv := allserver.New() + srv.HTTP.Use(sessions.Sessions("mysession", cookie.NewStore([]byte(config.Spec.SecretKey+"-session")))) + + exposeGRPC := func(name string, expose func(*grpc.Server) error) { + if !config.Enabled(name) { + return + } + if err := expose(srv.GRPC); err != nil { + panic(fmt.Errorf("expose %s: %w", name, err)) + } + } + + exposeGRPC("ads", func(g *grpc.Server) error { + return ads.Expose(ads.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("cloud", func(g *grpc.Server) error { + return cloud.Expose(cloud.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("cms", func(g *grpc.Server) error { + return cms.Expose(cms.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("feedback", func(g *grpc.Server) error { + return feedback.Expose(feedback.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("initial", func(g *grpc.Server) error { + return initial.Expose(initial.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("passport", func(g *grpc.Server) error { + return passport.Expose(passport.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("sender", func(g *grpc.Server) error { + return sender.Expose(sender.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("address", func(g *grpc.Server) error { + return address.Expose(address.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("mall", func(g *grpc.Server) error { + return mall.Expose(mall.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("market", func(g *grpc.Server) error { + return market.Expose(market.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("order", func(g *grpc.Server) error { + return order.Expose(order.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + exposeGRPC("wallet", func(g *grpc.Server) error { + return wallet.Expose(wallet.ExposeOptions{GRPC: g, Gateway: srv.Gateway}) + }) + + exposeHTTP := func(name string, expose func() error) { + if !config.Enabled(name) { + return + } + if err := expose(); err != nil { + panic(fmt.Errorf("expose %s: %w", name, err)) + } + } + exposeHTTP("fts", func() error { return fts.Expose(srv.HTTP) }) + exposeHTTP("logs", func() error { return logs.Expose(srv.HTTP) }) + exposeHTTP("mgt", func() error { return mgt.Expose(srv.HTTP) }) + + stop := make(chan os.Signal, 1) + signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM) + go func() { + <-stop + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + _ = srv.Stop(ctx) + }() + if err := srv.Start(config.Spec.Addr); err != nil && err != http.ErrServerClosed { + panic(err) + } +} diff --git a/all/etc/all_dev.yaml b/all/etc/all_dev.yaml new file mode 100644 index 0000000..273fcc0 --- /dev/null +++ b/all/etc/all_dev.yaml @@ -0,0 +1,63 @@ +Service: all +BindIP: 0.0.0.0 +Port: 12000 + +Databases: + Driver: postgres + Source: + - host=127.0.0.1 user=postgres password=CHANGE_ME dbname=bsm_dev port=5432 sslmode=disable TimeZone=Asia/Shanghai + +Cache: redis://null:CHANGE_ME@127.0.0.1:6379/ +SecretKey: CHANGE_ME + +# The shared listener serves gRPC over HTTP/2 and HTTP/Gateway routes over +# HTTP/1.1 or h2c. Per-service values override the shared settings above. +Services: + ads: + Enable: true + cloud: + Enable: true + cms: + Enable: true + feedback: + Enable: true + fts: + Enable: true + initial: + Enable: true + logs: + Enable: true + mgt: + Enable: true + passport: + Enable: true + Token: + Prefix: /token/ + Expire: 86400 + Kyc: + Provider: jumio + BaseUrl: CHANGE_ME + ApiSecret: CHANGE_ME + ApiToken: CHANGE_ME + ApiArgs: CHANGE_ME + WeChatConf: + AppID: CHANGE_ME + AppSecret: CHANGE_ME + sender: + Enable: true + address: + Enable: true + mall: + Enable: true + market: + Enable: true + order: + Enable: true + wallet: + Enable: true + Wallet: + Name: default + URL: CHANGE_ME + AlipyIsOpen: false + WalletIsOpen: false + WechatpayIsOpen: false diff --git a/cmd/go.mod b/all/go.mod similarity index 88% rename from cmd/go.mod rename to all/go.mod index 34342f4..2586404 100644 --- a/cmd/go.mod +++ b/all/go.mod @@ -1,4 +1,4 @@ -module bsm/full/cmd +module bsm/full/all go 1.26.5 @@ -18,19 +18,26 @@ require ( bsm/full/module/ec/market v0.0.0 bsm/full/module/ec/order v0.0.0 bsm/full/module/finance/wallet v0.0.0 + git.apinb.com/bsm-sdk/core v0.2.1 + github.com/gin-contrib/sessions v1.1.0 + github.com/gin-gonic/gin v1.12.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 + go.etcd.io/etcd/client/v3 v3.7.1 + golang.org/x/net v0.57.0 + google.golang.org/grpc v1.83.0 + gorm.io/gorm v1.31.2 ) require ( filippo.io/edwards25519 v1.2.0 // indirect - git.apinb.com/bsm-sdk/core v0.2.1 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/alibabacloud-go/alibabacloud-gateway-spi v0.0.5 // indirect - github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4 // indirect + github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12 // indirect github.com/alibabacloud-go/debug v1.0.1 // indirect - github.com/alibabacloud-go/dysmsapi-20180501/v2 v2.0.8 // indirect - github.com/alibabacloud-go/tea v1.5.3 // indirect - github.com/alibabacloud-go/tea-utils/v2 v2.0.9 // indirect - github.com/aliyun/credentials-go v1.4.12 // indirect + github.com/alibabacloud-go/dysmsapi-20180501/v2 v2.0.7 // indirect + github.com/alibabacloud-go/tea v1.3.13 // indirect + github.com/alibabacloud-go/tea-utils/v2 v2.0.7 // indirect + github.com/aliyun/credentials-go v1.4.7 // indirect github.com/bytedance/gopkg v0.1.4 // indirect github.com/bytedance/sonic v1.15.2 // indirect github.com/bytedance/sonic/loader v0.5.2 // indirect @@ -42,9 +49,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/gabriel-vasile/mimetype v1.4.15 // indirect github.com/gin-contrib/cors v1.7.7 // indirect - github.com/gin-contrib/sessions v1.1.0 // indirect github.com/gin-contrib/sse v1.1.1 // indirect - github.com/gin-gonic/gin v1.12.0 // indirect github.com/go-openapi/jsonpointer v1.0.0 // indirect github.com/go-openapi/jsonreference v1.0.0 // indirect github.com/go-openapi/spec v0.22.9 // indirect @@ -57,7 +62,7 @@ require ( github.com/go-openapi/swag/yamlutils v0.28.0 // indirect github.com/go-pay/crypto v0.0.1 // indirect github.com/go-pay/errgroup v0.0.3 // indirect - github.com/go-pay/gopay v1.5.122 // indirect + github.com/go-pay/gopay v1.5.114 // indirect github.com/go-pay/smap v0.0.2 // indirect github.com/go-pay/util v0.0.4 // indirect github.com/go-pay/xlog v0.0.3 // indirect @@ -74,8 +79,6 @@ require ( github.com/gorilla/context v1.1.2 // indirect github.com/gorilla/securecookie v1.1.2 // indirect github.com/gorilla/sessions v1.4.0 // indirect - github.com/gorilla/websocket v1.5.3 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.10.0 // indirect @@ -106,8 +109,8 @@ require ( github.com/swaggo/files v1.0.1 // indirect github.com/swaggo/gin-swagger v1.6.1 // indirect github.com/swaggo/swag v1.16.6 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.154 // indirect - github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.3.93 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.39 // indirect + github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.1.0 // indirect github.com/tinylib/msgp v1.6.4 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect @@ -115,7 +118,6 @@ require ( github.com/zeebo/xxh3 v1.1.0 // indirect go.etcd.io/etcd/api/v3 v3.7.1 // indirect go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect - go.etcd.io/etcd/client/v3 v3.7.1 // indirect go.mongodb.org/mongo-driver/v2 v2.8.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect @@ -124,20 +126,17 @@ require ( golang.org/x/arch v0.30.0 // indirect golang.org/x/crypto v0.54.0 // indirect golang.org/x/mod v0.38.0 // indirect - golang.org/x/net v0.57.0 // indirect golang.org/x/sync v0.22.0 // indirect golang.org/x/sys v0.47.0 // indirect golang.org/x/text v0.40.0 // indirect golang.org/x/tools v0.48.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect - google.golang.org/grpc v1.83.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/ini.v1 v1.67.3 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect gorm.io/driver/postgres v1.6.2 // indirect - gorm.io/gorm v1.31.2 // indirect ) replace ( diff --git a/cmd/go.sum b/all/go.sum similarity index 96% rename from cmd/go.sum rename to all/go.sum index c887fe8..16486d0 100644 --- a/cmd/go.sum +++ b/all/go.sum @@ -15,9 +15,9 @@ github.com/alibabacloud-go/darabonba-encode-util v0.0.2 h1:1uJGrbsGEVqWcWxrS9MyC github.com/alibabacloud-go/darabonba-encode-util v0.0.2/go.mod h1:JiW9higWHYXm7F4PKuMgEUETNZasrDM6vqVr/Can7H8= github.com/alibabacloud-go/darabonba-map v0.0.2 h1:qvPnGB4+dJbJIxOOfawxzF3hzMnIpjmafa0qOTp6udc= github.com/alibabacloud-go/darabonba-map v0.0.2/go.mod h1:28AJaX8FOE/ym8OUFWga+MtEzBunJwQGceGQlvaPGPc= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.13/go.mod h1:lxFGfobinVsQ49ntjpgWghXmIF0/Sm4+wvBJ1h5RtaE= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4 h1:o6veen0IZ/Fe1JawwhwQMZcbw67CVDY1pQwXcNWPyQo= -github.com/alibabacloud-go/darabonba-openapi/v2 v2.2.4/go.mod h1:eHjVxrT9g8uVYN/nyAwOFQEfkVA154ChiqRc2XnNKYU= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.9/go.mod h1:kgnXaV74AVjM3ZWJu1GhyXGuCtxljJ677oUfz6MyJOE= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12 h1:e2yCrhtWd6Qcsy4he2OL+jIAU+93Lx9OcLlPRoFLT1w= +github.com/alibabacloud-go/darabonba-openapi/v2 v2.1.12/go.mod h1:f2wDpbM7hK9SvLIH09zSKVU1TsyemUNOqErMscMMl7c= github.com/alibabacloud-go/darabonba-signature-util v0.0.7 h1:UzCnKvsjPFzApvODDNEYqBHMFt1w98wC7FOo0InLyxg= github.com/alibabacloud-go/darabonba-signature-util v0.0.7/go.mod h1:oUzCYV2fcCH797xKdL6BDH8ADIHlzrtKVjeRtunBNTQ= github.com/alibabacloud-go/darabonba-string v1.0.2 h1:E714wms5ibdzCqGeYJ9JCFywE5nDyvIXIIQbZVFkkqo= @@ -26,8 +26,8 @@ github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68/go.mod h1:6p github.com/alibabacloud-go/debug v1.0.0/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc= github.com/alibabacloud-go/debug v1.0.1 h1:MsW9SmUtbb1Fnt3ieC6NNZi6aEwrXfDksD4QA6GSbPg= github.com/alibabacloud-go/debug v1.0.1/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc= -github.com/alibabacloud-go/dysmsapi-20180501/v2 v2.0.8 h1:aDPyz6C+nenypx24N5qEt09NjpS6mu7Cu1A+wf9UTaY= -github.com/alibabacloud-go/dysmsapi-20180501/v2 v2.0.8/go.mod h1:e/vWJ5gLVnraPROSh+3oMSodf5ukaUlqNgH0IIcnz98= +github.com/alibabacloud-go/dysmsapi-20180501/v2 v2.0.7 h1:xqn/zCWwy5T8kYz9VlmHm9dbLscT5gA4d/BjVgNufio= +github.com/alibabacloud-go/dysmsapi-20180501/v2 v2.0.7/go.mod h1:m/ZasERkFizmz30MYL7b3pjtltFFPju1AitpJlJ9rWc= github.com/alibabacloud-go/endpoint-util v1.1.0 h1:r/4D3VSw888XGaeNpP994zDUaxdgTSHBbVfZlzf6b5Q= github.com/alibabacloud-go/endpoint-util v1.1.0/go.mod h1:O5FuCALmCKs2Ff7JFJMudHs0I5EBgecXXxZRyswlEjE= github.com/alibabacloud-go/openapi-util v0.1.0 h1:0z75cIULkDrdEhkLWgi9tnLe+KhAFE/r5Pb3312/eAY= @@ -39,23 +39,22 @@ github.com/alibabacloud-go/tea v1.1.11/go.mod h1:/tmnEaQMyb4Ky1/5D+SE1BAsa5zj/Ke github.com/alibabacloud-go/tea v1.1.17/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= github.com/alibabacloud-go/tea v1.1.20/go.mod h1:nXxjm6CIFkBhwW4FQkNrolwbfon8Svy6cujmKFUq98A= github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk= +github.com/alibabacloud-go/tea v1.3.10/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg= +github.com/alibabacloud-go/tea v1.3.12/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg= +github.com/alibabacloud-go/tea v1.3.13 h1:WhGy6LIXaMbBM6VBYcsDCz6K/TPsT1Ri2hPmmZffZ94= github.com/alibabacloud-go/tea v1.3.13/go.mod h1:A560v/JTQ1n5zklt2BEpurJzZTI8TUT+Psg2drWlxRg= -github.com/alibabacloud-go/tea v1.5.2/go.mod h1:hgSs82CkOiehSQMoiFN79dL6zsGX7pVGvnn9SIEs8/0= -github.com/alibabacloud-go/tea v1.5.3 h1:UMJTBcO48w7Zz1nlFe9bmRsHwgB7AjF8DBQzcvHhIp8= -github.com/alibabacloud-go/tea v1.5.3/go.mod h1:hgSs82CkOiehSQMoiFN79dL6zsGX7pVGvnn9SIEs8/0= github.com/alibabacloud-go/tea-utils v1.3.1/go.mod h1:EI/o33aBfj3hETm4RLiAxF/ThQdSngxrpF8rKUDJjPE= github.com/alibabacloud-go/tea-utils v1.4.5 h1:h0/6Xd2f3bPE4XHTvkpjwxowIwRCJAJOqY6Eq8f3zfA= github.com/alibabacloud-go/tea-utils v1.4.5/go.mod h1:KNcT0oXlZZxOXINnZBs6YvgOd5aYp9U67G+E3R8fcQw= github.com/alibabacloud-go/tea-utils/v2 v2.0.5/go.mod h1:dL6vbUT35E4F4bFTHL845eUloqaerYBYPsdWR2/jhe4= +github.com/alibabacloud-go/tea-utils/v2 v2.0.7 h1:WDx5qW3Xa5ZgJ1c8NfqJkF6w+AU5wB8835UdhPr6Ax0= github.com/alibabacloud-go/tea-utils/v2 v2.0.7/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I= -github.com/alibabacloud-go/tea-utils/v2 v2.0.9 h1:y6pUIlhjxbZl9ObDAcmA1H3c21eaAxADHTDQmBnAIgA= -github.com/alibabacloud-go/tea-utils/v2 v2.0.9/go.mod h1:qxn986l+q33J5VkialKMqT/TTs3E+U9MJpd001iWQ9I= github.com/aliyun/credentials-go v1.1.2/go.mod h1:ozcZaMR5kLM7pwtCMEpVmQ242suV6qTJya2bDq4X1Tw= github.com/aliyun/credentials-go v1.3.1/go.mod h1:8jKYhQuDawt8x2+fusqa1Y6mPxemTsBEN04dgcAcYz0= github.com/aliyun/credentials-go v1.3.6/go.mod h1:1LxUuX7L5YrZUWzBrRyk0SwSdH4OmPrib8NVePL3fxM= github.com/aliyun/credentials-go v1.4.5/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U= -github.com/aliyun/credentials-go v1.4.12 h1:7D8eXGotNwthZuUEgAMgBoqxmIHwfaPVwW+/04LIJSQ= -github.com/aliyun/credentials-go v1.4.12/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U= +github.com/aliyun/credentials-go v1.4.7 h1:T17dLqEtPUFvjDRRb5giVvLh6dFT8IcNFJJb7MeyCxw= +github.com/aliyun/credentials-go v1.4.7/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -137,8 +136,8 @@ github.com/go-pay/crypto v0.0.1 h1:B6InT8CLfSLc6nGRVx9VMJRBBazFMjr293+jl0lLXUY= github.com/go-pay/crypto v0.0.1/go.mod h1:41oEIvHMKbNcYlWUlRWtsnC6+ASgh7u29z0gJXe5bes= github.com/go-pay/errgroup v0.0.3 h1:DB4s8e8oWYDyETKQ1y1riMJ7y29zE1uIsMCSjEOFSbU= github.com/go-pay/errgroup v0.0.3/go.mod h1:0+4b8mvFMS71MIzsaC+gVvB4x37I93lRb2dqrwuU8x8= -github.com/go-pay/gopay v1.5.122 h1:kuOz2qBQXGF+o4v6IOGfdFB05fquhEa32dVW98gk/bI= -github.com/go-pay/gopay v1.5.122/go.mod h1:RzP9+1bPzIMAXGRL5RvYsZjib7wV2fhA3JxT5sjoi2w= +github.com/go-pay/gopay v1.5.114 h1:jNYpcylr7WJev6i/MBeer0Z58E0x5NyqG4FfZrar3pQ= +github.com/go-pay/gopay v1.5.114/go.mod h1:p48xvWeepPolZuakAjCeucWynWwW7msoXsqahcoJpKE= github.com/go-pay/smap v0.0.2 h1:kKflYor5T5FgZltPFBMTFfjJvqYMHr5VnIFSEyhVTcA= github.com/go-pay/smap v0.0.2/go.mod h1:HW9oAo0okuyDYsbpbj5fJFxnNj/BZorRGFw26SxrNWw= github.com/go-pay/util v0.0.4 h1:TuwSU9o3Qd7m9v1PbzFuIA/8uO9FJnA6P7neG/NwPyk= @@ -196,8 +195,6 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ= github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= -github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= -github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= @@ -301,11 +298,11 @@ github.com/swaggo/gin-swagger v1.6.1 h1:Ri06G4gc9N4t4k8hekMigJ9zKTFSlqj/9paAQCQs github.com/swaggo/gin-swagger v1.6.1/go.mod h1:LQ+hJStHakCWRiK/YNYtJOu4mR2FP+pxLnILT/qNiTw= github.com/swaggo/swag v1.16.6 h1:qBNcx53ZaX+M5dxVyTrgQ0PJ/ACK+NzhwcbieTt+9yI= github.com/swaggo/swag v1.16.6/go.mod h1:ngP2etMK5a0P3QBizic5MEwpRmluJZPHjXcMoj4Xesg= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.93/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.154 h1:aQFGuNTo9j60M967s/HhnoZdSD8HhGyCRHLuC9szDgw= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.3.154/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.3.93 h1:+HmyErvypBJGp0sxVM+e9g9/MtqKZoWXzZtndpHRUwo= -github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.3.93/go.mod h1:TAQeguxskl7xDfyGWDJyUGuy1NfG2lyLEuALJQ6x1zE= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.0/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.39 h1:D7qtbjv0+L8r+Wrenk+SAsAwLVPRUkePROGWUrZY5QE= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.39/go.mod h1:r5r4xbfxSaeR04b166HGsBa/R4U3SueirEUpXGuw+Q0= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.1.0 h1:vPYUpMS+ZpBosaPvD/qFhy7m3LVEcJkUPxf90QHodwI= +github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.1.0/go.mod h1:cVlZISIgfgYzoXidDBwgieSYYf9dtpIqVLLOCV0BqOc= github.com/tinylib/msgp v1.6.4 h1:mOwYbyYDLPj35mkA2BjjYejgJk9BuHxDdvRnb6v2ZcQ= github.com/tinylib/msgp v1.6.4/go.mod h1:RSp0LW9oSxFut3KzESt5Voq4GVWyS+PSulT77roAqEA= github.com/tjfoc/gmsm v1.3.2/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w= diff --git a/all/internal/config/config.go b/all/internal/config/config.go new file mode 100644 index 0000000..fa6ea88 --- /dev/null +++ b/all/internal/config/config.go @@ -0,0 +1,48 @@ +package config + +import ( + "net" + "os" + "strings" + + "git.apinb.com/bsm-sdk/core/conf" +) + +const ServiceKey = "all" + +type ServiceConfig map[string]any + +type SrvConfig struct { + conf.Base `yaml:",inline"` + Databases *conf.DBConf `yaml:"Databases"` + Etcd *conf.EtcdConf `yaml:"Etcd"` + Services map[string]ServiceConfig `yaml:"Services"` +} + +var Spec SrvConfig + +func New() { + conf.New(ServiceKey, &Spec) + Spec.Port = conf.CheckPort(Spec.Port) + Spec.BindIP = conf.CheckIP(Spec.BindIP) + Spec.Addr = net.JoinHostPort(Spec.BindIP, Spec.Port) + conf.NotNil(Spec.Service, Spec.Cache) + conf.PrintInfo(Spec.Addr) +} + +func Enabled(name string) bool { + if raw := strings.TrimSpace(os.Getenv("BSM_SERVICES")); raw != "" { + for _, selected := range strings.Split(raw, ",") { + if strings.EqualFold(strings.TrimSpace(selected), name) || strings.EqualFold(strings.TrimSpace(selected), "all") { + return true + } + } + return false + } + service, ok := Spec.Services[name] + if !ok { + return false + } + enabled, ok := service["Enable"].(bool) + return !ok || enabled +} diff --git a/all/internal/impl/impl.go b/all/internal/impl/impl.go new file mode 100644 index 0000000..0ee3546 --- /dev/null +++ b/all/internal/impl/impl.go @@ -0,0 +1,21 @@ +package impl + +import ( + "bsm/full/all/internal/config" + "git.apinb.com/bsm-sdk/core/cache/redis" + "git.apinb.com/bsm-sdk/core/with" + clientv3 "go.etcd.io/etcd/client/v3" + "gorm.io/gorm" +) + +var ( + RedisService *redis.RedisClient + EtcdService *clientv3.Client + DBService *gorm.DB +) + +func NewImpl() { + RedisService = with.RedisCache(config.Spec.Cache) + DBService = with.Databases(config.Spec.Databases, nil) + EtcdService = with.Etcd(config.Spec.Etcd) +} diff --git a/all/internal/server/server.go b/all/internal/server/server.go new file mode 100644 index 0000000..9e49cf3 --- /dev/null +++ b/all/internal/server/server.go @@ -0,0 +1,90 @@ +package server + +import ( + "bytes" + "context" + "fmt" + "net" + "net/http" + "strings" + + "github.com/gin-gonic/gin" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "golang.org/x/net/http2" + "golang.org/x/net/http2/h2c" + "google.golang.org/grpc" + "google.golang.org/grpc/reflection" +) + +type Server struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux + HTTP *gin.Engine + server *http.Server +} + +func New() *Server { + grpcServer := grpc.NewServer() + reflection.Register(grpcServer) + engine := gin.New() + engine.Use(gin.Logger(), gin.Recovery()) + return &Server{ + GRPC: grpcServer, + Gateway: gwRuntime.NewServeMux(), + HTTP: engine, + } +} + +func (s *Server) Start(addr string) error { + handler := h2c.NewHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + if r.ProtoMajor == 2 && strings.HasPrefix(r.Header.Get("Content-Type"), "application/grpc") { + s.GRPC.ServeHTTP(w, r) + return + } + recorder := newBufferedResponse() + s.Gateway.ServeHTTP(recorder, r) + if recorder.status != http.StatusNotFound { + recorder.flush(w) + return + } + s.HTTP.ServeHTTP(w, r) + }), &http2.Server{}) + s.server = &http.Server{Addr: addr, Handler: handler} + listener, err := net.Listen("tcp", addr) + if err != nil { + return err + } + fmt.Printf("all services listening on %s (gRPC + HTTP)\n", addr) + return s.server.Serve(listener) +} + +func (s *Server) Stop(ctx context.Context) error { + s.GRPC.GracefulStop() + if s.server == nil { + return nil + } + return s.server.Shutdown(ctx) +} + +type bufferedResponse struct { + header http.Header + body bytes.Buffer + status int +} + +func newBufferedResponse() *bufferedResponse { + return &bufferedResponse{header: make(http.Header), status: http.StatusOK} +} + +func (r *bufferedResponse) Header() http.Header { return r.header } +func (r *bufferedResponse) WriteHeader(status int) { r.status = status } +func (r *bufferedResponse) Write(data []byte) (int, error) { return r.body.Write(data) } +func (r *bufferedResponse) flush(w http.ResponseWriter) { + for key, values := range r.header { + for _, value := range values { + w.Header().Add(key, value) + } + } + w.WriteHeader(r.status) + _, _ = w.Write(r.body.Bytes()) +} diff --git a/all/internal/server/server_test.go b/all/internal/server/server_test.go new file mode 100644 index 0000000..dd28d84 --- /dev/null +++ b/all/internal/server/server_test.go @@ -0,0 +1,21 @@ +package server + +import ( + "net/http" + "net/http/httptest" + "testing" + + "github.com/gin-gonic/gin" +) + +func TestHTTPRouterIsAvailable(t *testing.T) { + srv := New() + srv.HTTP.GET("/healthz", func(c *gin.Context) { c.Status(http.StatusNoContent) }) + + request := httptest.NewRequest(http.MethodGet, "/healthz", nil) + response := httptest.NewRecorder() + srv.HTTP.ServeHTTP(response, request) + if response.Code != http.StatusNoContent { + t.Fatalf("unexpected status: %d", response.Code) + } +} diff --git a/cmd/main/main.go b/cmd/main/main.go deleted file mode 100644 index 19ae713..0000000 --- a/cmd/main/main.go +++ /dev/null @@ -1,116 +0,0 @@ -package main - -import ( - "fmt" - "os" - "os/signal" - "sort" - "strings" - "syscall" - - ads "bsm/full/module/base/ads/cmd/main" - cloud "bsm/full/module/base/cloud/cmd/main" - cms "bsm/full/module/base/cms/cmd/main" - feedback "bsm/full/module/base/feedback/cmd/main" - fts "bsm/full/module/base/fts/cmd/main" - initial "bsm/full/module/base/initial/cmd/main" - logs "bsm/full/module/base/logs/cmd/main" - mgt "bsm/full/module/base/mgt/cmd/main" - passport "bsm/full/module/base/passport/cmd/main" - sender "bsm/full/module/base/sender/cmd/main" - address "bsm/full/module/ec/address/cmd/main" - mall "bsm/full/module/ec/mall/cmd/main" - market "bsm/full/module/ec/market/cmd/main" - order "bsm/full/module/ec/order/cmd/main" - wallet "bsm/full/module/finance/wallet/cmd/main" -) - -type component struct { - name string - run func() -} - -var components = []component{ - {"ads", ads.Run}, - {"cloud", cloud.Run}, - {"cms", cms.Run}, - {"feedback", feedback.Run}, - {"fts", fts.Run}, - {"initial", initial.Run}, - {"logs", logs.Run}, - {"mgt", mgt.Run}, - {"passport", passport.Run}, - {"sender", sender.Run}, - {"address", address.Run}, - {"mall", mall.Run}, - {"market", market.Run}, - {"order", order.Run}, - {"wallet", wallet.Run}, -} - -func main() { - selected, err := selectComponents(os.Getenv("BSM_SERVICES")) - if err != nil { - fmt.Fprintln(os.Stderr, err) - os.Exit(2) - } - - failures := make(chan error, len(selected)) - for _, item := range selected { - item := item - go func() { - defer func() { - if value := recover(); value != nil { - failures <- fmt.Errorf("component %s panicked: %v", item.name, value) - } - }() - fmt.Printf("starting component %s\n", item.name) - item.run() - failures <- fmt.Errorf("component %s stopped unexpectedly", item.name) - }() - } - - stop := make(chan os.Signal, 1) - signal.Notify(stop, syscall.SIGINT, syscall.SIGTERM) - select { - case sig := <-stop: - fmt.Printf("received %s, stopping monolith\n", sig) - case err := <-failures: - fmt.Fprintln(os.Stderr, err) - os.Exit(1) - } -} - -func selectComponents(raw string) ([]component, error) { - if strings.TrimSpace(raw) == "" || strings.EqualFold(strings.TrimSpace(raw), "all") { - return components, nil - } - - wanted := make(map[string]struct{}) - for _, name := range strings.Split(raw, ",") { - name = strings.ToLower(strings.TrimSpace(name)) - if name != "" { - wanted[name] = struct{}{} - } - } - - selected := make([]component, 0, len(wanted)) - for _, item := range components { - if _, ok := wanted[item.name]; ok { - selected = append(selected, item) - delete(wanted, item.name) - } - } - if len(wanted) != 0 { - unknown := make([]string, 0, len(wanted)) - for name := range wanted { - unknown = append(unknown, name) - } - sort.Strings(unknown) - return nil, fmt.Errorf("unknown BSM_SERVICES: %s", strings.Join(unknown, ", ")) - } - if len(selected) == 0 { - return nil, fmt.Errorf("BSM_SERVICES did not select any component") - } - return selected, nil -} diff --git a/cmd/main/main_test.go b/cmd/main/main_test.go deleted file mode 100644 index 1f66cec..0000000 --- a/cmd/main/main_test.go +++ /dev/null @@ -1,19 +0,0 @@ -package main - -import "testing" - -func TestSelectComponents(t *testing.T) { - selected, err := selectComponents("order, wallet") - if err != nil { - t.Fatal(err) - } - if len(selected) != 2 || selected[0].name != "order" || selected[1].name != "wallet" { - t.Fatalf("unexpected selection: %#v", selected) - } -} - -func TestSelectComponentsRejectsUnknown(t *testing.T) { - if _, err := selectComponents("missing"); err == nil { - t.Fatal("expected unknown component error") - } -} diff --git a/go.work b/go.work index 378f30e..0cbc10f 100644 --- a/go.work +++ b/go.work @@ -1,7 +1,7 @@ go 1.26.5 use ( - ./cmd + ./all ./module/base/ads ./module/base/cloud ./module/base/cms diff --git a/go.work.sum b/go.work.sum index 5986a63..20b28fb 100644 --- a/go.work.sum +++ b/go.work.sum @@ -369,6 +369,8 @@ github.com/gordonklaus/ineffassign v0.2.0/go.mod h1:TIpymnagPSexySzs7F9FnO1XFTy8 github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= +github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= github.com/gostaticanalysis/comment v1.5.0/go.mod h1:V6eb3gpCv9GNVqb6amXzEUX3jXLVK/AdA+IrAMSqvEc= diff --git a/module/base/ads/cmd/main/main.go b/module/base/ads/cmd/main/main.go index 002c016..2d4028c 100644 --- a/module/base/ads/cmd/main/main.go +++ b/module/base/ads/cmd/main/main.go @@ -3,7 +3,7 @@ * @Date: 2021-11-26 15:25:03 * @Description: 广告服务主程序入口 */ -package service +package main import ( "bsm/full/module/base/ads/internal/config" @@ -24,7 +24,7 @@ func Run() { impl.NewImpl() // 创建gRPC服务器实例 - s := server.New(config.Spec.Addr) + s := server.New(nil) // 创建微服务实例 srv := service.New( s.Grpc, diff --git a/module/base/ads/internal/server/new.go b/module/base/ads/internal/server/new.go index 6e724b3..d68bb58 100644 --- a/module/base/ads/internal/server/new.go +++ b/module/base/ads/internal/server/new.go @@ -17,17 +17,24 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } // register service to grpc.Server pb.RegisterFetchServer(srv.Grpc, NewFetchServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/base/ads/pb/const.pb.go b/module/base/ads/pb/const.pb.go index 14d60e6..1bf3ac0 100644 --- a/module/base/ads/pb/const.pb.go +++ b/module/base/ads/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_base_ads_proto_const_proto protoreflect.FileDescriptor const file_module_base_ads_proto_const_proto_rawDesc = "" + "\n" + - "!module/base/ads/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "!module/base/ads/proto/const.proto\x12\x0fbase_ads_blocks\"\a\n" + + "\x05Empty\"\xc4\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12A\n" + + "\x06params\x18\x03 \x03(\v2).base_ads_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xff\x02\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12E\n" + + "\x06params\x18\x03 \x03(\v2-.base_ads_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xb8\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12G\n" + + "\x06params\x18\x03 \x03(\v2/.base_ads_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe9\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x126\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2 .base_ads_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd5\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x127\n" + + "\adetails\x18! \x03(\v2\x1d.base_ads_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"X\n" + + "\x11FeedPostListReply\x121\n" + + "\x04list\x18\x01 \x03(\v2\x1d.base_ads_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe3\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x129\n" + + "\aattachs\x18\t \x03(\v2\x1f.base_ads_blocks.FeedAttachItemR\aattachs\x120\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1c.base_ads_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"Z\n" + + "\x12GroupPostListReply\x122\n" + + "\x04list\x18\x01 \x03(\v2\x1e.base_ads_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xf6\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12:\n" + + "\aattachs\x18\t \x03(\v2 .base_ads_blocks.GroupAttachItemR\aattachs\x121\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\x1d.base_ads_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_base_ads_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"a\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB!Z\x1fbsm/full/module/base/ads/pb;adsb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x121\n" + + "\x04data\x18\x02 \x03(\v2\x1d.base_ads_blocks.RelationItemR\x04dataB!Z\x1fbsm/full/module/base/ads/pb;adsb\x06proto3" var ( file_module_base_ads_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_base_ads_proto_const_proto_rawDescGZIP() []byte { var file_module_base_ads_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_base_ads_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: base_ads_blocks.Empty + (*FetchRequest)(nil), // 1: base_ads_blocks.FetchRequest + (*IdentRequest)(nil), // 2: base_ads_blocks.IdentRequest + (*VersionRequest)(nil), // 3: base_ads_blocks.VersionRequest + (*SearchRequest)(nil), // 4: base_ads_blocks.SearchRequest + (*StatusReply)(nil), // 5: base_ads_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: base_ads_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: base_ads_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: base_ads_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: base_ads_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: base_ads_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: base_ads_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: base_ads_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: base_ads_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: base_ads_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: base_ads_blocks.IDRequest + (*IDListRequest)(nil), // 16: base_ads_blocks.IDListRequest + (*StdIicuds)(nil), // 17: base_ads_blocks.StdIicuds + (*StdPassport)(nil), // 18: base_ads_blocks.StdPassport + (*CloudBase)(nil), // 19: base_ads_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: base_ads_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: base_ads_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: base_ads_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: base_ads_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: base_ads_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: base_ads_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: base_ads_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: base_ads_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: base_ads_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: base_ads_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: base_ads_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: base_ads_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: base_ads_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: base_ads_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: base_ads_blocks.GroupTagItem + (*RelationItem)(nil), // 35: base_ads_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: base_ads_blocks.FetchRelationItemReply + nil, // 37: base_ads_blocks.FetchRequest.ParamsEntry + nil, // 38: base_ads_blocks.MallFetchRequest.ParamsEntry + nil, // 39: base_ads_blocks.MarketFetchRequest.ParamsEntry } var file_module_base_ads_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: base_ads_blocks.FetchRequest.params:type_name -> base_ads_blocks.FetchRequest.ParamsEntry + 38, // 1: base_ads_blocks.MallFetchRequest.params:type_name -> base_ads_blocks.MallFetchRequest.ParamsEntry + 39, // 2: base_ads_blocks.MarketFetchRequest.params:type_name -> base_ads_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: base_ads_blocks.CmsCategoryItem.child:type_name -> base_ads_blocks.CmsCategoryItem + 26, // 4: base_ads_blocks.OrderSummaryItem.details:type_name -> base_ads_blocks.OrderDetails + 28, // 5: base_ads_blocks.FeedPostListReply.list:type_name -> base_ads_blocks.FeedPostItem + 29, // 6: base_ads_blocks.FeedPostItem.attachs:type_name -> base_ads_blocks.FeedAttachItem + 30, // 7: base_ads_blocks.FeedPostItem.tags:type_name -> base_ads_blocks.FeedTagItem + 32, // 8: base_ads_blocks.GroupPostListReply.list:type_name -> base_ads_blocks.GroupPostItem + 33, // 9: base_ads_blocks.GroupPostItem.attachs:type_name -> base_ads_blocks.GroupAttachItem + 34, // 10: base_ads_blocks.GroupPostItem.tags:type_name -> base_ads_blocks.GroupTagItem + 35, // 11: base_ads_blocks.FetchRelationItemReply.data:type_name -> base_ads_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/base/ads/proto/const.proto b/module/base/ads/proto/const.proto index 784a329..cd86e72 100644 --- a/module/base/ads/proto/const.proto +++ b/module/base/ads/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package base_ads_blocks; option go_package = "bsm/full/module/base/ads/pb;ads"; diff --git a/module/base/ads/service/expose.go b/module/base/ads/service/expose.go new file mode 100644 index 0000000..5ae5935 --- /dev/null +++ b/module/base/ads/service/expose.go @@ -0,0 +1,25 @@ +package service + +import ( + "context" + + "bsm/full/module/base/ads/internal/server" + pb "bsm/full/module/base/ads/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterFetchHandlerServer(ctx, options.Gateway, server.NewFetchServer()); err != nil { + return err + } + return nil +} diff --git a/module/base/cloud/cmd/main/main.go b/module/base/cloud/cmd/main/main.go index 471b771..4f1c296 100644 --- a/module/base/cloud/cmd/main/main.go +++ b/module/base/cloud/cmd/main/main.go @@ -2,7 +2,7 @@ * @Author: david.yan(david.yan@qq.com) * @Date: 2021-11-26 15:25:03 */ -package service +package main import ( "bsm/full/module/base/cloud/internal/config" @@ -20,7 +20,7 @@ func Run() { impl.NewImpl() // 初始化服务 - s := server.New(config.Spec.Addr) + s := server.New(nil) srv := service.New( s.Grpc, &service.Options{ diff --git a/module/base/cloud/internal/server/new.go b/module/base/cloud/internal/server/new.go index 9d239fc..2ed7b4c 100644 --- a/module/base/cloud/internal/server/new.go +++ b/module/base/cloud/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -33,7 +38,9 @@ func New(addr string) *Server { pb.RegisterShareServer(srv.Grpc, NewShareServer()) pb.RegisterSpaceServer(srv.Grpc, NewSpaceServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/base/cloud/pb/album.pb.go b/module/base/cloud/pb/album.pb.go index 54453d7..a52023c 100644 --- a/module/base/cloud/pb/album.pb.go +++ b/module/base/cloud/pb/album.pb.go @@ -650,22 +650,22 @@ const file_module_base_cloud_proto_album_proto_rawDesc = "" + "created_at\x18\x0e \x01(\tR\tcreatedAt\x12\x1d\n" + "\n" + "updated_at\x18\x0f \x01(\tR\tupdatedAt\x12+\n" + - "\x05album\x18\x10 \x01(\v2\x15.cloud.CloudAlbumItemR\x05album2\xd9\x05\n" + - "\x05Album\x12=\n" + - "\vCreateAlbum\x12\x19.cloud.CreateAlbumRequest\x1a\x13.blocks.StatusReply\x127\n" + - "\bGetAlbum\x12\x14.blocks.IdentRequest\x1a\x15.cloud.CloudAlbumItem\x129\n" + - "\vUpdateAlbum\x12\x15.cloud.CloudAlbumItem\x1a\x13.blocks.StatusReply\x128\n" + - "\vDeleteAlbum\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x12=\n" + + "\x05album\x18\x10 \x01(\v2\x15.cloud.CloudAlbumItemR\x05album2\xf3\x06\n" + + "\x05Album\x12H\n" + + "\vCreateAlbum\x12\x19.cloud.CreateAlbumRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12B\n" + + "\bGetAlbum\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x15.cloud.CloudAlbumItem\x12D\n" + + "\vUpdateAlbum\x12\x15.cloud.CloudAlbumItem\x1a\x1e.base_cloud_blocks.StatusReply\x12N\n" + + "\vDeleteAlbum\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12H\n" + "\n" + - "ListAlbums\x12\x14.blocks.FetchRequest\x1a\x19.cloud.ListAlbumsResponse\x12A\n" + - "\rSetCoverPhoto\x12\x1b.cloud.SetCoverPhotoRequest\x1a\x13.blocks.StatusReply\x129\n" + - "\vUploadPhoto\x12\x15.cloud.CloudPhotoItem\x1a\x13.blocks.StatusReply\x127\n" + - "\bGetPhoto\x12\x14.blocks.IdentRequest\x1a\x15.cloud.CloudPhotoItem\x129\n" + - "\vUpdatePhoto\x12\x15.cloud.CloudPhotoItem\x1a\x13.blocks.StatusReply\x128\n" + - "\vDeletePhoto\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x12=\n" + + "ListAlbums\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x19.cloud.ListAlbumsResponse\x12L\n" + + "\rSetCoverPhoto\x12\x1b.cloud.SetCoverPhotoRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12D\n" + + "\vUploadPhoto\x12\x15.cloud.CloudPhotoItem\x1a\x1e.base_cloud_blocks.StatusReply\x12B\n" + + "\bGetPhoto\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x15.cloud.CloudPhotoItem\x12D\n" + + "\vUpdatePhoto\x12\x15.cloud.CloudPhotoItem\x1a\x1e.base_cloud_blocks.StatusReply\x12N\n" + + "\vDeletePhoto\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12H\n" + "\n" + - "ListPhotos\x12\x14.blocks.FetchRequest\x1a\x19.cloud.ListPhotosResponse\x129\n" + - "\tMovePhoto\x12\x17.cloud.MovePhotoRequest\x1a\x13.blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + "ListPhotos\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x19.cloud.ListPhotosResponse\x12D\n" + + "\tMovePhoto\x12\x17.cloud.MovePhotoRequest\x1a\x1e.base_cloud_blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_album_proto_rawDescOnce sync.Once @@ -688,9 +688,9 @@ var file_module_base_cloud_proto_album_proto_goTypes = []any{ (*ListPhotosResponse)(nil), // 4: cloud.ListPhotosResponse (*MovePhotoRequest)(nil), // 5: cloud.MovePhotoRequest (*CloudPhotoItem)(nil), // 6: cloud.CloudPhotoItem - (*IdentRequest)(nil), // 7: blocks.IdentRequest - (*FetchRequest)(nil), // 8: blocks.FetchRequest - (*StatusReply)(nil), // 9: blocks.StatusReply + (*IdentRequest)(nil), // 7: base_cloud_blocks.IdentRequest + (*FetchRequest)(nil), // 8: base_cloud_blocks.FetchRequest + (*StatusReply)(nil), // 9: base_cloud_blocks.StatusReply } var file_module_base_cloud_proto_album_proto_depIdxs = []int32{ 3, // 0: cloud.ListAlbumsResponse.albums:type_name -> cloud.CloudAlbumItem @@ -698,29 +698,29 @@ var file_module_base_cloud_proto_album_proto_depIdxs = []int32{ 6, // 2: cloud.ListPhotosResponse.photos:type_name -> cloud.CloudPhotoItem 3, // 3: cloud.CloudPhotoItem.album:type_name -> cloud.CloudAlbumItem 0, // 4: cloud.Album.CreateAlbum:input_type -> cloud.CreateAlbumRequest - 7, // 5: cloud.Album.GetAlbum:input_type -> blocks.IdentRequest + 7, // 5: cloud.Album.GetAlbum:input_type -> base_cloud_blocks.IdentRequest 3, // 6: cloud.Album.UpdateAlbum:input_type -> cloud.CloudAlbumItem - 7, // 7: cloud.Album.DeleteAlbum:input_type -> blocks.IdentRequest - 8, // 8: cloud.Album.ListAlbums:input_type -> blocks.FetchRequest + 7, // 7: cloud.Album.DeleteAlbum:input_type -> base_cloud_blocks.IdentRequest + 8, // 8: cloud.Album.ListAlbums:input_type -> base_cloud_blocks.FetchRequest 2, // 9: cloud.Album.SetCoverPhoto:input_type -> cloud.SetCoverPhotoRequest 6, // 10: cloud.Album.UploadPhoto:input_type -> cloud.CloudPhotoItem - 7, // 11: cloud.Album.GetPhoto:input_type -> blocks.IdentRequest + 7, // 11: cloud.Album.GetPhoto:input_type -> base_cloud_blocks.IdentRequest 6, // 12: cloud.Album.UpdatePhoto:input_type -> cloud.CloudPhotoItem - 7, // 13: cloud.Album.DeletePhoto:input_type -> blocks.IdentRequest - 8, // 14: cloud.Album.ListPhotos:input_type -> blocks.FetchRequest + 7, // 13: cloud.Album.DeletePhoto:input_type -> base_cloud_blocks.IdentRequest + 8, // 14: cloud.Album.ListPhotos:input_type -> base_cloud_blocks.FetchRequest 5, // 15: cloud.Album.MovePhoto:input_type -> cloud.MovePhotoRequest - 9, // 16: cloud.Album.CreateAlbum:output_type -> blocks.StatusReply + 9, // 16: cloud.Album.CreateAlbum:output_type -> base_cloud_blocks.StatusReply 3, // 17: cloud.Album.GetAlbum:output_type -> cloud.CloudAlbumItem - 9, // 18: cloud.Album.UpdateAlbum:output_type -> blocks.StatusReply - 9, // 19: cloud.Album.DeleteAlbum:output_type -> blocks.StatusReply + 9, // 18: cloud.Album.UpdateAlbum:output_type -> base_cloud_blocks.StatusReply + 9, // 19: cloud.Album.DeleteAlbum:output_type -> base_cloud_blocks.StatusReply 1, // 20: cloud.Album.ListAlbums:output_type -> cloud.ListAlbumsResponse - 9, // 21: cloud.Album.SetCoverPhoto:output_type -> blocks.StatusReply - 9, // 22: cloud.Album.UploadPhoto:output_type -> blocks.StatusReply + 9, // 21: cloud.Album.SetCoverPhoto:output_type -> base_cloud_blocks.StatusReply + 9, // 22: cloud.Album.UploadPhoto:output_type -> base_cloud_blocks.StatusReply 6, // 23: cloud.Album.GetPhoto:output_type -> cloud.CloudPhotoItem - 9, // 24: cloud.Album.UpdatePhoto:output_type -> blocks.StatusReply - 9, // 25: cloud.Album.DeletePhoto:output_type -> blocks.StatusReply + 9, // 24: cloud.Album.UpdatePhoto:output_type -> base_cloud_blocks.StatusReply + 9, // 25: cloud.Album.DeletePhoto:output_type -> base_cloud_blocks.StatusReply 4, // 26: cloud.Album.ListPhotos:output_type -> cloud.ListPhotosResponse - 9, // 27: cloud.Album.MovePhoto:output_type -> blocks.StatusReply + 9, // 27: cloud.Album.MovePhoto:output_type -> base_cloud_blocks.StatusReply 16, // [16:28] is the sub-list for method output_type 4, // [4:16] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name diff --git a/module/base/cloud/pb/bookmark.pb.go b/module/base/cloud/pb/bookmark.pb.go index c395884..6ae090a 100644 --- a/module/base/cloud/pb/bookmark.pb.go +++ b/module/base/cloud/pb/bookmark.pb.go @@ -395,14 +395,14 @@ const file_module_base_cloud_proto_bookmark_proto_rawDesc = "" + "created_at\x18\n" + " \x01(\tR\tcreatedAt\x12\x1d\n" + "\n" + - "updated_at\x18\v \x01(\tR\tupdatedAt2\x92\x03\n" + - "\bBookmark\x12C\n" + - "\x0eCreateBookmark\x12\x1c.cloud.CreateBookmarkRequest\x1a\x13.blocks.StatusReply\x12:\n" + - "\vGetBookmark\x12\x11.blocks.IDRequest\x1a\x18.cloud.CloudBookmarkItem\x12?\n" + - "\x0eUpdateBookmark\x12\x18.cloud.CloudBookmarkItem\x1a\x13.blocks.StatusReply\x128\n" + - "\x0eDeleteBookmark\x12\x11.blocks.IDRequest\x1a\x13.blocks.StatusReply\x12C\n" + - "\rListBookmarks\x12\x14.blocks.FetchRequest\x1a\x1c.cloud.ListBookmarksResponse\x12E\n" + - "\x0fImportBookmarks\x12\x1d.cloud.ImportBookmarksRequest\x1a\x13.blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + "updated_at\x18\v \x01(\tR\tupdatedAt2\xdf\x03\n" + + "\bBookmark\x12N\n" + + "\x0eCreateBookmark\x12\x1c.cloud.CreateBookmarkRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12E\n" + + "\vGetBookmark\x12\x1c.base_cloud_blocks.IDRequest\x1a\x18.cloud.CloudBookmarkItem\x12J\n" + + "\x0eUpdateBookmark\x12\x18.cloud.CloudBookmarkItem\x1a\x1e.base_cloud_blocks.StatusReply\x12N\n" + + "\x0eDeleteBookmark\x12\x1c.base_cloud_blocks.IDRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12N\n" + + "\rListBookmarks\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x1c.cloud.ListBookmarksResponse\x12P\n" + + "\x0fImportBookmarks\x12\x1d.cloud.ImportBookmarksRequest\x1a\x1e.base_cloud_blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_bookmark_proto_rawDescOnce sync.Once @@ -422,24 +422,24 @@ var file_module_base_cloud_proto_bookmark_proto_goTypes = []any{ (*ListBookmarksResponse)(nil), // 1: cloud.ListBookmarksResponse (*ImportBookmarksRequest)(nil), // 2: cloud.ImportBookmarksRequest (*CloudBookmarkItem)(nil), // 3: cloud.CloudBookmarkItem - (*IDRequest)(nil), // 4: blocks.IDRequest - (*FetchRequest)(nil), // 5: blocks.FetchRequest - (*StatusReply)(nil), // 6: blocks.StatusReply + (*IDRequest)(nil), // 4: base_cloud_blocks.IDRequest + (*FetchRequest)(nil), // 5: base_cloud_blocks.FetchRequest + (*StatusReply)(nil), // 6: base_cloud_blocks.StatusReply } var file_module_base_cloud_proto_bookmark_proto_depIdxs = []int32{ 3, // 0: cloud.ListBookmarksResponse.bookmarks:type_name -> cloud.CloudBookmarkItem 0, // 1: cloud.Bookmark.CreateBookmark:input_type -> cloud.CreateBookmarkRequest - 4, // 2: cloud.Bookmark.GetBookmark:input_type -> blocks.IDRequest + 4, // 2: cloud.Bookmark.GetBookmark:input_type -> base_cloud_blocks.IDRequest 3, // 3: cloud.Bookmark.UpdateBookmark:input_type -> cloud.CloudBookmarkItem - 4, // 4: cloud.Bookmark.DeleteBookmark:input_type -> blocks.IDRequest - 5, // 5: cloud.Bookmark.ListBookmarks:input_type -> blocks.FetchRequest + 4, // 4: cloud.Bookmark.DeleteBookmark:input_type -> base_cloud_blocks.IDRequest + 5, // 5: cloud.Bookmark.ListBookmarks:input_type -> base_cloud_blocks.FetchRequest 2, // 6: cloud.Bookmark.ImportBookmarks:input_type -> cloud.ImportBookmarksRequest - 6, // 7: cloud.Bookmark.CreateBookmark:output_type -> blocks.StatusReply + 6, // 7: cloud.Bookmark.CreateBookmark:output_type -> base_cloud_blocks.StatusReply 3, // 8: cloud.Bookmark.GetBookmark:output_type -> cloud.CloudBookmarkItem - 6, // 9: cloud.Bookmark.UpdateBookmark:output_type -> blocks.StatusReply - 6, // 10: cloud.Bookmark.DeleteBookmark:output_type -> blocks.StatusReply + 6, // 9: cloud.Bookmark.UpdateBookmark:output_type -> base_cloud_blocks.StatusReply + 6, // 10: cloud.Bookmark.DeleteBookmark:output_type -> base_cloud_blocks.StatusReply 1, // 11: cloud.Bookmark.ListBookmarks:output_type -> cloud.ListBookmarksResponse - 6, // 12: cloud.Bookmark.ImportBookmarks:output_type -> blocks.StatusReply + 6, // 12: cloud.Bookmark.ImportBookmarks:output_type -> base_cloud_blocks.StatusReply 7, // [7:13] is the sub-list for method output_type 1, // [1:7] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/base/cloud/pb/const.pb.go b/module/base/cloud/pb/const.pb.go index 84440ea..f3d9b04 100644 --- a/module/base/cloud/pb/const.pb.go +++ b/module/base/cloud/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_base_cloud_proto_const_proto protoreflect.FileDescriptor const file_module_base_cloud_proto_const_proto_rawDesc = "" + "\n" + - "#module/base/cloud/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "#module/base/cloud/proto/const.proto\x12\x11base_cloud_blocks\"\a\n" + + "\x05Empty\"\xc6\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12C\n" + + "\x06params\x18\x03 \x03(\v2+.base_cloud_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x81\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12G\n" + + "\x06params\x18\x03 \x03(\v2/.base_cloud_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xba\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12I\n" + + "\x06params\x18\x03 \x03(\v21.base_cloud_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xeb\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x128\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2\".base_cloud_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd7\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x129\n" + + "\adetails\x18! \x03(\v2\x1f.base_cloud_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"Z\n" + + "\x11FeedPostListReply\x123\n" + + "\x04list\x18\x01 \x03(\v2\x1f.base_cloud_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe7\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12;\n" + + "\aattachs\x18\t \x03(\v2!.base_cloud_blocks.FeedAttachItemR\aattachs\x122\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1e.base_cloud_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"\\\n" + + "\x12GroupPostListReply\x124\n" + + "\x04list\x18\x01 \x03(\v2 .base_cloud_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xfa\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12<\n" + + "\aattachs\x18\t \x03(\v2\".base_cloud_blocks.GroupAttachItemR\aattachs\x123\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\x1f.base_cloud_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_base_cloud_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"c\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x123\n" + + "\x04data\x18\x02 \x03(\v2\x1f.base_cloud_blocks.RelationItemR\x04dataB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_base_cloud_proto_const_proto_rawDescGZIP() []byte { var file_module_base_cloud_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_base_cloud_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: base_cloud_blocks.Empty + (*FetchRequest)(nil), // 1: base_cloud_blocks.FetchRequest + (*IdentRequest)(nil), // 2: base_cloud_blocks.IdentRequest + (*VersionRequest)(nil), // 3: base_cloud_blocks.VersionRequest + (*SearchRequest)(nil), // 4: base_cloud_blocks.SearchRequest + (*StatusReply)(nil), // 5: base_cloud_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: base_cloud_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: base_cloud_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: base_cloud_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: base_cloud_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: base_cloud_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: base_cloud_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: base_cloud_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: base_cloud_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: base_cloud_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: base_cloud_blocks.IDRequest + (*IDListRequest)(nil), // 16: base_cloud_blocks.IDListRequest + (*StdIicuds)(nil), // 17: base_cloud_blocks.StdIicuds + (*StdPassport)(nil), // 18: base_cloud_blocks.StdPassport + (*CloudBase)(nil), // 19: base_cloud_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: base_cloud_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: base_cloud_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: base_cloud_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: base_cloud_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: base_cloud_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: base_cloud_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: base_cloud_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: base_cloud_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: base_cloud_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: base_cloud_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: base_cloud_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: base_cloud_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: base_cloud_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: base_cloud_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: base_cloud_blocks.GroupTagItem + (*RelationItem)(nil), // 35: base_cloud_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: base_cloud_blocks.FetchRelationItemReply + nil, // 37: base_cloud_blocks.FetchRequest.ParamsEntry + nil, // 38: base_cloud_blocks.MallFetchRequest.ParamsEntry + nil, // 39: base_cloud_blocks.MarketFetchRequest.ParamsEntry } var file_module_base_cloud_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: base_cloud_blocks.FetchRequest.params:type_name -> base_cloud_blocks.FetchRequest.ParamsEntry + 38, // 1: base_cloud_blocks.MallFetchRequest.params:type_name -> base_cloud_blocks.MallFetchRequest.ParamsEntry + 39, // 2: base_cloud_blocks.MarketFetchRequest.params:type_name -> base_cloud_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: base_cloud_blocks.CmsCategoryItem.child:type_name -> base_cloud_blocks.CmsCategoryItem + 26, // 4: base_cloud_blocks.OrderSummaryItem.details:type_name -> base_cloud_blocks.OrderDetails + 28, // 5: base_cloud_blocks.FeedPostListReply.list:type_name -> base_cloud_blocks.FeedPostItem + 29, // 6: base_cloud_blocks.FeedPostItem.attachs:type_name -> base_cloud_blocks.FeedAttachItem + 30, // 7: base_cloud_blocks.FeedPostItem.tags:type_name -> base_cloud_blocks.FeedTagItem + 32, // 8: base_cloud_blocks.GroupPostListReply.list:type_name -> base_cloud_blocks.GroupPostItem + 33, // 9: base_cloud_blocks.GroupPostItem.attachs:type_name -> base_cloud_blocks.GroupAttachItem + 34, // 10: base_cloud_blocks.GroupPostItem.tags:type_name -> base_cloud_blocks.GroupTagItem + 35, // 11: base_cloud_blocks.FetchRelationItemReply.data:type_name -> base_cloud_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/base/cloud/pb/disk.pb.go b/module/base/cloud/pb/disk.pb.go index 5d617da..39340dc 100644 --- a/module/base/cloud/pb/disk.pb.go +++ b/module/base/cloud/pb/disk.pb.go @@ -792,27 +792,27 @@ const file_module_base_cloud_proto_disk_proto_rawDesc = "" + " \x01(\tR\tcreatedAt\x12\x1d\n" + "\n" + "updated_at\x18\v \x01(\tR\tupdatedAt\x125\n" + - "\tdirectory\x18\f \x01(\v2\x17.cloud.CloudDiskDirItemR\tdirectory2\xfb\x06\n" + - "\x04Disk\x129\n" + - "\tCreateDir\x12\x17.cloud.CreateDirRequest\x1a\x13.blocks.StatusReply\x127\n" + - "\x06GetDir\x12\x14.blocks.IdentRequest\x1a\x17.cloud.CloudDiskDirItem\x129\n" + - "\tUpdateDir\x12\x17.cloud.CloudDiskDirItem\x1a\x13.blocks.StatusReply\x126\n" + - "\tDeleteDir\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x129\n" + - "\bListDirs\x12\x14.blocks.FetchRequest\x1a\x17.cloud.ListDirsResponse\x12;\n" + + "\tdirectory\x18\f \x01(\v2\x17.cloud.CloudDiskDirItemR\tdirectory2\xb6\b\n" + + "\x04Disk\x12D\n" + + "\tCreateDir\x12\x17.cloud.CreateDirRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12B\n" + + "\x06GetDir\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x17.cloud.CloudDiskDirItem\x12D\n" + + "\tUpdateDir\x12\x17.cloud.CloudDiskDirItem\x1a\x1e.base_cloud_blocks.StatusReply\x12L\n" + + "\tDeleteDir\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12D\n" + + "\bListDirs\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x17.cloud.ListDirsResponse\x12F\n" + "\n" + - "GetDirTree\x12\x14.blocks.IdentRequest\x1a\x17.cloud.CloudDiskDirItem\x125\n" + - "\aMoveDir\x12\x15.cloud.MoveDirRequest\x1a\x13.blocks.StatusReply\x12>\n" + + "GetDirTree\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x17.cloud.CloudDiskDirItem\x12@\n" + + "\aMoveDir\x12\x15.cloud.MoveDirRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12I\n" + "\n" + - "UploadFile\x12\x1b.cloud.CloudDiskFileRequest\x1a\x13.blocks.StatusReply\x129\n" + - "\aGetFile\x12\x14.blocks.IdentRequest\x1a\x18.cloud.CloudDiskFileItem\x12;\n" + + "UploadFile\x12\x1b.cloud.CloudDiskFileRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12D\n" + + "\aGetFile\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x18.cloud.CloudDiskFileItem\x12F\n" + "\n" + - "UpdateFile\x12\x18.cloud.CloudDiskFileItem\x1a\x13.blocks.StatusReply\x127\n" + + "UpdateFile\x12\x18.cloud.CloudDiskFileItem\x1a\x1e.base_cloud_blocks.StatusReply\x12M\n" + "\n" + - "DeleteFile\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x12;\n" + - "\tListFiles\x12\x14.blocks.FetchRequest\x1a\x18.cloud.ListFilesResponse\x127\n" + - "\bMoveFile\x12\x16.cloud.MoveFileRequest\x1a\x13.blocks.StatusReply\x127\n" + - "\bCopyFile\x12\x16.cloud.CopyFileRequest\x1a\x13.blocks.StatusReply\x12=\n" + - "\vSearchFiles\x12\x14.blocks.FetchRequest\x1a\x18.cloud.ListFilesResponseB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + "DeleteFile\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12F\n" + + "\tListFiles\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x18.cloud.ListFilesResponse\x12B\n" + + "\bMoveFile\x12\x16.cloud.MoveFileRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12B\n" + + "\bCopyFile\x12\x16.cloud.CopyFileRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12H\n" + + "\vSearchFiles\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x18.cloud.ListFilesResponseB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_disk_proto_rawDescOnce sync.Once @@ -837,9 +837,9 @@ var file_module_base_cloud_proto_disk_proto_goTypes = []any{ (*CopyFileRequest)(nil), // 6: cloud.CopyFileRequest (*CloudDiskFileRequest)(nil), // 7: cloud.CloudDiskFileRequest (*CloudDiskFileItem)(nil), // 8: cloud.CloudDiskFileItem - (*IdentRequest)(nil), // 9: blocks.IdentRequest - (*FetchRequest)(nil), // 10: blocks.FetchRequest - (*StatusReply)(nil), // 11: blocks.StatusReply + (*IdentRequest)(nil), // 9: base_cloud_blocks.IdentRequest + (*FetchRequest)(nil), // 10: base_cloud_blocks.FetchRequest + (*StatusReply)(nil), // 11: base_cloud_blocks.StatusReply } var file_module_base_cloud_proto_disk_proto_depIdxs = []int32{ 2, // 0: cloud.ListDirsResponse.dirs:type_name -> cloud.CloudDiskDirItem @@ -849,34 +849,34 @@ var file_module_base_cloud_proto_disk_proto_depIdxs = []int32{ 8, // 4: cloud.ListFilesResponse.files:type_name -> cloud.CloudDiskFileItem 2, // 5: cloud.CloudDiskFileItem.directory:type_name -> cloud.CloudDiskDirItem 0, // 6: cloud.Disk.CreateDir:input_type -> cloud.CreateDirRequest - 9, // 7: cloud.Disk.GetDir:input_type -> blocks.IdentRequest + 9, // 7: cloud.Disk.GetDir:input_type -> base_cloud_blocks.IdentRequest 2, // 8: cloud.Disk.UpdateDir:input_type -> cloud.CloudDiskDirItem - 9, // 9: cloud.Disk.DeleteDir:input_type -> blocks.IdentRequest - 10, // 10: cloud.Disk.ListDirs:input_type -> blocks.FetchRequest - 9, // 11: cloud.Disk.GetDirTree:input_type -> blocks.IdentRequest + 9, // 9: cloud.Disk.DeleteDir:input_type -> base_cloud_blocks.IdentRequest + 10, // 10: cloud.Disk.ListDirs:input_type -> base_cloud_blocks.FetchRequest + 9, // 11: cloud.Disk.GetDirTree:input_type -> base_cloud_blocks.IdentRequest 3, // 12: cloud.Disk.MoveDir:input_type -> cloud.MoveDirRequest 7, // 13: cloud.Disk.UploadFile:input_type -> cloud.CloudDiskFileRequest - 9, // 14: cloud.Disk.GetFile:input_type -> blocks.IdentRequest + 9, // 14: cloud.Disk.GetFile:input_type -> base_cloud_blocks.IdentRequest 8, // 15: cloud.Disk.UpdateFile:input_type -> cloud.CloudDiskFileItem - 9, // 16: cloud.Disk.DeleteFile:input_type -> blocks.IdentRequest - 10, // 17: cloud.Disk.ListFiles:input_type -> blocks.FetchRequest + 9, // 16: cloud.Disk.DeleteFile:input_type -> base_cloud_blocks.IdentRequest + 10, // 17: cloud.Disk.ListFiles:input_type -> base_cloud_blocks.FetchRequest 5, // 18: cloud.Disk.MoveFile:input_type -> cloud.MoveFileRequest 6, // 19: cloud.Disk.CopyFile:input_type -> cloud.CopyFileRequest - 10, // 20: cloud.Disk.SearchFiles:input_type -> blocks.FetchRequest - 11, // 21: cloud.Disk.CreateDir:output_type -> blocks.StatusReply + 10, // 20: cloud.Disk.SearchFiles:input_type -> base_cloud_blocks.FetchRequest + 11, // 21: cloud.Disk.CreateDir:output_type -> base_cloud_blocks.StatusReply 2, // 22: cloud.Disk.GetDir:output_type -> cloud.CloudDiskDirItem - 11, // 23: cloud.Disk.UpdateDir:output_type -> blocks.StatusReply - 11, // 24: cloud.Disk.DeleteDir:output_type -> blocks.StatusReply + 11, // 23: cloud.Disk.UpdateDir:output_type -> base_cloud_blocks.StatusReply + 11, // 24: cloud.Disk.DeleteDir:output_type -> base_cloud_blocks.StatusReply 1, // 25: cloud.Disk.ListDirs:output_type -> cloud.ListDirsResponse 2, // 26: cloud.Disk.GetDirTree:output_type -> cloud.CloudDiskDirItem - 11, // 27: cloud.Disk.MoveDir:output_type -> blocks.StatusReply - 11, // 28: cloud.Disk.UploadFile:output_type -> blocks.StatusReply + 11, // 27: cloud.Disk.MoveDir:output_type -> base_cloud_blocks.StatusReply + 11, // 28: cloud.Disk.UploadFile:output_type -> base_cloud_blocks.StatusReply 8, // 29: cloud.Disk.GetFile:output_type -> cloud.CloudDiskFileItem - 11, // 30: cloud.Disk.UpdateFile:output_type -> blocks.StatusReply - 11, // 31: cloud.Disk.DeleteFile:output_type -> blocks.StatusReply + 11, // 30: cloud.Disk.UpdateFile:output_type -> base_cloud_blocks.StatusReply + 11, // 31: cloud.Disk.DeleteFile:output_type -> base_cloud_blocks.StatusReply 4, // 32: cloud.Disk.ListFiles:output_type -> cloud.ListFilesResponse - 11, // 33: cloud.Disk.MoveFile:output_type -> blocks.StatusReply - 11, // 34: cloud.Disk.CopyFile:output_type -> blocks.StatusReply + 11, // 33: cloud.Disk.MoveFile:output_type -> base_cloud_blocks.StatusReply + 11, // 34: cloud.Disk.CopyFile:output_type -> base_cloud_blocks.StatusReply 4, // 35: cloud.Disk.SearchFiles:output_type -> cloud.ListFilesResponse 21, // [21:36] is the sub-list for method output_type 6, // [6:21] is the sub-list for method input_type diff --git a/module/base/cloud/pb/note.pb.go b/module/base/cloud/pb/note.pb.go index 39a6412..4b35c10 100644 --- a/module/base/cloud/pb/note.pb.go +++ b/module/base/cloud/pb/note.pb.go @@ -519,21 +519,21 @@ const file_module_base_cloud_proto_note_proto_rawDesc = "" + "\tfile_size\x18\x05 \x01(\x03R\bfileSize\x12\x1b\n" + "\tmime_type\x18\x06 \x01(\tR\bmimeType\x12\x1d\n" + "\n" + - "created_at\x18\a \x01(\tR\tcreatedAt2\xe3\x04\n" + - "\x04Note\x12;\n" + + "created_at\x18\a \x01(\tR\tcreatedAt2\xf2\x05\n" + + "\x04Note\x12F\n" + "\n" + - "CreateNote\x12\x18.cloud.CreateNoteRequest\x1a\x13.blocks.StatusReply\x125\n" + - "\aGetNote\x12\x14.blocks.IdentRequest\x1a\x14.cloud.CloudNoteItem\x127\n" + + "CreateNote\x12\x18.cloud.CreateNoteRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12@\n" + + "\aGetNote\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x14.cloud.CloudNoteItem\x12B\n" + "\n" + - "UpdateNote\x12\x14.cloud.CloudNoteItem\x1a\x13.blocks.StatusReply\x127\n" + + "UpdateNote\x12\x14.cloud.CloudNoteItem\x1a\x1e.base_cloud_blocks.StatusReply\x12M\n" + "\n" + - "DeleteNote\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x12;\n" + - "\tListNotes\x12\x14.blocks.FetchRequest\x1a\x18.cloud.ListNotesResponse\x129\n" + - "\tTogglePin\x12\x17.cloud.TogglePinRequest\x1a\x13.blocks.StatusReply\x12;\n" + - "\x0eIncrementViews\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x12=\n" + - "\vSearchNotes\x12\x14.blocks.FetchRequest\x1a\x18.cloud.ListNotesResponse\x12B\n" + - "\x10InsertAttachment\x12\x19.cloud.NoteAttachmentItem\x1a\x13.blocks.StatusReply\x12=\n" + - "\x10DeleteAttachment\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + "DeleteNote\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12F\n" + + "\tListNotes\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x18.cloud.ListNotesResponse\x12D\n" + + "\tTogglePin\x12\x17.cloud.TogglePinRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12Q\n" + + "\x0eIncrementViews\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12H\n" + + "\vSearchNotes\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x18.cloud.ListNotesResponse\x12M\n" + + "\x10InsertAttachment\x12\x19.cloud.NoteAttachmentItem\x1a\x1e.base_cloud_blocks.StatusReply\x12S\n" + + "\x10DeleteAttachment\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_note_proto_rawDescOnce sync.Once @@ -554,33 +554,33 @@ var file_module_base_cloud_proto_note_proto_goTypes = []any{ (*TogglePinRequest)(nil), // 2: cloud.TogglePinRequest (*CloudNoteItem)(nil), // 3: cloud.CloudNoteItem (*NoteAttachmentItem)(nil), // 4: cloud.NoteAttachmentItem - (*IdentRequest)(nil), // 5: blocks.IdentRequest - (*FetchRequest)(nil), // 6: blocks.FetchRequest - (*StatusReply)(nil), // 7: blocks.StatusReply + (*IdentRequest)(nil), // 5: base_cloud_blocks.IdentRequest + (*FetchRequest)(nil), // 6: base_cloud_blocks.FetchRequest + (*StatusReply)(nil), // 7: base_cloud_blocks.StatusReply } var file_module_base_cloud_proto_note_proto_depIdxs = []int32{ 3, // 0: cloud.ListNotesResponse.notes:type_name -> cloud.CloudNoteItem 4, // 1: cloud.CloudNoteItem.attachments:type_name -> cloud.NoteAttachmentItem 0, // 2: cloud.Note.CreateNote:input_type -> cloud.CreateNoteRequest - 5, // 3: cloud.Note.GetNote:input_type -> blocks.IdentRequest + 5, // 3: cloud.Note.GetNote:input_type -> base_cloud_blocks.IdentRequest 3, // 4: cloud.Note.UpdateNote:input_type -> cloud.CloudNoteItem - 5, // 5: cloud.Note.DeleteNote:input_type -> blocks.IdentRequest - 6, // 6: cloud.Note.ListNotes:input_type -> blocks.FetchRequest + 5, // 5: cloud.Note.DeleteNote:input_type -> base_cloud_blocks.IdentRequest + 6, // 6: cloud.Note.ListNotes:input_type -> base_cloud_blocks.FetchRequest 2, // 7: cloud.Note.TogglePin:input_type -> cloud.TogglePinRequest - 5, // 8: cloud.Note.IncrementViews:input_type -> blocks.IdentRequest - 6, // 9: cloud.Note.SearchNotes:input_type -> blocks.FetchRequest + 5, // 8: cloud.Note.IncrementViews:input_type -> base_cloud_blocks.IdentRequest + 6, // 9: cloud.Note.SearchNotes:input_type -> base_cloud_blocks.FetchRequest 4, // 10: cloud.Note.InsertAttachment:input_type -> cloud.NoteAttachmentItem - 5, // 11: cloud.Note.DeleteAttachment:input_type -> blocks.IdentRequest - 7, // 12: cloud.Note.CreateNote:output_type -> blocks.StatusReply + 5, // 11: cloud.Note.DeleteAttachment:input_type -> base_cloud_blocks.IdentRequest + 7, // 12: cloud.Note.CreateNote:output_type -> base_cloud_blocks.StatusReply 3, // 13: cloud.Note.GetNote:output_type -> cloud.CloudNoteItem - 7, // 14: cloud.Note.UpdateNote:output_type -> blocks.StatusReply - 7, // 15: cloud.Note.DeleteNote:output_type -> blocks.StatusReply + 7, // 14: cloud.Note.UpdateNote:output_type -> base_cloud_blocks.StatusReply + 7, // 15: cloud.Note.DeleteNote:output_type -> base_cloud_blocks.StatusReply 1, // 16: cloud.Note.ListNotes:output_type -> cloud.ListNotesResponse - 7, // 17: cloud.Note.TogglePin:output_type -> blocks.StatusReply - 7, // 18: cloud.Note.IncrementViews:output_type -> blocks.StatusReply + 7, // 17: cloud.Note.TogglePin:output_type -> base_cloud_blocks.StatusReply + 7, // 18: cloud.Note.IncrementViews:output_type -> base_cloud_blocks.StatusReply 1, // 19: cloud.Note.SearchNotes:output_type -> cloud.ListNotesResponse - 7, // 20: cloud.Note.InsertAttachment:output_type -> blocks.StatusReply - 7, // 21: cloud.Note.DeleteAttachment:output_type -> blocks.StatusReply + 7, // 20: cloud.Note.InsertAttachment:output_type -> base_cloud_blocks.StatusReply + 7, // 21: cloud.Note.DeleteAttachment:output_type -> base_cloud_blocks.StatusReply 12, // [12:22] is the sub-list for method output_type 2, // [2:12] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name diff --git a/module/base/cloud/pb/private.pb.go b/module/base/cloud/pb/private.pb.go index 149c6e0..7d46999 100644 --- a/module/base/cloud/pb/private.pb.go +++ b/module/base/cloud/pb/private.pb.go @@ -376,17 +376,17 @@ const file_module_base_cloud_proto_private_proto_rawDesc = "" + "created_at\x18\t \x01(\tR\tcreatedAt\x12\x1d\n" + "\n" + "updated_at\x18\n" + - " \x01(\tR\tupdatedAt2\xea\x04\n" + - "\aPrivate\x12I\n" + - "\x11CreatePrivateData\x12\x1f.cloud.CreatePrivateDataRequest\x1a\x13.blocks.StatusReply\x12?\n" + - "\x0eGetPrivateData\x12\x14.blocks.IdentRequest\x1a\x17.cloud.CloudPrivateItem\x12A\n" + - "\x11UpdatePrivateData\x12\x17.cloud.CloudPrivateItem\x1a\x13.blocks.StatusReply\x12>\n" + - "\x11DeletePrivateData\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x12G\n" + - "\x0fListPrivateData\x12\x14.blocks.FetchRequest\x1a\x1e.cloud.ListPrivateDataResponse\x12L\n" + - "\x14GetPrivateDataByType\x12\x14.blocks.FetchRequest\x1a\x1e.cloud.ListPrivateDataResponse\x12I\n" + - "\x11SearchPrivateData\x12\x14.blocks.FetchRequest\x1a\x1e.cloud.ListPrivateDataResponse\x126\n" + - "\vEncryptData\x12\x12.cloud.DataRequest\x1a\x13.blocks.StatusReply\x126\n" + - "\vDecryptData\x12\x12.cloud.DataRequest\x1a\x13.blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + " \x01(\tR\tupdatedAt2\xd8\x05\n" + + "\aPrivate\x12T\n" + + "\x11CreatePrivateData\x12\x1f.cloud.CreatePrivateDataRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12J\n" + + "\x0eGetPrivateData\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x17.cloud.CloudPrivateItem\x12L\n" + + "\x11UpdatePrivateData\x12\x17.cloud.CloudPrivateItem\x1a\x1e.base_cloud_blocks.StatusReply\x12T\n" + + "\x11DeletePrivateData\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12R\n" + + "\x0fListPrivateData\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x1e.cloud.ListPrivateDataResponse\x12W\n" + + "\x14GetPrivateDataByType\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x1e.cloud.ListPrivateDataResponse\x12T\n" + + "\x11SearchPrivateData\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x1e.cloud.ListPrivateDataResponse\x12A\n" + + "\vEncryptData\x12\x12.cloud.DataRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12A\n" + + "\vDecryptData\x12\x12.cloud.DataRequest\x1a\x1e.base_cloud_blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_private_proto_rawDescOnce sync.Once @@ -406,30 +406,30 @@ var file_module_base_cloud_proto_private_proto_goTypes = []any{ (*ListPrivateDataResponse)(nil), // 1: cloud.ListPrivateDataResponse (*DataRequest)(nil), // 2: cloud.DataRequest (*CloudPrivateItem)(nil), // 3: cloud.CloudPrivateItem - (*IdentRequest)(nil), // 4: blocks.IdentRequest - (*FetchRequest)(nil), // 5: blocks.FetchRequest - (*StatusReply)(nil), // 6: blocks.StatusReply + (*IdentRequest)(nil), // 4: base_cloud_blocks.IdentRequest + (*FetchRequest)(nil), // 5: base_cloud_blocks.FetchRequest + (*StatusReply)(nil), // 6: base_cloud_blocks.StatusReply } var file_module_base_cloud_proto_private_proto_depIdxs = []int32{ 3, // 0: cloud.ListPrivateDataResponse.data:type_name -> cloud.CloudPrivateItem 0, // 1: cloud.Private.CreatePrivateData:input_type -> cloud.CreatePrivateDataRequest - 4, // 2: cloud.Private.GetPrivateData:input_type -> blocks.IdentRequest + 4, // 2: cloud.Private.GetPrivateData:input_type -> base_cloud_blocks.IdentRequest 3, // 3: cloud.Private.UpdatePrivateData:input_type -> cloud.CloudPrivateItem - 4, // 4: cloud.Private.DeletePrivateData:input_type -> blocks.IdentRequest - 5, // 5: cloud.Private.ListPrivateData:input_type -> blocks.FetchRequest - 5, // 6: cloud.Private.GetPrivateDataByType:input_type -> blocks.FetchRequest - 5, // 7: cloud.Private.SearchPrivateData:input_type -> blocks.FetchRequest + 4, // 4: cloud.Private.DeletePrivateData:input_type -> base_cloud_blocks.IdentRequest + 5, // 5: cloud.Private.ListPrivateData:input_type -> base_cloud_blocks.FetchRequest + 5, // 6: cloud.Private.GetPrivateDataByType:input_type -> base_cloud_blocks.FetchRequest + 5, // 7: cloud.Private.SearchPrivateData:input_type -> base_cloud_blocks.FetchRequest 2, // 8: cloud.Private.EncryptData:input_type -> cloud.DataRequest 2, // 9: cloud.Private.DecryptData:input_type -> cloud.DataRequest - 6, // 10: cloud.Private.CreatePrivateData:output_type -> blocks.StatusReply + 6, // 10: cloud.Private.CreatePrivateData:output_type -> base_cloud_blocks.StatusReply 3, // 11: cloud.Private.GetPrivateData:output_type -> cloud.CloudPrivateItem - 6, // 12: cloud.Private.UpdatePrivateData:output_type -> blocks.StatusReply - 6, // 13: cloud.Private.DeletePrivateData:output_type -> blocks.StatusReply + 6, // 12: cloud.Private.UpdatePrivateData:output_type -> base_cloud_blocks.StatusReply + 6, // 13: cloud.Private.DeletePrivateData:output_type -> base_cloud_blocks.StatusReply 1, // 14: cloud.Private.ListPrivateData:output_type -> cloud.ListPrivateDataResponse 1, // 15: cloud.Private.GetPrivateDataByType:output_type -> cloud.ListPrivateDataResponse 1, // 16: cloud.Private.SearchPrivateData:output_type -> cloud.ListPrivateDataResponse - 6, // 17: cloud.Private.EncryptData:output_type -> blocks.StatusReply - 6, // 18: cloud.Private.DecryptData:output_type -> blocks.StatusReply + 6, // 17: cloud.Private.EncryptData:output_type -> base_cloud_blocks.StatusReply + 6, // 18: cloud.Private.DecryptData:output_type -> base_cloud_blocks.StatusReply 10, // [10:19] is the sub-list for method output_type 1, // [1:10] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/base/cloud/pb/share.pb.go b/module/base/cloud/pb/share.pb.go index aee4e18..54f1e74 100644 --- a/module/base/cloud/pb/share.pb.go +++ b/module/base/cloud/pb/share.pb.go @@ -403,14 +403,14 @@ const file_module_base_cloud_proto_share_proto_rawDesc = "" + "\n" + "created_at\x18\v \x01(\tR\tcreatedAt\x12\x1d\n" + "\n" + - "updated_at\x18\f \x01(\tR\tupdatedAt2\xcb\x02\n" + - "\x05Share\x12=\n" + - "\vCreateShare\x12\x19.cloud.CreateShareRequest\x1a\x13.blocks.StatusReply\x127\n" + - "\bGetShare\x12\x14.blocks.IdentRequest\x1a\x15.cloud.CloudShareItem\x128\n" + - "\vDeleteShare\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\x12=\n" + + "updated_at\x18\f \x01(\tR\tupdatedAt2\x8d\x03\n" + + "\x05Share\x12H\n" + + "\vCreateShare\x12\x19.cloud.CreateShareRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12B\n" + + "\bGetShare\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x15.cloud.CloudShareItem\x12N\n" + + "\vDeleteShare\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x1e.base_cloud_blocks.StatusReply\x12H\n" + "\n" + - "ListShares\x12\x14.blocks.FetchRequest\x1a\x19.cloud.ListSharesResponse\x12Q\n" + - "\x15ValidateSharePassword\x12#.cloud.ValidateSharePasswordRequest\x1a\x13.blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + "ListShares\x12\x1f.base_cloud_blocks.FetchRequest\x1a\x19.cloud.ListSharesResponse\x12\\\n" + + "\x15ValidateSharePassword\x12#.cloud.ValidateSharePasswordRequest\x1a\x1e.base_cloud_blocks.StatusReplyB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_share_proto_rawDescOnce sync.Once @@ -430,22 +430,22 @@ var file_module_base_cloud_proto_share_proto_goTypes = []any{ (*ListSharesResponse)(nil), // 1: cloud.ListSharesResponse (*ValidateSharePasswordRequest)(nil), // 2: cloud.ValidateSharePasswordRequest (*CloudShareItem)(nil), // 3: cloud.CloudShareItem - (*IdentRequest)(nil), // 4: blocks.IdentRequest - (*FetchRequest)(nil), // 5: blocks.FetchRequest - (*StatusReply)(nil), // 6: blocks.StatusReply + (*IdentRequest)(nil), // 4: base_cloud_blocks.IdentRequest + (*FetchRequest)(nil), // 5: base_cloud_blocks.FetchRequest + (*StatusReply)(nil), // 6: base_cloud_blocks.StatusReply } var file_module_base_cloud_proto_share_proto_depIdxs = []int32{ 3, // 0: cloud.ListSharesResponse.shares:type_name -> cloud.CloudShareItem 0, // 1: cloud.Share.CreateShare:input_type -> cloud.CreateShareRequest - 4, // 2: cloud.Share.GetShare:input_type -> blocks.IdentRequest - 4, // 3: cloud.Share.DeleteShare:input_type -> blocks.IdentRequest - 5, // 4: cloud.Share.ListShares:input_type -> blocks.FetchRequest + 4, // 2: cloud.Share.GetShare:input_type -> base_cloud_blocks.IdentRequest + 4, // 3: cloud.Share.DeleteShare:input_type -> base_cloud_blocks.IdentRequest + 5, // 4: cloud.Share.ListShares:input_type -> base_cloud_blocks.FetchRequest 2, // 5: cloud.Share.ValidateSharePassword:input_type -> cloud.ValidateSharePasswordRequest - 6, // 6: cloud.Share.CreateShare:output_type -> blocks.StatusReply + 6, // 6: cloud.Share.CreateShare:output_type -> base_cloud_blocks.StatusReply 3, // 7: cloud.Share.GetShare:output_type -> cloud.CloudShareItem - 6, // 8: cloud.Share.DeleteShare:output_type -> blocks.StatusReply + 6, // 8: cloud.Share.DeleteShare:output_type -> base_cloud_blocks.StatusReply 1, // 9: cloud.Share.ListShares:output_type -> cloud.ListSharesResponse - 6, // 10: cloud.Share.ValidateSharePassword:output_type -> blocks.StatusReply + 6, // 10: cloud.Share.ValidateSharePassword:output_type -> base_cloud_blocks.StatusReply 6, // [6:11] is the sub-list for method output_type 1, // [1:6] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/base/cloud/pb/space.pb.go b/module/base/cloud/pb/space.pb.go index e8d6a9b..4108c1a 100644 --- a/module/base/cloud/pb/space.pb.go +++ b/module/base/cloud/pb/space.pb.go @@ -245,10 +245,10 @@ const file_module_base_cloud_proto_space_proto_rawDesc = "" + "cloudNotes\x12A\n" + "\x0fcloud_bookmarks\x18\x11 \x03(\v2\x18.cloud.CloudBookmarkItemR\x0ecloudBookmarks\x12<\n" + "\rcloud_private\x18\x12 \x03(\v2\x17.cloud.CloudPrivateItemR\fcloudPrivate\x128\n" + - "\fcloud_shares\x18\x13 \x03(\v2\x15.cloud.CloudShareItemR\vcloudShares2o\n" + - "\x05Space\x12'\n" + - "\x03Get\x12\r.blocks.Empty\x1a\x11.cloud.CloudSpace\x12=\n" + - "\x12GetByKeyIdentifier\x12\x14.blocks.IdentRequest\x1a\x11.cloud.CloudSpaceB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" + "\fcloud_shares\x18\x13 \x03(\v2\x15.cloud.CloudShareItemR\vcloudShares2\x85\x01\n" + + "\x05Space\x122\n" + + "\x03Get\x12\x18.base_cloud_blocks.Empty\x1a\x11.cloud.CloudSpace\x12H\n" + + "\x12GetByKeyIdentifier\x12\x1f.base_cloud_blocks.IdentRequest\x1a\x11.cloud.CloudSpaceB%Z#bsm/full/module/base/cloud/pb;cloudb\x06proto3" var ( file_module_base_cloud_proto_space_proto_rawDescOnce sync.Once @@ -271,8 +271,8 @@ var file_module_base_cloud_proto_space_proto_goTypes = []any{ (*CloudBookmarkItem)(nil), // 4: cloud.CloudBookmarkItem (*CloudPrivateItem)(nil), // 5: cloud.CloudPrivateItem (*CloudShareItem)(nil), // 6: cloud.CloudShareItem - (*Empty)(nil), // 7: blocks.Empty - (*IdentRequest)(nil), // 8: blocks.IdentRequest + (*Empty)(nil), // 7: base_cloud_blocks.Empty + (*IdentRequest)(nil), // 8: base_cloud_blocks.IdentRequest } var file_module_base_cloud_proto_space_proto_depIdxs = []int32{ 1, // 0: cloud.CloudSpace.cloud_disk_dirs:type_name -> cloud.CloudDiskDirItem @@ -281,8 +281,8 @@ var file_module_base_cloud_proto_space_proto_depIdxs = []int32{ 4, // 3: cloud.CloudSpace.cloud_bookmarks:type_name -> cloud.CloudBookmarkItem 5, // 4: cloud.CloudSpace.cloud_private:type_name -> cloud.CloudPrivateItem 6, // 5: cloud.CloudSpace.cloud_shares:type_name -> cloud.CloudShareItem - 7, // 6: cloud.Space.Get:input_type -> blocks.Empty - 8, // 7: cloud.Space.GetByKeyIdentifier:input_type -> blocks.IdentRequest + 7, // 6: cloud.Space.Get:input_type -> base_cloud_blocks.Empty + 8, // 7: cloud.Space.GetByKeyIdentifier:input_type -> base_cloud_blocks.IdentRequest 0, // 8: cloud.Space.Get:output_type -> cloud.CloudSpace 0, // 9: cloud.Space.GetByKeyIdentifier:output_type -> cloud.CloudSpace 8, // [8:10] is the sub-list for method output_type diff --git a/module/base/cloud/proto/album.proto b/module/base/cloud/proto/album.proto index c92da46..8bf7001 100644 --- a/module/base/cloud/proto/album.proto +++ b/module/base/cloud/proto/album.proto @@ -6,30 +6,30 @@ import "module/base/cloud/proto/const.proto"; // 相册服务 service Album { // 创建相册 - rpc CreateAlbum(CreateAlbumRequest) returns (blocks.StatusReply); + rpc CreateAlbum(CreateAlbumRequest) returns (base_cloud_blocks.StatusReply); // 获取相册详情 - rpc GetAlbum(blocks.IdentRequest) returns (CloudAlbumItem); + rpc GetAlbum(base_cloud_blocks.IdentRequest) returns (CloudAlbumItem); // 更新相册 - rpc UpdateAlbum(CloudAlbumItem) returns (blocks.StatusReply); + rpc UpdateAlbum(CloudAlbumItem) returns (base_cloud_blocks.StatusReply); // 删除相册 - rpc DeleteAlbum(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeleteAlbum(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 获取相册列表 - rpc ListAlbums(blocks.FetchRequest) returns (ListAlbumsResponse); + rpc ListAlbums(base_cloud_blocks.FetchRequest) returns (ListAlbumsResponse); // 设置封面照片 - rpc SetCoverPhoto(SetCoverPhotoRequest) returns (blocks.StatusReply); + rpc SetCoverPhoto(SetCoverPhotoRequest) returns (base_cloud_blocks.StatusReply); // 上传照片 - rpc UploadPhoto(CloudPhotoItem) returns (blocks.StatusReply); + rpc UploadPhoto(CloudPhotoItem) returns (base_cloud_blocks.StatusReply); // 获取照片详情 - rpc GetPhoto(blocks.IdentRequest) returns (CloudPhotoItem); + rpc GetPhoto(base_cloud_blocks.IdentRequest) returns (CloudPhotoItem); // 更新照片 - rpc UpdatePhoto(CloudPhotoItem) returns (blocks.StatusReply); + rpc UpdatePhoto(CloudPhotoItem) returns (base_cloud_blocks.StatusReply); // 删除照片 - rpc DeletePhoto(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeletePhoto(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 获取照片列表 - rpc ListPhotos(blocks.FetchRequest) returns (ListPhotosResponse); + rpc ListPhotos(base_cloud_blocks.FetchRequest) returns (ListPhotosResponse); // 移动照片到其他相册 - rpc MovePhoto(MovePhotoRequest) returns (blocks.StatusReply); + rpc MovePhoto(MovePhotoRequest) returns (base_cloud_blocks.StatusReply); } // 请求消息定义 @@ -99,4 +99,4 @@ message CloudPhotoItem { // 关联关系 CloudAlbumItem album = 16; -} \ No newline at end of file +} diff --git a/module/base/cloud/proto/bookmark.proto b/module/base/cloud/proto/bookmark.proto index 6dec042..e3dd90c 100644 --- a/module/base/cloud/proto/bookmark.proto +++ b/module/base/cloud/proto/bookmark.proto @@ -6,17 +6,17 @@ import "module/base/cloud/proto/const.proto"; // 书签服务 service Bookmark { // 创建书签 - rpc CreateBookmark(CreateBookmarkRequest) returns (blocks.StatusReply); + rpc CreateBookmark(CreateBookmarkRequest) returns (base_cloud_blocks.StatusReply); // 获取书签详情 - rpc GetBookmark(blocks.IDRequest) returns (CloudBookmarkItem); + rpc GetBookmark(base_cloud_blocks.IDRequest) returns (CloudBookmarkItem); // 更新书签 - rpc UpdateBookmark(CloudBookmarkItem) returns (blocks.StatusReply); + rpc UpdateBookmark(CloudBookmarkItem) returns (base_cloud_blocks.StatusReply); // 删除书签 - rpc DeleteBookmark(blocks.IDRequest) returns (blocks.StatusReply); + rpc DeleteBookmark(base_cloud_blocks.IDRequest) returns (base_cloud_blocks.StatusReply); // 获取书签列表 - rpc ListBookmarks(blocks.FetchRequest) returns (ListBookmarksResponse); + rpc ListBookmarks(base_cloud_blocks.FetchRequest) returns (ListBookmarksResponse); // 导入书签 - rpc ImportBookmarks(ImportBookmarksRequest) returns (blocks.StatusReply); + rpc ImportBookmarks(ImportBookmarksRequest) returns (base_cloud_blocks.StatusReply); } message CreateBookmarkRequest { diff --git a/module/base/cloud/proto/const.proto b/module/base/cloud/proto/const.proto index 01403a4..c262a47 100644 --- a/module/base/cloud/proto/const.proto +++ b/module/base/cloud/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package base_cloud_blocks; option go_package = "bsm/full/module/base/cloud/pb;cloud"; diff --git a/module/base/cloud/proto/disk.proto b/module/base/cloud/proto/disk.proto index 4472569..82574b1 100644 --- a/module/base/cloud/proto/disk.proto +++ b/module/base/cloud/proto/disk.proto @@ -6,36 +6,36 @@ import "module/base/cloud/proto/const.proto"; // 云盘目录服务 service Disk { // 创建目录 - rpc CreateDir(CreateDirRequest) returns (blocks.StatusReply); + rpc CreateDir(CreateDirRequest) returns (base_cloud_blocks.StatusReply); // 获取目录详情 - rpc GetDir(blocks.IdentRequest) returns (CloudDiskDirItem); + rpc GetDir(base_cloud_blocks.IdentRequest) returns (CloudDiskDirItem); // 更新目录 - rpc UpdateDir(CloudDiskDirItem) returns (blocks.StatusReply); + rpc UpdateDir(CloudDiskDirItem) returns (base_cloud_blocks.StatusReply); // 删除目录 - rpc DeleteDir(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeleteDir(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 获取目录列表 - rpc ListDirs(blocks.FetchRequest) returns (ListDirsResponse); + rpc ListDirs(base_cloud_blocks.FetchRequest) returns (ListDirsResponse); // 获取目录树 - rpc GetDirTree(blocks.IdentRequest) returns (CloudDiskDirItem); + rpc GetDirTree(base_cloud_blocks.IdentRequest) returns (CloudDiskDirItem); // 移动目录 - rpc MoveDir(MoveDirRequest) returns (blocks.StatusReply); + rpc MoveDir(MoveDirRequest) returns (base_cloud_blocks.StatusReply); // 上传文件 - rpc UploadFile(CloudDiskFileRequest) returns (blocks.StatusReply); + rpc UploadFile(CloudDiskFileRequest) returns (base_cloud_blocks.StatusReply); // 获取文件详情 - rpc GetFile(blocks.IdentRequest) returns (CloudDiskFileItem); + rpc GetFile(base_cloud_blocks.IdentRequest) returns (CloudDiskFileItem); // 更新文件 - rpc UpdateFile(CloudDiskFileItem) returns (blocks.StatusReply); + rpc UpdateFile(CloudDiskFileItem) returns (base_cloud_blocks.StatusReply); // 删除文件 - rpc DeleteFile(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeleteFile(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 获取文件列表 - rpc ListFiles(blocks.FetchRequest) returns (ListFilesResponse); + rpc ListFiles(base_cloud_blocks.FetchRequest) returns (ListFilesResponse); // 移动文件 - rpc MoveFile(MoveFileRequest) returns (blocks.StatusReply); + rpc MoveFile(MoveFileRequest) returns (base_cloud_blocks.StatusReply); // 复制文件 - rpc CopyFile(CopyFileRequest) returns (blocks.StatusReply); + rpc CopyFile(CopyFileRequest) returns (base_cloud_blocks.StatusReply); // 搜索文件 - rpc SearchFiles(blocks.FetchRequest) returns (ListFilesResponse); + rpc SearchFiles(base_cloud_blocks.FetchRequest) returns (ListFilesResponse); } message CreateDirRequest { diff --git a/module/base/cloud/proto/note.proto b/module/base/cloud/proto/note.proto index 2d5fce5..38fdb2d 100644 --- a/module/base/cloud/proto/note.proto +++ b/module/base/cloud/proto/note.proto @@ -6,26 +6,26 @@ import "module/base/cloud/proto/const.proto"; // 笔记服务 service Note { // 创建笔记 - rpc CreateNote(CreateNoteRequest) returns (blocks.StatusReply); + rpc CreateNote(CreateNoteRequest) returns (base_cloud_blocks.StatusReply); // 获取笔记详情 - rpc GetNote(blocks.IdentRequest) returns (CloudNoteItem); + rpc GetNote(base_cloud_blocks.IdentRequest) returns (CloudNoteItem); // 更新笔记 - rpc UpdateNote(CloudNoteItem) returns (blocks.StatusReply); + rpc UpdateNote(CloudNoteItem) returns (base_cloud_blocks.StatusReply); // 删除笔记 - rpc DeleteNote(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeleteNote(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 获取笔记列表 - rpc ListNotes(blocks.FetchRequest) returns (ListNotesResponse); + rpc ListNotes(base_cloud_blocks.FetchRequest) returns (ListNotesResponse); // 置顶/取消置顶笔记 - rpc TogglePin(TogglePinRequest) returns (blocks.StatusReply); + rpc TogglePin(TogglePinRequest) returns (base_cloud_blocks.StatusReply); // 增加浏览次数 - rpc IncrementViews(blocks.IdentRequest) returns (blocks.StatusReply); + rpc IncrementViews(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 搜索笔记 - rpc SearchNotes(blocks.FetchRequest) returns (ListNotesResponse); + rpc SearchNotes(base_cloud_blocks.FetchRequest) returns (ListNotesResponse); // 上传附件 - rpc InsertAttachment(NoteAttachmentItem) returns (blocks.StatusReply); + rpc InsertAttachment(NoteAttachmentItem) returns (base_cloud_blocks.StatusReply); // 删除附件 - rpc DeleteAttachment(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeleteAttachment(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); } // 请求消息定义 diff --git a/module/base/cloud/proto/private.proto b/module/base/cloud/proto/private.proto index 4353a72..1f2c176 100644 --- a/module/base/cloud/proto/private.proto +++ b/module/base/cloud/proto/private.proto @@ -6,23 +6,23 @@ import "module/base/cloud/proto/const.proto"; // 隐私数据服务 service Private { // 创建隐私数据 - rpc CreatePrivateData(CreatePrivateDataRequest) returns (blocks.StatusReply); + rpc CreatePrivateData(CreatePrivateDataRequest) returns (base_cloud_blocks.StatusReply); // 获取隐私数据详情 - rpc GetPrivateData(blocks.IdentRequest) returns (CloudPrivateItem); + rpc GetPrivateData(base_cloud_blocks.IdentRequest) returns (CloudPrivateItem); // 更新隐私数据 - rpc UpdatePrivateData(CloudPrivateItem) returns (blocks.StatusReply); + rpc UpdatePrivateData(CloudPrivateItem) returns (base_cloud_blocks.StatusReply); // 删除隐私数据 - rpc DeletePrivateData(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeletePrivateData(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 获取隐私数据列表 - rpc ListPrivateData(blocks.FetchRequest) returns (ListPrivateDataResponse); + rpc ListPrivateData(base_cloud_blocks.FetchRequest) returns (ListPrivateDataResponse); // 按类型获取隐私数据 - rpc GetPrivateDataByType(blocks.FetchRequest) returns (ListPrivateDataResponse); + rpc GetPrivateDataByType(base_cloud_blocks.FetchRequest) returns (ListPrivateDataResponse); // 搜索隐私数据 - rpc SearchPrivateData(blocks.FetchRequest) returns (ListPrivateDataResponse); + rpc SearchPrivateData(base_cloud_blocks.FetchRequest) returns (ListPrivateDataResponse); // 加密数据 - rpc EncryptData(DataRequest) returns (blocks.StatusReply); + rpc EncryptData(DataRequest) returns (base_cloud_blocks.StatusReply); // 解密数据 - rpc DecryptData(DataRequest) returns (blocks.StatusReply); + rpc DecryptData(DataRequest) returns (base_cloud_blocks.StatusReply); } // 请求消息定义 message CreatePrivateDataRequest { diff --git a/module/base/cloud/proto/share.proto b/module/base/cloud/proto/share.proto index 6f6d47f..492f279 100644 --- a/module/base/cloud/proto/share.proto +++ b/module/base/cloud/proto/share.proto @@ -6,15 +6,15 @@ import "module/base/cloud/proto/const.proto"; // 分享服务 service Share { // 创建分享 - rpc CreateShare(CreateShareRequest) returns (blocks.StatusReply); + rpc CreateShare(CreateShareRequest) returns (base_cloud_blocks.StatusReply); // 获取分享详情 - rpc GetShare(blocks.IdentRequest) returns (CloudShareItem); + rpc GetShare(base_cloud_blocks.IdentRequest) returns (CloudShareItem); // 删除分享 - rpc DeleteShare(blocks.IdentRequest) returns (blocks.StatusReply); + rpc DeleteShare(base_cloud_blocks.IdentRequest) returns (base_cloud_blocks.StatusReply); // 获取分享列表 - rpc ListShares(blocks.FetchRequest) returns (ListSharesResponse); + rpc ListShares(base_cloud_blocks.FetchRequest) returns (ListSharesResponse); // 验证分享密码 - rpc ValidateSharePassword(ValidateSharePasswordRequest) returns (blocks.StatusReply); + rpc ValidateSharePassword(ValidateSharePasswordRequest) returns (base_cloud_blocks.StatusReply); } // 请求消息定义 diff --git a/module/base/cloud/proto/space.proto b/module/base/cloud/proto/space.proto index 5c49bf7..09865f2 100644 --- a/module/base/cloud/proto/space.proto +++ b/module/base/cloud/proto/space.proto @@ -12,10 +12,10 @@ import "module/base/cloud/proto/share.proto"; service Space { // 获取空间数据 - rpc Get(blocks.Empty) returns (CloudSpace); + rpc Get(base_cloud_blocks.Empty) returns (CloudSpace); // 获取空间数据 - rpc GetByKeyIdentifier(blocks.IdentRequest) returns (CloudSpace); + rpc GetByKeyIdentifier(base_cloud_blocks.IdentRequest) returns (CloudSpace); } // 系统统计和配置模型 diff --git a/module/base/cloud/service/expose.go b/module/base/cloud/service/expose.go new file mode 100644 index 0000000..effe3ab --- /dev/null +++ b/module/base/cloud/service/expose.go @@ -0,0 +1,43 @@ +package service + +import ( + "context" + + "bsm/full/module/base/cloud/internal/server" + pb "bsm/full/module/base/cloud/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterAlbumHandlerServer(ctx, options.Gateway, server.NewAlbumServer()); err != nil { + return err + } + if err := pb.RegisterBookmarkHandlerServer(ctx, options.Gateway, server.NewBookmarkServer()); err != nil { + return err + } + if err := pb.RegisterDiskHandlerServer(ctx, options.Gateway, server.NewDiskServer()); err != nil { + return err + } + if err := pb.RegisterNoteHandlerServer(ctx, options.Gateway, server.NewNoteServer()); err != nil { + return err + } + if err := pb.RegisterPrivateHandlerServer(ctx, options.Gateway, server.NewPrivateServer()); err != nil { + return err + } + if err := pb.RegisterShareHandlerServer(ctx, options.Gateway, server.NewShareServer()); err != nil { + return err + } + if err := pb.RegisterSpaceHandlerServer(ctx, options.Gateway, server.NewSpaceServer()); err != nil { + return err + } + return nil +} diff --git a/module/base/cms/cmd/main/main.go b/module/base/cms/cmd/main/main.go index 0eb2807..7db0b00 100644 --- a/module/base/cms/cmd/main/main.go +++ b/module/base/cms/cmd/main/main.go @@ -4,7 +4,7 @@ * @Date: 2021-11-26 15:25:03 * @Description: 提供文章、页面、分类、标签等内容管理功能 */ -package service +package main import ( "bsm/full/module/base/cms/internal/config" @@ -28,7 +28,7 @@ func Run() { impl.NewImpl() // 创建gRPC服务器实例，监听指定地址 - s := server.New(config.Spec.Addr) + s := server.New(nil) // 创建微服务实例，配置服务参数 srv := service.New( diff --git a/module/base/cms/internal/server/new.go b/module/base/cms/internal/server/new.go index 16aa163..0ec3dcb 100644 --- a/module/base/cms/internal/server/new.go +++ b/module/base/cms/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -31,7 +36,9 @@ func New(addr string) *Server { pb.RegisterSiteServer(srv.Grpc, NewSiteServer()) pb.RegisterTagsServer(srv.Grpc, NewTagsServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/base/cms/pb/category.pb.go b/module/base/cms/pb/category.pb.go index ca7a1d4..c19fcd0 100644 --- a/module/base/cms/pb/category.pb.go +++ b/module/base/cms/pb/category.pb.go @@ -441,12 +441,12 @@ var File_module_base_cms_proto_category_proto protoreflect.FileDescriptor const file_module_base_cms_proto_category_proto_rawDesc = "" + "\n" + - "$module/base/cms/proto/category.proto\x12\x03cms\x1a!module/base/cms/proto/const.proto\"V\n" + - "\x11CategoryListReply\x12+\n" + - "\x04data\x18\x01 \x03(\v2\x17.blocks.CmsCategoryItemR\x04data\x12\x14\n" + + "$module/base/cms/proto/category.proto\x12\x03cms\x1a!module/base/cms/proto/const.proto\"_\n" + + "\x11CategoryListReply\x124\n" + + "\x04data\x18\x01 \x03(\v2 .base_cms_blocks.CmsCategoryItemR\x04data\x12\x14\n" + "\x05count\x18\x02 \x01(\x03R\x05count\"1\n" + "\x13AddCategoryResponse\x12\x1a\n" + - "\bidentity\x18\x01 \x01(\tR\bidentity\"\xad\x02\n" + + "\bidentity\x18\x01 \x01(\tR\bidentity\"\xb6\x02\n" + "\x12AddCategoryRequest\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x1a\n" + "\bidentity\x18\x02 \x01(\tR\bidentity\x12\x1c\n" + @@ -461,8 +461,8 @@ const file_module_base_cms_proto_category_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\b \x01(\tR\n" + - "updated_at\x12+\n" + - "\x04data\x18\t \x03(\v2\x17.blocks.CmsCategoryItemR\x04data\"\xd4\x02\n" + + "updated_at\x124\n" + + "\x04data\x18\t \x03(\v2 .base_cms_blocks.CmsCategoryItemR\x04data\"\xdd\x02\n" + "\x15ModifyCategoryRequest\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x1a\n" + "\bidentity\x18\x02 \x01(\tR\bidentity\x12\x1c\n" + @@ -477,19 +477,19 @@ const file_module_base_cms_proto_category_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\b \x01(\tR\n" + - "updated_at\x12+\n" + - "\x04data\x18\t \x03(\v2\x17.blocks.CmsCategoryItemR\x04data\x12\"\n" + + "updated_at\x124\n" + + "\x04data\x18\t \x03(\v2 .base_cms_blocks.CmsCategoryItemR\x04data\x12\"\n" + "\fcategory_key\x18\n" + " \x01(\tR\fcategory_key\"3\n" + "\x15DeleteCategoryRequest\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\"*\n" + "\x0eKeywordRequest\x12\x18\n" + - "\akeyword\x18\x01 \x01(\tR\akeyword2\xf7\x01\n" + - "\bCategory\x127\n" + - "\x05Fetch\x12\x14.blocks.IdentRequest\x1a\x16.cms.CategoryListReply\"\x00\x128\n" + - "\x06Create\x12\x17.blocks.CmsCategoryItem\x1a\x13.blocks.StatusReply\"\x00\x12;\n" + - "\x06Modify\x12\x1a.cms.ModifyCategoryRequest\x1a\x13.blocks.StatusReply\"\x00\x12;\n" + - "\x06Delete\x12\x1a.cms.DeleteCategoryRequest\x1a\x13.blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" + "\akeyword\x18\x01 \x01(\tR\akeyword2\xa4\x02\n" + + "\bCategory\x12@\n" + + "\x05Fetch\x12\x1d.base_cms_blocks.IdentRequest\x1a\x16.cms.CategoryListReply\"\x00\x12J\n" + + "\x06Create\x12 .base_cms_blocks.CmsCategoryItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12D\n" + + "\x06Modify\x12\x1a.cms.ModifyCategoryRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12D\n" + + "\x06Delete\x12\x1a.cms.DeleteCategoryRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" var ( file_module_base_cms_proto_category_proto_rawDescOnce sync.Once @@ -511,22 +511,22 @@ var file_module_base_cms_proto_category_proto_goTypes = []any{ (*ModifyCategoryRequest)(nil), // 3: cms.ModifyCategoryRequest (*DeleteCategoryRequest)(nil), // 4: cms.DeleteCategoryRequest (*KeywordRequest)(nil), // 5: cms.KeywordRequest - (*CmsCategoryItem)(nil), // 6: blocks.CmsCategoryItem - (*IdentRequest)(nil), // 7: blocks.IdentRequest - (*StatusReply)(nil), // 8: blocks.StatusReply + (*CmsCategoryItem)(nil), // 6: base_cms_blocks.CmsCategoryItem + (*IdentRequest)(nil), // 7: base_cms_blocks.IdentRequest + (*StatusReply)(nil), // 8: base_cms_blocks.StatusReply } var file_module_base_cms_proto_category_proto_depIdxs = []int32{ - 6, // 0: cms.CategoryListReply.data:type_name -> blocks.CmsCategoryItem - 6, // 1: cms.AddCategoryRequest.data:type_name -> blocks.CmsCategoryItem - 6, // 2: cms.ModifyCategoryRequest.data:type_name -> blocks.CmsCategoryItem - 7, // 3: cms.Category.Fetch:input_type -> blocks.IdentRequest - 6, // 4: cms.Category.Create:input_type -> blocks.CmsCategoryItem + 6, // 0: cms.CategoryListReply.data:type_name -> base_cms_blocks.CmsCategoryItem + 6, // 1: cms.AddCategoryRequest.data:type_name -> base_cms_blocks.CmsCategoryItem + 6, // 2: cms.ModifyCategoryRequest.data:type_name -> base_cms_blocks.CmsCategoryItem + 7, // 3: cms.Category.Fetch:input_type -> base_cms_blocks.IdentRequest + 6, // 4: cms.Category.Create:input_type -> base_cms_blocks.CmsCategoryItem 3, // 5: cms.Category.Modify:input_type -> cms.ModifyCategoryRequest 4, // 6: cms.Category.Delete:input_type -> cms.DeleteCategoryRequest 0, // 7: cms.Category.Fetch:output_type -> cms.CategoryListReply - 8, // 8: cms.Category.Create:output_type -> blocks.StatusReply - 8, // 9: cms.Category.Modify:output_type -> blocks.StatusReply - 8, // 10: cms.Category.Delete:output_type -> blocks.StatusReply + 8, // 8: cms.Category.Create:output_type -> base_cms_blocks.StatusReply + 8, // 9: cms.Category.Modify:output_type -> base_cms_blocks.StatusReply + 8, // 10: cms.Category.Delete:output_type -> base_cms_blocks.StatusReply 7, // [7:11] is the sub-list for method output_type 3, // [3:7] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/module/base/cms/pb/const.pb.go b/module/base/cms/pb/const.pb.go index 175a509..0af2226 100644 --- a/module/base/cms/pb/const.pb.go +++ b/module/base/cms/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_base_cms_proto_const_proto protoreflect.FileDescriptor const file_module_base_cms_proto_const_proto_rawDesc = "" + "\n" + - "!module/base/cms/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "!module/base/cms/proto/const.proto\x12\x0fbase_cms_blocks\"\a\n" + + "\x05Empty\"\xc4\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12A\n" + + "\x06params\x18\x03 \x03(\v2).base_cms_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xff\x02\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12E\n" + + "\x06params\x18\x03 \x03(\v2-.base_cms_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xb8\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12G\n" + + "\x06params\x18\x03 \x03(\v2/.base_cms_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe9\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x126\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2 .base_cms_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd5\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x127\n" + + "\adetails\x18! \x03(\v2\x1d.base_cms_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"X\n" + + "\x11FeedPostListReply\x121\n" + + "\x04list\x18\x01 \x03(\v2\x1d.base_cms_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe3\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x129\n" + + "\aattachs\x18\t \x03(\v2\x1f.base_cms_blocks.FeedAttachItemR\aattachs\x120\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1c.base_cms_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"Z\n" + + "\x12GroupPostListReply\x122\n" + + "\x04list\x18\x01 \x03(\v2\x1e.base_cms_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xf6\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12:\n" + + "\aattachs\x18\t \x03(\v2 .base_cms_blocks.GroupAttachItemR\aattachs\x121\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\x1d.base_cms_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_base_cms_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"a\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x121\n" + + "\x04data\x18\x02 \x03(\v2\x1d.base_cms_blocks.RelationItemR\x04dataB!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" var ( file_module_base_cms_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_base_cms_proto_const_proto_rawDescGZIP() []byte { var file_module_base_cms_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_base_cms_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: base_cms_blocks.Empty + (*FetchRequest)(nil), // 1: base_cms_blocks.FetchRequest + (*IdentRequest)(nil), // 2: base_cms_blocks.IdentRequest + (*VersionRequest)(nil), // 3: base_cms_blocks.VersionRequest + (*SearchRequest)(nil), // 4: base_cms_blocks.SearchRequest + (*StatusReply)(nil), // 5: base_cms_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: base_cms_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: base_cms_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: base_cms_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: base_cms_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: base_cms_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: base_cms_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: base_cms_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: base_cms_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: base_cms_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: base_cms_blocks.IDRequest + (*IDListRequest)(nil), // 16: base_cms_blocks.IDListRequest + (*StdIicuds)(nil), // 17: base_cms_blocks.StdIicuds + (*StdPassport)(nil), // 18: base_cms_blocks.StdPassport + (*CloudBase)(nil), // 19: base_cms_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: base_cms_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: base_cms_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: base_cms_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: base_cms_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: base_cms_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: base_cms_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: base_cms_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: base_cms_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: base_cms_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: base_cms_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: base_cms_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: base_cms_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: base_cms_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: base_cms_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: base_cms_blocks.GroupTagItem + (*RelationItem)(nil), // 35: base_cms_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: base_cms_blocks.FetchRelationItemReply + nil, // 37: base_cms_blocks.FetchRequest.ParamsEntry + nil, // 38: base_cms_blocks.MallFetchRequest.ParamsEntry + nil, // 39: base_cms_blocks.MarketFetchRequest.ParamsEntry } var file_module_base_cms_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: base_cms_blocks.FetchRequest.params:type_name -> base_cms_blocks.FetchRequest.ParamsEntry + 38, // 1: base_cms_blocks.MallFetchRequest.params:type_name -> base_cms_blocks.MallFetchRequest.ParamsEntry + 39, // 2: base_cms_blocks.MarketFetchRequest.params:type_name -> base_cms_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: base_cms_blocks.CmsCategoryItem.child:type_name -> base_cms_blocks.CmsCategoryItem + 26, // 4: base_cms_blocks.OrderSummaryItem.details:type_name -> base_cms_blocks.OrderDetails + 28, // 5: base_cms_blocks.FeedPostListReply.list:type_name -> base_cms_blocks.FeedPostItem + 29, // 6: base_cms_blocks.FeedPostItem.attachs:type_name -> base_cms_blocks.FeedAttachItem + 30, // 7: base_cms_blocks.FeedPostItem.tags:type_name -> base_cms_blocks.FeedTagItem + 32, // 8: base_cms_blocks.GroupPostListReply.list:type_name -> base_cms_blocks.GroupPostItem + 33, // 9: base_cms_blocks.GroupPostItem.attachs:type_name -> base_cms_blocks.GroupAttachItem + 34, // 10: base_cms_blocks.GroupPostItem.tags:type_name -> base_cms_blocks.GroupTagItem + 35, // 11: base_cms_blocks.FetchRelationItemReply.data:type_name -> base_cms_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/base/cms/pb/pages.pb.go b/module/base/cms/pb/pages.pb.go index aa836e4..1a2d77b 100644 --- a/module/base/cms/pb/pages.pb.go +++ b/module/base/cms/pb/pages.pb.go @@ -412,7 +412,7 @@ const file_module_base_cms_proto_pages_proto_rawDesc = "" + "\n" + "!module/base/cms/proto/pages.proto\x12\x03cms\x1a!module/base/cms/proto/const.proto\"(\n" + "\x14GetPagesByKeyRequest\x12\x10\n" + - "\x03key\x18\x01 \x01(\tR\x03key\"\xe4\x04\n" + + "\x03key\x18\x01 \x01(\tR\x03key\"\xf6\x04\n" + "\tPagesItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x1a\n" + "\bidentity\x18\x02 \x01(\tR\bidentity\x12\x1e\n" + @@ -433,9 +433,9 @@ const file_module_base_cms_proto_pages_proto_rawDesc = "" + "cover_path\x12\x18\n" + "\acontent\x18\v \x01(\tR\acontent\x12$\n" + "\rhas_accessory\x18\f \x01(\bR\rhas_accessory\x12:\n" + - "\x18accessory_identity_array\x18\r \x03(\tR\x18accessory_identity_array\x12@\n" + - "\x0eaccessory_data\x18\x0e \x03(\v2\x18.blocks.CmsAccessoryItemR\x0eaccessory_data\x121\n" + - "\ttags_data\x18\x0f \x03(\v2\x13.blocks.CmsTagsItemR\ttags_data\x120\n" + + "\x18accessory_identity_array\x18\r \x03(\tR\x18accessory_identity_array\x12I\n" + + "\x0eaccessory_data\x18\x0e \x03(\v2!.base_cms_blocks.CmsAccessoryItemR\x0eaccessory_data\x12:\n" + + "\ttags_data\x18\x0f \x03(\v2\x1c.base_cms_blocks.CmsTagsItemR\ttags_data\x120\n" + "\x13tags_identity_array\x18\x10 \x03(\tR\x13tags_identity_array\x12\x12\n" + "\x04hits\x18\x11 \x01(\x03R\x04hits\"h\n" + "\x10PagesListRequest\x12\x12\n" + @@ -447,14 +447,14 @@ const file_module_base_cms_proto_pages_proto_rawDesc = "" + "\x04data\x18\x01 \x03(\v2\x0e.cms.PagesItemR\x04data\x12\x14\n" + "\x05count\x18\x02 \x01(\x03R\x05count\"-\n" + "\x0fGetPagesRequest\x12\x1a\n" + - "\bidentity\x18\x01 \x01(\tR\bidentity2\xc9\x02\n" + + "\bidentity\x18\x01 \x01(\tR\bidentity2\xed\x02\n" + "\x05Pages\x125\n" + "\x05Fetch\x12\x15.cms.PagesListRequest\x1a\x13.cms.PagesListReply\"\x00\x127\n" + "\rGetByIdentity\x12\x14.cms.GetPagesRequest\x1a\x0e.cms.PagesItem\"\x00\x127\n" + - "\bGetByKey\x12\x19.cms.GetPagesByKeyRequest\x1a\x0e.cms.PagesItem\"\x00\x12/\n" + - "\x06Create\x12\x0e.cms.PagesItem\x1a\x13.blocks.StatusReply\"\x00\x12/\n" + - "\x06Modify\x12\x0e.cms.PagesItem\x1a\x13.blocks.StatusReply\"\x00\x125\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" + "\bGetByKey\x12\x19.cms.GetPagesByKeyRequest\x1a\x0e.cms.PagesItem\"\x00\x128\n" + + "\x06Create\x12\x0e.cms.PagesItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x128\n" + + "\x06Modify\x12\x0e.cms.PagesItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12G\n" + + "\x06Delete\x12\x1d.base_cms_blocks.IdentRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" var ( file_module_base_cms_proto_pages_proto_rawDescOnce sync.Once @@ -475,27 +475,27 @@ var file_module_base_cms_proto_pages_proto_goTypes = []any{ (*PagesListRequest)(nil), // 2: cms.PagesListRequest (*PagesListReply)(nil), // 3: cms.PagesListReply (*GetPagesRequest)(nil), // 4: cms.GetPagesRequest - (*CmsAccessoryItem)(nil), // 5: blocks.CmsAccessoryItem - (*CmsTagsItem)(nil), // 6: blocks.CmsTagsItem - (*IdentRequest)(nil), // 7: blocks.IdentRequest - (*StatusReply)(nil), // 8: blocks.StatusReply + (*CmsAccessoryItem)(nil), // 5: base_cms_blocks.CmsAccessoryItem + (*CmsTagsItem)(nil), // 6: base_cms_blocks.CmsTagsItem + (*IdentRequest)(nil), // 7: base_cms_blocks.IdentRequest + (*StatusReply)(nil), // 8: base_cms_blocks.StatusReply } var file_module_base_cms_proto_pages_proto_depIdxs = []int32{ - 5, // 0: cms.PagesItem.accessory_data:type_name -> blocks.CmsAccessoryItem - 6, // 1: cms.PagesItem.tags_data:type_name -> blocks.CmsTagsItem + 5, // 0: cms.PagesItem.accessory_data:type_name -> base_cms_blocks.CmsAccessoryItem + 6, // 1: cms.PagesItem.tags_data:type_name -> base_cms_blocks.CmsTagsItem 1, // 2: cms.PagesListReply.data:type_name -> cms.PagesItem 2, // 3: cms.Pages.Fetch:input_type -> cms.PagesListRequest 4, // 4: cms.Pages.GetByIdentity:input_type -> cms.GetPagesRequest 0, // 5: cms.Pages.GetByKey:input_type -> cms.GetPagesByKeyRequest 1, // 6: cms.Pages.Create:input_type -> cms.PagesItem 1, // 7: cms.Pages.Modify:input_type -> cms.PagesItem - 7, // 8: cms.Pages.Delete:input_type -> blocks.IdentRequest + 7, // 8: cms.Pages.Delete:input_type -> base_cms_blocks.IdentRequest 3, // 9: cms.Pages.Fetch:output_type -> cms.PagesListReply 1, // 10: cms.Pages.GetByIdentity:output_type -> cms.PagesItem 1, // 11: cms.Pages.GetByKey:output_type -> cms.PagesItem - 8, // 12: cms.Pages.Create:output_type -> blocks.StatusReply - 8, // 13: cms.Pages.Modify:output_type -> blocks.StatusReply - 8, // 14: cms.Pages.Delete:output_type -> blocks.StatusReply + 8, // 12: cms.Pages.Create:output_type -> base_cms_blocks.StatusReply + 8, // 13: cms.Pages.Modify:output_type -> base_cms_blocks.StatusReply + 8, // 14: cms.Pages.Delete:output_type -> base_cms_blocks.StatusReply 9, // [9:15] is the sub-list for method output_type 3, // [3:9] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/module/base/cms/pb/post.pb.go b/module/base/cms/pb/post.pb.go index 772d2e9..4afb985 100644 --- a/module/base/cms/pb/post.pb.go +++ b/module/base/cms/pb/post.pb.go @@ -1014,7 +1014,8 @@ const file_module_base_cms_proto_post_proto_rawDesc = "" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12$\n" + "\rpost_identity\x18\x02 \x01(\tR\rpost_identity\"'\n" + "\x13GetPostByKeyRequest\x12\x10\n" + - "\x03key\x18\x03 \x01(\tR\x03key\"\xf6\t\n" + + "\x03key\x18\x03 \x01(\tR\x03key\"\x91\n" + + "\n" + "\bPostItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x1a\n" + "\bidentity\x18\x02 \x01(\tR\bidentity\x12\x1a\n" + @@ -1051,10 +1052,10 @@ const file_module_base_cms_proto_post_proto_rawDesc = "" + "\fcomment_hits\x18\x16 \x01(\x03R\fcomment_hits\x12\x1c\n" + "\tpost_type\x18\x17 \x01(\x05R\tpost_type\x12\x16\n" + "\x06rights\x18\x18 \x01(\tR\x06rights\x12\x10\n" + - "\x03key\x18\x19 \x01(\tR\x03key\x12=\n" + - "\rcategory_data\x18\x1a \x03(\v2\x17.blocks.CmsCategoryItemR\rcategory_data\x121\n" + - "\ttags_data\x18\x1b \x03(\v2\x13.blocks.CmsTagsItemR\ttags_data\x12@\n" + - "\x0eaccessory_data\x18\x1c \x03(\v2\x18.blocks.CmsAccessoryItemR\x0eaccessory_data\x12\x12\n" + + "\x03key\x18\x19 \x01(\tR\x03key\x12F\n" + + "\rcategory_data\x18\x1a \x03(\v2 .base_cms_blocks.CmsCategoryItemR\rcategory_data\x12:\n" + + "\ttags_data\x18\x1b \x03(\v2\x1c.base_cms_blocks.CmsTagsItemR\ttags_data\x12I\n" + + "\x0eaccessory_data\x18\x1c \x03(\v2!.base_cms_blocks.CmsAccessoryItemR\x0eaccessory_data\x12\x12\n" + "\x04lang\x18\x1d \x01(\tR\x04lang\x12$\n" + "\rsource_origin\x18\x1e \x01(\tR\rsource_origin\x12\x1e\n" + "\n" + @@ -1114,28 +1115,29 @@ const file_module_base_cms_proto_post_proto_rawDesc = "" + "\vop_identity\x18\x02 \x01(\tR\vop_identity\"h\n" + "\x18CommentOpIdentityRequest\x12*\n" + "\x10comment_identity\x18\x01 \x01(\tR\x10comment_identity\x12 \n" + - "\vop_identity\x18\x02 \x01(\tR\vop_identity2\xaa\t\n" + + "\vop_identity\x18\x02 \x01(\tR\vop_identity2\xba\n" + + "\n" + "\x04Post\x123\n" + "\x05Fetch\x12\x14.cms.PostListRequest\x1a\x12.cms.PostListReply\"\x00\x125\n" + "\rGetByIdentity\x12\x13.cms.GetPostRequest\x1a\r.cms.PostItem\"\x00\x125\n" + - "\bGetByKey\x12\x18.cms.GetPostByKeyRequest\x1a\r.cms.PostItem\"\x00\x128\n" + - "\x06Search\x12\x18.blocks.CmsSearchRequest\x1a\x12.cms.PostListReply\"\x00\x12.\n" + - "\x06Create\x12\r.cms.PostItem\x1a\x13.blocks.StatusReply\"\x00\x12.\n" + - "\x06Modify\x12\r.cms.PostItem\x1a\x13.blocks.StatusReply\"\x00\x125\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\"\x00\x12A\n" + - "\fIncrPostLike\x12\x1a.cms.PostOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00\x12A\n" + - "\fDescPostLike\x12\x1a.cms.PostOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00\x12C\n" + - "\x0eIncrPostUnlike\x12\x1a.cms.PostOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00\x12C\n" + - "\x0eDescPostUnlike\x12\x1a.cms.PostOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00\x12B\n" + - "\vCommentList\x12\x17.cms.CommentListRequest\x1a\x18.cms.CommentListResponse\"\x00\x125\n" + + "\bGetByKey\x12\x18.cms.GetPostByKeyRequest\x1a\r.cms.PostItem\"\x00\x12A\n" + + "\x06Search\x12!.base_cms_blocks.CmsSearchRequest\x1a\x12.cms.PostListReply\"\x00\x127\n" + + "\x06Create\x12\r.cms.PostItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x127\n" + + "\x06Modify\x12\r.cms.PostItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12G\n" + + "\x06Delete\x12\x1d.base_cms_blocks.IdentRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12J\n" + + "\fIncrPostLike\x12\x1a.cms.PostOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12J\n" + + "\fDescPostLike\x12\x1a.cms.PostOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12L\n" + + "\x0eIncrPostUnlike\x12\x1a.cms.PostOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12L\n" + + "\x0eDescPostUnlike\x12\x1a.cms.PostOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12B\n" + + "\vCommentList\x12\x17.cms.CommentListRequest\x1a\x18.cms.CommentListResponse\"\x00\x12>\n" + "\n" + - "AddComment\x12\x10.cms.CommentItem\x1a\x13.blocks.StatusReply\"\x00\x128\n" + - "\rModifyComment\x12\x10.cms.CommentItem\x1a\x13.blocks.StatusReply\"\x00\x12A\n" + - "\rDeleteComment\x12\x19.cms.DeleteCommentRequest\x1a\x13.blocks.StatusReply\"\x00\x12G\n" + - "\x0fIncrCommentLike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00\x12G\n" + - "\x0fDescCommentLike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00\x12I\n" + - "\x11IncrCommentUnlike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00\x12I\n" + - "\x11DescCommentUnlike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x13.blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" + "AddComment\x12\x10.cms.CommentItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12A\n" + + "\rModifyComment\x12\x10.cms.CommentItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12J\n" + + "\rDeleteComment\x12\x19.cms.DeleteCommentRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12P\n" + + "\x0fIncrCommentLike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12P\n" + + "\x0fDescCommentLike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12R\n" + + "\x11IncrCommentUnlike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12R\n" + + "\x11DescCommentUnlike\x12\x1d.cms.CommentOpIdentityRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" var ( file_module_base_cms_proto_post_proto_rawDescOnce sync.Once @@ -1162,27 +1164,27 @@ var file_module_base_cms_proto_post_proto_goTypes = []any{ (*CommentListResponse)(nil), // 8: cms.CommentListResponse (*PostOpIdentityRequest)(nil), // 9: cms.PostOpIdentityRequest (*CommentOpIdentityRequest)(nil), // 10: cms.CommentOpIdentityRequest - (*CmsCategoryItem)(nil), // 11: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 12: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 13: blocks.CmsAccessoryItem - (*CmsSearchRequest)(nil), // 14: blocks.CmsSearchRequest - (*IdentRequest)(nil), // 15: blocks.IdentRequest - (*StatusReply)(nil), // 16: blocks.StatusReply + (*CmsCategoryItem)(nil), // 11: base_cms_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 12: base_cms_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 13: base_cms_blocks.CmsAccessoryItem + (*CmsSearchRequest)(nil), // 14: base_cms_blocks.CmsSearchRequest + (*IdentRequest)(nil), // 15: base_cms_blocks.IdentRequest + (*StatusReply)(nil), // 16: base_cms_blocks.StatusReply } var file_module_base_cms_proto_post_proto_depIdxs = []int32{ - 11, // 0: cms.PostItem.category_data:type_name -> blocks.CmsCategoryItem - 12, // 1: cms.PostItem.tags_data:type_name -> blocks.CmsTagsItem - 13, // 2: cms.PostItem.accessory_data:type_name -> blocks.CmsAccessoryItem + 11, // 0: cms.PostItem.category_data:type_name -> base_cms_blocks.CmsCategoryItem + 12, // 1: cms.PostItem.tags_data:type_name -> base_cms_blocks.CmsTagsItem + 13, // 2: cms.PostItem.accessory_data:type_name -> base_cms_blocks.CmsAccessoryItem 2, // 3: cms.PostListReply.data:type_name -> cms.PostItem 6, // 4: cms.CommentItem.list:type_name -> cms.CommentItem 6, // 5: cms.CommentListResponse.list:type_name -> cms.CommentItem 3, // 6: cms.Post.Fetch:input_type -> cms.PostListRequest 5, // 7: cms.Post.GetByIdentity:input_type -> cms.GetPostRequest 1, // 8: cms.Post.GetByKey:input_type -> cms.GetPostByKeyRequest - 14, // 9: cms.Post.Search:input_type -> blocks.CmsSearchRequest + 14, // 9: cms.Post.Search:input_type -> base_cms_blocks.CmsSearchRequest 2, // 10: cms.Post.Create:input_type -> cms.PostItem 2, // 11: cms.Post.Modify:input_type -> cms.PostItem - 15, // 12: cms.Post.Delete:input_type -> blocks.IdentRequest + 15, // 12: cms.Post.Delete:input_type -> base_cms_blocks.IdentRequest 9, // 13: cms.Post.IncrPostLike:input_type -> cms.PostOpIdentityRequest 9, // 14: cms.Post.DescPostLike:input_type -> cms.PostOpIdentityRequest 9, // 15: cms.Post.IncrPostUnlike:input_type -> cms.PostOpIdentityRequest @@ -1199,21 +1201,21 @@ var file_module_base_cms_proto_post_proto_depIdxs = []int32{ 2, // 26: cms.Post.GetByIdentity:output_type -> cms.PostItem 2, // 27: cms.Post.GetByKey:output_type -> cms.PostItem 4, // 28: cms.Post.Search:output_type -> cms.PostListReply - 16, // 29: cms.Post.Create:output_type -> blocks.StatusReply - 16, // 30: cms.Post.Modify:output_type -> blocks.StatusReply - 16, // 31: cms.Post.Delete:output_type -> blocks.StatusReply - 16, // 32: cms.Post.IncrPostLike:output_type -> blocks.StatusReply - 16, // 33: cms.Post.DescPostLike:output_type -> blocks.StatusReply - 16, // 34: cms.Post.IncrPostUnlike:output_type -> blocks.StatusReply - 16, // 35: cms.Post.DescPostUnlike:output_type -> blocks.StatusReply + 16, // 29: cms.Post.Create:output_type -> base_cms_blocks.StatusReply + 16, // 30: cms.Post.Modify:output_type -> base_cms_blocks.StatusReply + 16, // 31: cms.Post.Delete:output_type -> base_cms_blocks.StatusReply + 16, // 32: cms.Post.IncrPostLike:output_type -> base_cms_blocks.StatusReply + 16, // 33: cms.Post.DescPostLike:output_type -> base_cms_blocks.StatusReply + 16, // 34: cms.Post.IncrPostUnlike:output_type -> base_cms_blocks.StatusReply + 16, // 35: cms.Post.DescPostUnlike:output_type -> base_cms_blocks.StatusReply 8, // 36: cms.Post.CommentList:output_type -> cms.CommentListResponse - 16, // 37: cms.Post.AddComment:output_type -> blocks.StatusReply - 16, // 38: cms.Post.ModifyComment:output_type -> blocks.StatusReply - 16, // 39: cms.Post.DeleteComment:output_type -> blocks.StatusReply - 16, // 40: cms.Post.IncrCommentLike:output_type -> blocks.StatusReply - 16, // 41: cms.Post.DescCommentLike:output_type -> blocks.StatusReply - 16, // 42: cms.Post.IncrCommentUnlike:output_type -> blocks.StatusReply - 16, // 43: cms.Post.DescCommentUnlike:output_type -> blocks.StatusReply + 16, // 37: cms.Post.AddComment:output_type -> base_cms_blocks.StatusReply + 16, // 38: cms.Post.ModifyComment:output_type -> base_cms_blocks.StatusReply + 16, // 39: cms.Post.DeleteComment:output_type -> base_cms_blocks.StatusReply + 16, // 40: cms.Post.IncrCommentLike:output_type -> base_cms_blocks.StatusReply + 16, // 41: cms.Post.DescCommentLike:output_type -> base_cms_blocks.StatusReply + 16, // 42: cms.Post.IncrCommentUnlike:output_type -> base_cms_blocks.StatusReply + 16, // 43: cms.Post.DescCommentUnlike:output_type -> base_cms_blocks.StatusReply 25, // [25:44] is the sub-list for method output_type 6, // [6:25] is the sub-list for method input_type 6, // [6:6] is the sub-list for extension type_name diff --git a/module/base/cms/pb/site.pb.go b/module/base/cms/pb/site.pb.go index fed2a3e..4e14772 100644 --- a/module/base/cms/pb/site.pb.go +++ b/module/base/cms/pb/site.pb.go @@ -212,13 +212,13 @@ const file_module_base_cms_proto_site_proto_rawDesc = "" + "\x03seo\x18\b \x01(\tR\x03seo\x12\x14\n" + "\x05theme\x18\t \x01(\tR\x05theme\x12\x18\n" + "\aconfigs\x18\n" + - " \x01(\tR\aconfigs2\xf9\x01\n" + - "\x04Site\x12,\n" + - "\x05Fetch\x12\r.blocks.Empty\x1a\x12.cms.SiteListReply\"\x00\x12,\n" + - "\x03Get\x12\x14.blocks.IdentRequest\x1a\r.cms.SiteItem\"\x00\x12.\n" + - "\x06Create\x12\r.cms.SiteItem\x1a\x13.blocks.StatusReply\"\x00\x12.\n" + - "\x06Modify\x12\r.cms.SiteItem\x1a\x13.blocks.StatusReply\"\x00\x125\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" + " \x01(\tR\aconfigs2\xaf\x02\n" + + "\x04Site\x125\n" + + "\x05Fetch\x12\x16.base_cms_blocks.Empty\x1a\x12.cms.SiteListReply\"\x00\x125\n" + + "\x03Get\x12\x1d.base_cms_blocks.IdentRequest\x1a\r.cms.SiteItem\"\x00\x127\n" + + "\x06Create\x12\r.cms.SiteItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x127\n" + + "\x06Modify\x12\r.cms.SiteItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12G\n" + + "\x06Delete\x12\x1d.base_cms_blocks.IdentRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" var ( file_module_base_cms_proto_site_proto_rawDescOnce sync.Once @@ -236,22 +236,22 @@ var file_module_base_cms_proto_site_proto_msgTypes = make([]protoimpl.MessageInf var file_module_base_cms_proto_site_proto_goTypes = []any{ (*SiteListReply)(nil), // 0: cms.SiteListReply (*SiteItem)(nil), // 1: cms.SiteItem - (*Empty)(nil), // 2: blocks.Empty - (*IdentRequest)(nil), // 3: blocks.IdentRequest - (*StatusReply)(nil), // 4: blocks.StatusReply + (*Empty)(nil), // 2: base_cms_blocks.Empty + (*IdentRequest)(nil), // 3: base_cms_blocks.IdentRequest + (*StatusReply)(nil), // 4: base_cms_blocks.StatusReply } var file_module_base_cms_proto_site_proto_depIdxs = []int32{ 1, // 0: cms.SiteListReply.data:type_name -> cms.SiteItem - 2, // 1: cms.Site.Fetch:input_type -> blocks.Empty - 3, // 2: cms.Site.Get:input_type -> blocks.IdentRequest + 2, // 1: cms.Site.Fetch:input_type -> base_cms_blocks.Empty + 3, // 2: cms.Site.Get:input_type -> base_cms_blocks.IdentRequest 1, // 3: cms.Site.Create:input_type -> cms.SiteItem 1, // 4: cms.Site.Modify:input_type -> cms.SiteItem - 3, // 5: cms.Site.Delete:input_type -> blocks.IdentRequest + 3, // 5: cms.Site.Delete:input_type -> base_cms_blocks.IdentRequest 0, // 6: cms.Site.Fetch:output_type -> cms.SiteListReply 1, // 7: cms.Site.Get:output_type -> cms.SiteItem - 4, // 8: cms.Site.Create:output_type -> blocks.StatusReply - 4, // 9: cms.Site.Modify:output_type -> blocks.StatusReply - 4, // 10: cms.Site.Delete:output_type -> blocks.StatusReply + 4, // 8: cms.Site.Create:output_type -> base_cms_blocks.StatusReply + 4, // 9: cms.Site.Modify:output_type -> base_cms_blocks.StatusReply + 4, // 10: cms.Site.Delete:output_type -> base_cms_blocks.StatusReply 6, // [6:11] is the sub-list for method output_type 1, // [1:6] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/base/cms/pb/tags.pb.go b/module/base/cms/pb/tags.pb.go index 2bb4803..4ece5df 100644 --- a/module/base/cms/pb/tags.pb.go +++ b/module/base/cms/pb/tags.pb.go @@ -78,15 +78,15 @@ var File_module_base_cms_proto_tags_proto protoreflect.FileDescriptor const file_module_base_cms_proto_tags_proto_rawDesc = "" + "\n" + - " module/base/cms/proto/tags.proto\x12\x03cms\x1a!module/base/cms/proto/const.proto\"N\n" + - "\rTagsListReply\x12'\n" + - "\x04data\x18\x01 \x03(\v2\x13.blocks.CmsTagsItemR\x04data\x12\x14\n" + - "\x05count\x18\x02 \x01(\x03R\x05count2\xde\x01\n" + - "\x04Tags\x123\n" + - "\x05Fetch\x12\x14.blocks.IdentRequest\x1a\x12.cms.TagsListReply\"\x00\x124\n" + - "\x06Create\x12\x13.blocks.CmsTagsItem\x1a\x13.blocks.StatusReply\"\x00\x124\n" + - "\x06Modify\x12\x13.blocks.CmsTagsItem\x1a\x13.blocks.StatusReply\"\x00\x125\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" + " module/base/cms/proto/tags.proto\x12\x03cms\x1a!module/base/cms/proto/const.proto\"W\n" + + "\rTagsListReply\x120\n" + + "\x04data\x18\x01 \x03(\v2\x1c.base_cms_blocks.CmsTagsItemR\x04data\x12\x14\n" + + "\x05count\x18\x02 \x01(\x03R\x05count2\x9d\x02\n" + + "\x04Tags\x12<\n" + + "\x05Fetch\x12\x1d.base_cms_blocks.IdentRequest\x1a\x12.cms.TagsListReply\"\x00\x12F\n" + + "\x06Create\x12\x1c.base_cms_blocks.CmsTagsItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12F\n" + + "\x06Modify\x12\x1c.base_cms_blocks.CmsTagsItem\x1a\x1c.base_cms_blocks.StatusReply\"\x00\x12G\n" + + "\x06Delete\x12\x1d.base_cms_blocks.IdentRequest\x1a\x1c.base_cms_blocks.StatusReply\"\x00B!Z\x1fbsm/full/module/base/cms/pb;cmsb\x06proto3" var ( file_module_base_cms_proto_tags_proto_rawDescOnce sync.Once @@ -103,20 +103,20 @@ func file_module_base_cms_proto_tags_proto_rawDescGZIP() []byte { var file_module_base_cms_proto_tags_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_module_base_cms_proto_tags_proto_goTypes = []any{ (*TagsListReply)(nil), // 0: cms.TagsListReply - (*CmsTagsItem)(nil), // 1: blocks.CmsTagsItem - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*StatusReply)(nil), // 3: blocks.StatusReply + (*CmsTagsItem)(nil), // 1: base_cms_blocks.CmsTagsItem + (*IdentRequest)(nil), // 2: base_cms_blocks.IdentRequest + (*StatusReply)(nil), // 3: base_cms_blocks.StatusReply } var file_module_base_cms_proto_tags_proto_depIdxs = []int32{ - 1, // 0: cms.TagsListReply.data:type_name -> blocks.CmsTagsItem - 2, // 1: cms.Tags.Fetch:input_type -> blocks.IdentRequest - 1, // 2: cms.Tags.Create:input_type -> blocks.CmsTagsItem - 1, // 3: cms.Tags.Modify:input_type -> blocks.CmsTagsItem - 2, // 4: cms.Tags.Delete:input_type -> blocks.IdentRequest + 1, // 0: cms.TagsListReply.data:type_name -> base_cms_blocks.CmsTagsItem + 2, // 1: cms.Tags.Fetch:input_type -> base_cms_blocks.IdentRequest + 1, // 2: cms.Tags.Create:input_type -> base_cms_blocks.CmsTagsItem + 1, // 3: cms.Tags.Modify:input_type -> base_cms_blocks.CmsTagsItem + 2, // 4: cms.Tags.Delete:input_type -> base_cms_blocks.IdentRequest 0, // 5: cms.Tags.Fetch:output_type -> cms.TagsListReply - 3, // 6: cms.Tags.Create:output_type -> blocks.StatusReply - 3, // 7: cms.Tags.Modify:output_type -> blocks.StatusReply - 3, // 8: cms.Tags.Delete:output_type -> blocks.StatusReply + 3, // 6: cms.Tags.Create:output_type -> base_cms_blocks.StatusReply + 3, // 7: cms.Tags.Modify:output_type -> base_cms_blocks.StatusReply + 3, // 8: cms.Tags.Delete:output_type -> base_cms_blocks.StatusReply 5, // [5:9] is the sub-list for method output_type 1, // [1:5] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/base/cms/proto/category.proto b/module/base/cms/proto/category.proto index 982dcd9..6e27b71 100644 --- a/module/base/cms/proto/category.proto +++ b/module/base/cms/proto/category.proto @@ -6,22 +6,22 @@ import "module/base/cms/proto/const.proto"; // CMS - 分类 service Category { // 分类列表 - rpc Fetch (blocks.IdentRequest) returns (CategoryListReply) {}; + rpc Fetch (base_cms_blocks.IdentRequest) returns (CategoryListReply) {}; // 添加分类 - rpc Create (blocks.CmsCategoryItem) returns (blocks.StatusReply) {}; + rpc Create (base_cms_blocks.CmsCategoryItem) returns (base_cms_blocks.StatusReply) {}; // 修改分类 - rpc Modify (ModifyCategoryRequest) returns (blocks.StatusReply) {}; + rpc Modify (ModifyCategoryRequest) returns (base_cms_blocks.StatusReply) {}; // 删除分类 - rpc Delete (DeleteCategoryRequest) returns (blocks.StatusReply) {}; + rpc Delete (DeleteCategoryRequest) returns (base_cms_blocks.StatusReply) {}; } // 分类列表 message CategoryListReply { // 数据 - repeated blocks.CmsCategoryItem data = 1; + repeated base_cms_blocks.CmsCategoryItem data = 1; // 总数 int64 count = 2; } @@ -41,7 +41,7 @@ message AddCategoryRequest{ string intro = 6; // 简介 string created_at = 7 [json_name = "created_at"]; // 创建时间 string updated_at = 8 [json_name = "updated_at"]; // 更新时间 - repeated blocks.CmsCategoryItem data = 9; // 子集 + repeated base_cms_blocks.CmsCategoryItem data = 9; // 子集 } // 修改分类请求 @@ -54,7 +54,7 @@ message ModifyCategoryRequest{ string intro = 6; // 简介 string created_at = 7 [json_name = "created_at"]; // 创建时间 string updated_at = 8 [json_name = "updated_at"]; // 更新时间 - repeated blocks.CmsCategoryItem data = 9; // 子集 + repeated base_cms_blocks.CmsCategoryItem data = 9; // 子集 string category_key = 10[json_name = "category_key"]; // 分类标识 } @@ -68,4 +68,4 @@ message DeleteCategoryRequest{ message KeywordRequest{ string keyword = 1; // 关键字 -} \ No newline at end of file +} diff --git a/module/base/cms/proto/const.proto b/module/base/cms/proto/const.proto index 3299c92..bf3a75c 100644 --- a/module/base/cms/proto/const.proto +++ b/module/base/cms/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package base_cms_blocks; option go_package = "bsm/full/module/base/cms/pb;cms"; diff --git a/module/base/cms/proto/pages.proto b/module/base/cms/proto/pages.proto index 09bf460..e712993 100644 --- a/module/base/cms/proto/pages.proto +++ b/module/base/cms/proto/pages.proto @@ -15,13 +15,13 @@ service Pages{ rpc GetByKey (GetPagesByKeyRequest) returns (PagesItem) {}; //发布单页 - rpc Create(PagesItem) returns (blocks.StatusReply) {}; + rpc Create(PagesItem) returns (base_cms_blocks.StatusReply) {}; //修改单页 - rpc Modify(PagesItem) returns (blocks.StatusReply) {}; + rpc Modify(PagesItem) returns (base_cms_blocks.StatusReply) {}; //删除单页 - rpc Delete(blocks.IdentRequest) returns (blocks.StatusReply) {}; + rpc Delete(base_cms_blocks.IdentRequest) returns (base_cms_blocks.StatusReply) {}; } // 根据KEY获取内容请求 @@ -45,8 +45,8 @@ message PagesItem{ bool has_accessory = 12 [json_name = "has_accessory"]; //是否有附件,默认没有 repeated string accessory_identity_array = 13 [json_name = "accessory_identity_array"]; //附件Identity 列表 - repeated blocks.CmsAccessoryItem accessory_data = 14 [json_name = "accessory_data"]; //附件数据 - repeated blocks.CmsTagsItem tags_data = 15 [json_name = "tags_data"]; // 标签数据 + repeated base_cms_blocks.CmsAccessoryItem accessory_data = 14 [json_name = "accessory_data"]; //附件数据 + repeated base_cms_blocks.CmsTagsItem tags_data = 15 [json_name = "tags_data"]; // 标签数据 repeated string tags_identity_array = 16 [json_name = "tags_identity_array"]; // 标签集Identity 列表 int64 hits = 17; //点击量 } diff --git a/module/base/cms/proto/post.proto b/module/base/cms/proto/post.proto index 73cef68..02d601d 100644 --- a/module/base/cms/proto/post.proto +++ b/module/base/cms/proto/post.proto @@ -15,52 +15,52 @@ service Post{ rpc GetByKey (GetPostByKeyRequest) returns (PostItem) {}; //搜索文章 - rpc Search (blocks.CmsSearchRequest) returns (PostListReply) {}; + rpc Search (base_cms_blocks.CmsSearchRequest) returns (PostListReply) {}; //发布文章 - rpc Create(PostItem) returns (blocks.StatusReply) {}; + rpc Create(PostItem) returns (base_cms_blocks.StatusReply) {}; //修改文章 - rpc Modify(PostItem) returns (blocks.StatusReply) {}; + rpc Modify(PostItem) returns (base_cms_blocks.StatusReply) {}; //删除文章 - rpc Delete(blocks.IdentRequest) returns (blocks.StatusReply) {}; + rpc Delete(base_cms_blocks.IdentRequest) returns (base_cms_blocks.StatusReply) {}; // 文章点赞处理 - rpc IncrPostLike(PostOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc IncrPostLike(PostOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; // 文章点赞取消处理 - rpc DescPostLike(PostOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc DescPostLike(PostOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; // 文章点踩处理 - rpc IncrPostUnlike(PostOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc IncrPostUnlike(PostOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; // 文章点踩取消处理 - rpc DescPostUnlike(PostOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc DescPostUnlike(PostOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; //评论列表 rpc CommentList(CommentListRequest) returns (CommentListResponse) {}; //发布评论 - rpc AddComment(CommentItem) returns (blocks.StatusReply) {}; + rpc AddComment(CommentItem) returns (base_cms_blocks.StatusReply) {}; //修改评论 - rpc ModifyComment(CommentItem) returns (blocks.StatusReply) {}; + rpc ModifyComment(CommentItem) returns (base_cms_blocks.StatusReply) {}; //删除评论 - rpc DeleteComment(DeleteCommentRequest) returns (blocks.StatusReply) {}; + rpc DeleteComment(DeleteCommentRequest) returns (base_cms_blocks.StatusReply) {}; // 评论点赞处理 - rpc IncrCommentLike(CommentOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc IncrCommentLike(CommentOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; // 评论点赞取消处理 - rpc DescCommentLike(CommentOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc DescCommentLike(CommentOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; // 评论点踩处理 - rpc IncrCommentUnlike(CommentOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc IncrCommentUnlike(CommentOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; // 评论点踩取消处理 - rpc DescCommentUnlike(CommentOpIdentityRequest) returns (blocks.StatusReply) {}; + rpc DescCommentUnlike(CommentOpIdentityRequest) returns (base_cms_blocks.StatusReply) {}; } // 删除评论 @@ -103,9 +103,9 @@ message PostItem{ string key = 25; // content key - repeated blocks.CmsCategoryItem category_data = 26 [json_name = "category_data"]; // 分类数据 - repeated blocks.CmsTagsItem tags_data = 27 [json_name = "tags_data"]; // 标签数据 - repeated blocks.CmsAccessoryItem accessory_data = 28 [json_name = "accessory_data"]; //附件数据 + repeated base_cms_blocks.CmsCategoryItem category_data = 26 [json_name = "category_data"]; // 分类数据 + repeated base_cms_blocks.CmsTagsItem tags_data = 27 [json_name = "tags_data"]; // 标签数据 + repeated base_cms_blocks.CmsAccessoryItem accessory_data = 28 [json_name = "accessory_data"]; //附件数据 string lang = 29 [json_name = "lang"]; // 语言 string source_origin = 30 [json_name = "source_origin"]; // 来源方简称 @@ -184,4 +184,4 @@ message PostOpIdentityRequest{ message CommentOpIdentityRequest{ string comment_identity = 1 [json_name = "comment_identity"]; //必填 评论唯一标识 string op_identity = 2 [json_name = "op_identity"]; //必填 操作者唯一标识 -} \ No newline at end of file +} diff --git a/module/base/cms/proto/site.proto b/module/base/cms/proto/site.proto index 4f903da..1c1cb15 100644 --- a/module/base/cms/proto/site.proto +++ b/module/base/cms/proto/site.proto @@ -6,19 +6,19 @@ import "module/base/cms/proto/const.proto"; // CMS - 站点 service Site { // 站点列表 - rpc Fetch (blocks.Empty) returns (SiteListReply) {}; + rpc Fetch (base_cms_blocks.Empty) returns (SiteListReply) {}; // 站点详情 - rpc Get (blocks.IdentRequest) returns (SiteItem) {}; + rpc Get (base_cms_blocks.IdentRequest) returns (SiteItem) {}; // 添加站点 - rpc Create (SiteItem) returns (blocks.StatusReply) {}; + rpc Create (SiteItem) returns (base_cms_blocks.StatusReply) {}; // 修改站点 - rpc Modify (SiteItem) returns (blocks.StatusReply) {}; + rpc Modify (SiteItem) returns (base_cms_blocks.StatusReply) {}; // 删除站点 - rpc Delete (blocks.IdentRequest) returns (blocks.StatusReply) {}; + rpc Delete (base_cms_blocks.IdentRequest) returns (base_cms_blocks.StatusReply) {}; } // 站点列表 @@ -41,4 +41,4 @@ message SiteItem{ string seo = 8; // SEO string theme = 9; // 站点主题 string configs = 10; // 站点配置 -} \ No newline at end of file +} diff --git a/module/base/cms/proto/tags.proto b/module/base/cms/proto/tags.proto index 7b16742..b10aea5 100644 --- a/module/base/cms/proto/tags.proto +++ b/module/base/cms/proto/tags.proto @@ -6,20 +6,20 @@ import "module/base/cms/proto/const.proto"; // 标签 service Tags { //标签列表 - rpc Fetch (blocks.IdentRequest) returns (TagsListReply) {}; + rpc Fetch (base_cms_blocks.IdentRequest) returns (TagsListReply) {}; //创建标签 - rpc Create(blocks.CmsTagsItem) returns (blocks.StatusReply) {}; + rpc Create(base_cms_blocks.CmsTagsItem) returns (base_cms_blocks.StatusReply) {}; //修改标签 - rpc Modify(blocks.CmsTagsItem) returns (blocks.StatusReply) {}; + rpc Modify(base_cms_blocks.CmsTagsItem) returns (base_cms_blocks.StatusReply) {}; //删除标签 - rpc Delete(blocks.IdentRequest) returns (blocks.StatusReply) {}; + rpc Delete(base_cms_blocks.IdentRequest) returns (base_cms_blocks.StatusReply) {}; } // 标签列表 message TagsListReply { - repeated blocks.CmsTagsItem data = 1; // 数据 + repeated base_cms_blocks.CmsTagsItem data = 1; // 数据 int64 count = 2; // 总数 -} \ No newline at end of file +} diff --git a/module/base/cms/service/expose.go b/module/base/cms/service/expose.go new file mode 100644 index 0000000..62df517 --- /dev/null +++ b/module/base/cms/service/expose.go @@ -0,0 +1,37 @@ +package service + +import ( + "context" + + "bsm/full/module/base/cms/internal/server" + pb "bsm/full/module/base/cms/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterCategoryHandlerServer(ctx, options.Gateway, server.NewCategoryServer()); err != nil { + return err + } + if err := pb.RegisterPagesHandlerServer(ctx, options.Gateway, server.NewPagesServer()); err != nil { + return err + } + if err := pb.RegisterPostHandlerServer(ctx, options.Gateway, server.NewPostServer()); err != nil { + return err + } + if err := pb.RegisterSiteHandlerServer(ctx, options.Gateway, server.NewSiteServer()); err != nil { + return err + } + if err := pb.RegisterTagsHandlerServer(ctx, options.Gateway, server.NewTagsServer()); err != nil { + return err + } + return nil +} diff --git a/module/base/feedback/cmd/main/main.go b/module/base/feedback/cmd/main/main.go index 28b16dc..412c19d 100644 --- a/module/base/feedback/cmd/main/main.go +++ b/module/base/feedback/cmd/main/main.go @@ -3,7 +3,7 @@ * @Date: 2021-11-26 15:25:03 * @Description: 反馈服务主程序入口 */ -package service +package main import ( "bsm/full/module/base/feedback/internal/config" @@ -25,7 +25,7 @@ func Run() { impl.NewImpl() // 初始化服务 - s := server.New(config.Spec.Addr) + s := server.New(nil) srv := service.New( s.Grpc, &service.Options{ diff --git a/module/base/feedback/internal/server/new.go b/module/base/feedback/internal/server/new.go index 068f916..4e2ee96 100644 --- a/module/base/feedback/internal/server/new.go +++ b/module/base/feedback/internal/server/new.go @@ -17,17 +17,24 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } // register service to grpc.Server pb.RegisterMethodServer(srv.Grpc, NewMethodServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/base/feedback/pb/const.pb.go b/module/base/feedback/pb/const.pb.go index 1f4014c..af72eea 100644 --- a/module/base/feedback/pb/const.pb.go +++ b/module/base/feedback/pb/const.pb.go @@ -2855,12 +2855,12 @@ var File_module_base_feedback_proto_const_proto protoreflect.FileDescriptor const file_module_base_feedback_proto_const_proto_rawDesc = "" + "\n" + - "&module/base/feedback/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "&module/base/feedback/proto/const.proto\x12\x14base_feedback_blocks\"\a\n" + + "\x05Empty\"\xc9\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12F\n" + + "\x06params\x18\x03 \x03(\v2..base_feedback_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"*\n" + @@ -2871,11 +2871,11 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x84\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12J\n" + + "\x06params\x18\x03 \x03(\v22.base_feedback_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -2885,11 +2885,11 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xbd\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12L\n" + + "\x06params\x18\x03 \x03(\v24.base_feedback_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -2944,7 +2944,7 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xee\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -2960,9 +2960,9 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x12;\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2%.base_feedback_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3001,7 +3001,7 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xda\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3037,8 +3037,8 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x12<\n" + + "\adetails\x18! \x03(\v2\".base_feedback_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3068,10 +3068,10 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"]\n" + + "\x11FeedPostListReply\x126\n" + + "\x04list\x18\x01 \x03(\v2\".base_feedback_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xed\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3082,10 +3082,10 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12>\n" + + "\aattachs\x18\t \x03(\v2$.base_feedback_blocks.FeedAttachItemR\aattachs\x125\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2!.base_feedback_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3093,10 +3093,10 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"_\n" + + "\x12GroupPostListReply\x127\n" + + "\x04list\x18\x01 \x03(\v2#.base_feedback_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\x80\x03\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3108,10 +3108,10 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12?\n" + + "\aattachs\x18\t \x03(\v2%.base_feedback_blocks.GroupAttachItemR\aattachs\x126\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\".base_feedback_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3135,10 +3135,10 @@ const file_module_base_feedback_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"f\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB+Z)bsm/full/module/base/feedback/pb;feedbackb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x126\n" + + "\x04data\x18\x02 \x03(\v2\".base_feedback_blocks.RelationItemR\x04dataB+Z)bsm/full/module/base/feedback/pb;feedbackb\x06proto3" var ( file_module_base_feedback_proto_const_proto_rawDescOnce sync.Once @@ -3154,58 +3154,58 @@ func file_module_base_feedback_proto_const_proto_rawDescGZIP() []byte { var file_module_base_feedback_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 38) var file_module_base_feedback_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*VersionRequest)(nil), // 2: blocks.VersionRequest - (*SearchRequest)(nil), // 3: blocks.SearchRequest - (*CmsSearchRequest)(nil), // 4: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 5: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 6: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 7: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 8: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 9: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 10: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 11: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 12: blocks.StoreSerialRequest - (*IDRequest)(nil), // 13: blocks.IDRequest - (*IDListRequest)(nil), // 14: blocks.IDListRequest - (*StdIicuds)(nil), // 15: blocks.StdIicuds - (*StdPassport)(nil), // 16: blocks.StdPassport - (*CloudBase)(nil), // 17: blocks.CloudBase - (*CmsCategoryItem)(nil), // 18: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 19: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 20: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 21: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 22: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 23: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 24: blocks.OrderDetails - (*FeedPostListReply)(nil), // 25: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 26: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 27: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 28: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 29: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 30: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 31: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 32: blocks.GroupTagItem - (*RelationItem)(nil), // 33: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 34: blocks.FetchRelationItemReply - nil, // 35: blocks.FetchRequest.ParamsEntry - nil, // 36: blocks.MallFetchRequest.ParamsEntry - nil, // 37: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: base_feedback_blocks.Empty + (*FetchRequest)(nil), // 1: base_feedback_blocks.FetchRequest + (*VersionRequest)(nil), // 2: base_feedback_blocks.VersionRequest + (*SearchRequest)(nil), // 3: base_feedback_blocks.SearchRequest + (*CmsSearchRequest)(nil), // 4: base_feedback_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 5: base_feedback_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 6: base_feedback_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 7: base_feedback_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 8: base_feedback_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 9: base_feedback_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 10: base_feedback_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 11: base_feedback_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 12: base_feedback_blocks.StoreSerialRequest + (*IDRequest)(nil), // 13: base_feedback_blocks.IDRequest + (*IDListRequest)(nil), // 14: base_feedback_blocks.IDListRequest + (*StdIicuds)(nil), // 15: base_feedback_blocks.StdIicuds + (*StdPassport)(nil), // 16: base_feedback_blocks.StdPassport + (*CloudBase)(nil), // 17: base_feedback_blocks.CloudBase + (*CmsCategoryItem)(nil), // 18: base_feedback_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 19: base_feedback_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 20: base_feedback_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 21: base_feedback_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 22: base_feedback_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 23: base_feedback_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 24: base_feedback_blocks.OrderDetails + (*FeedPostListReply)(nil), // 25: base_feedback_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 26: base_feedback_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 27: base_feedback_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 28: base_feedback_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 29: base_feedback_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 30: base_feedback_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 31: base_feedback_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 32: base_feedback_blocks.GroupTagItem + (*RelationItem)(nil), // 33: base_feedback_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 34: base_feedback_blocks.FetchRelationItemReply + nil, // 35: base_feedback_blocks.FetchRequest.ParamsEntry + nil, // 36: base_feedback_blocks.MallFetchRequest.ParamsEntry + nil, // 37: base_feedback_blocks.MarketFetchRequest.ParamsEntry } var file_module_base_feedback_proto_const_proto_depIdxs = []int32{ - 35, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 36, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 37, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 18, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 24, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 26, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 27, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 28, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 30, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 31, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 32, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 33, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 35, // 0: base_feedback_blocks.FetchRequest.params:type_name -> base_feedback_blocks.FetchRequest.ParamsEntry + 36, // 1: base_feedback_blocks.MallFetchRequest.params:type_name -> base_feedback_blocks.MallFetchRequest.ParamsEntry + 37, // 2: base_feedback_blocks.MarketFetchRequest.params:type_name -> base_feedback_blocks.MarketFetchRequest.ParamsEntry + 18, // 3: base_feedback_blocks.CmsCategoryItem.child:type_name -> base_feedback_blocks.CmsCategoryItem + 24, // 4: base_feedback_blocks.OrderSummaryItem.details:type_name -> base_feedback_blocks.OrderDetails + 26, // 5: base_feedback_blocks.FeedPostListReply.list:type_name -> base_feedback_blocks.FeedPostItem + 27, // 6: base_feedback_blocks.FeedPostItem.attachs:type_name -> base_feedback_blocks.FeedAttachItem + 28, // 7: base_feedback_blocks.FeedPostItem.tags:type_name -> base_feedback_blocks.FeedTagItem + 30, // 8: base_feedback_blocks.GroupPostListReply.list:type_name -> base_feedback_blocks.GroupPostItem + 31, // 9: base_feedback_blocks.GroupPostItem.attachs:type_name -> base_feedback_blocks.GroupAttachItem + 32, // 10: base_feedback_blocks.GroupPostItem.tags:type_name -> base_feedback_blocks.GroupTagItem + 33, // 11: base_feedback_blocks.FetchRelationItemReply.data:type_name -> base_feedback_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/base/feedback/proto/const.proto b/module/base/feedback/proto/const.proto index e248d3b..b1d9266 100644 --- a/module/base/feedback/proto/const.proto +++ b/module/base/feedback/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package base_feedback_blocks; option go_package = "bsm/full/module/base/feedback/pb;feedback"; diff --git a/module/base/feedback/service/expose.go b/module/base/feedback/service/expose.go new file mode 100644 index 0000000..d13b09a --- /dev/null +++ b/module/base/feedback/service/expose.go @@ -0,0 +1,25 @@ +package service + +import ( + "context" + + "bsm/full/module/base/feedback/internal/server" + pb "bsm/full/module/base/feedback/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterMethodHandlerServer(ctx, options.Gateway, server.NewMethodServer()); err != nil { + return err + } + return nil +} diff --git a/module/base/fts/cmd/main/main.go b/module/base/fts/cmd/main/main.go index c362b21..9926e05 100644 --- a/module/base/fts/cmd/main/main.go +++ b/module/base/fts/cmd/main/main.go @@ -1,4 +1,4 @@ -package service +package main import ( "fmt" diff --git a/module/base/fts/service/expose.go b/module/base/fts/service/expose.go new file mode 100644 index 0000000..b68baa5 --- /dev/null +++ b/module/base/fts/service/expose.go @@ -0,0 +1,11 @@ +package service + +import ( + "bsm/full/module/base/fts/internal/routers" + "github.com/gin-gonic/gin" +) + +func Expose(engine *gin.Engine) error { + routers.Register("fts", engine) + return nil +} diff --git a/module/base/initial/cmd/main/main.go b/module/base/initial/cmd/main/main.go index 83e2710..bdc9eec 100644 --- a/module/base/initial/cmd/main/main.go +++ b/module/base/initial/cmd/main/main.go @@ -2,7 +2,7 @@ * @Author: david.yan(david.yan@qq.com) * @Date: 2021-11-26 15:25:03 */ -package service +package main import ( "bsm/full/module/base/initial/internal/config" @@ -22,7 +22,7 @@ func Run() { impl.NewImpl() // 创建 gRPC 服务器，监听指定地址 - s := server.New(config.Spec.Addr) + s := server.New(nil) // 创建微服务实例，配置服务参数 srv := service.New( s.Grpc, diff --git a/module/base/initial/internal/server/new.go b/module/base/initial/internal/server/new.go index a2bb024..f08fd9e 100644 --- a/module/base/initial/internal/server/new.go +++ b/module/base/initial/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -28,7 +33,9 @@ func New(addr string) *Server { pb.RegisterCheckServer(srv.Grpc, NewCheckServer()) pb.RegisterDataServer(srv.Grpc, NewDataServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/base/initial/pb/const.pb.go b/module/base/initial/pb/const.pb.go index 2cab72a..4374c19 100644 --- a/module/base/initial/pb/const.pb.go +++ b/module/base/initial/pb/const.pb.go @@ -2810,7 +2810,7 @@ var File_module_base_initial_proto_const_proto protoreflect.FileDescriptor const file_module_base_initial_proto_const_proto_rawDesc = "" + "\n" + - "%module/base/initial/proto/const.proto\x12\x06blocks\":\n" + + "%module/base/initial/proto/const.proto\x12\x13base_initial_blocks\":\n" + "\fIdentRequest\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\bidentity\x18\x02 \x01(\tR\bidentity\"*\n" + @@ -2821,11 +2821,11 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x83\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12I\n" + + "\x06params\x18\x03 \x03(\v21.base_initial_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -2835,11 +2835,11 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xbc\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12K\n" + + "\x06params\x18\x03 \x03(\v23.base_initial_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -2894,7 +2894,7 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xed\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -2910,9 +2910,9 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x12:\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2$.base_initial_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -2951,7 +2951,7 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd9\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -2987,8 +2987,8 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x12;\n" + + "\adetails\x18! \x03(\v2!.base_initial_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3018,10 +3018,10 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"\\\n" + + "\x11FeedPostListReply\x125\n" + + "\x04list\x18\x01 \x03(\v2!.base_initial_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xeb\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3032,10 +3032,10 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12=\n" + + "\aattachs\x18\t \x03(\v2#.base_initial_blocks.FeedAttachItemR\aattachs\x124\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2 .base_initial_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3043,10 +3043,10 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"^\n" + + "\x12GroupPostListReply\x126\n" + + "\x04list\x18\x01 \x03(\v2\".base_initial_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xfe\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3058,10 +3058,10 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12>\n" + + "\aattachs\x18\t \x03(\v2$.base_initial_blocks.GroupAttachItemR\aattachs\x125\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2!.base_initial_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3085,10 +3085,10 @@ const file_module_base_initial_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"e\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB)Z'bsm/full/module/base/initial/pb;initialb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x125\n" + + "\x04data\x18\x02 \x03(\v2!.base_initial_blocks.RelationItemR\x04dataB)Z'bsm/full/module/base/initial/pb;initialb\x06proto3" var ( file_module_base_initial_proto_const_proto_rawDescOnce sync.Once @@ -3104,55 +3104,55 @@ func file_module_base_initial_proto_const_proto_rawDescGZIP() []byte { var file_module_base_initial_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 36) var file_module_base_initial_proto_const_proto_goTypes = []any{ - (*IdentRequest)(nil), // 0: blocks.IdentRequest - (*VersionRequest)(nil), // 1: blocks.VersionRequest - (*SearchRequest)(nil), // 2: blocks.SearchRequest - (*CmsSearchRequest)(nil), // 3: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 4: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 5: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 6: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 7: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 8: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 9: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 10: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 11: blocks.StoreSerialRequest - (*IDRequest)(nil), // 12: blocks.IDRequest - (*IDListRequest)(nil), // 13: blocks.IDListRequest - (*StdIicuds)(nil), // 14: blocks.StdIicuds - (*StdPassport)(nil), // 15: blocks.StdPassport - (*CloudBase)(nil), // 16: blocks.CloudBase - (*CmsCategoryItem)(nil), // 17: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 18: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 19: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 20: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 21: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 22: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 23: blocks.OrderDetails - (*FeedPostListReply)(nil), // 24: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 25: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 26: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 27: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 28: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 29: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 30: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 31: blocks.GroupTagItem - (*RelationItem)(nil), // 32: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 33: blocks.FetchRelationItemReply - nil, // 34: blocks.MallFetchRequest.ParamsEntry - nil, // 35: blocks.MarketFetchRequest.ParamsEntry + (*IdentRequest)(nil), // 0: base_initial_blocks.IdentRequest + (*VersionRequest)(nil), // 1: base_initial_blocks.VersionRequest + (*SearchRequest)(nil), // 2: base_initial_blocks.SearchRequest + (*CmsSearchRequest)(nil), // 3: base_initial_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 4: base_initial_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 5: base_initial_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 6: base_initial_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 7: base_initial_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 8: base_initial_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 9: base_initial_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 10: base_initial_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 11: base_initial_blocks.StoreSerialRequest + (*IDRequest)(nil), // 12: base_initial_blocks.IDRequest + (*IDListRequest)(nil), // 13: base_initial_blocks.IDListRequest + (*StdIicuds)(nil), // 14: base_initial_blocks.StdIicuds + (*StdPassport)(nil), // 15: base_initial_blocks.StdPassport + (*CloudBase)(nil), // 16: base_initial_blocks.CloudBase + (*CmsCategoryItem)(nil), // 17: base_initial_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 18: base_initial_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 19: base_initial_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 20: base_initial_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 21: base_initial_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 22: base_initial_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 23: base_initial_blocks.OrderDetails + (*FeedPostListReply)(nil), // 24: base_initial_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 25: base_initial_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 26: base_initial_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 27: base_initial_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 28: base_initial_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 29: base_initial_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 30: base_initial_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 31: base_initial_blocks.GroupTagItem + (*RelationItem)(nil), // 32: base_initial_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 33: base_initial_blocks.FetchRelationItemReply + nil, // 34: base_initial_blocks.MallFetchRequest.ParamsEntry + nil, // 35: base_initial_blocks.MarketFetchRequest.ParamsEntry } var file_module_base_initial_proto_const_proto_depIdxs = []int32{ - 34, // 0: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 35, // 1: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 17, // 2: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 23, // 3: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 25, // 4: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 26, // 5: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 27, // 6: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 29, // 7: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 30, // 8: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 31, // 9: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 32, // 10: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 34, // 0: base_initial_blocks.MallFetchRequest.params:type_name -> base_initial_blocks.MallFetchRequest.ParamsEntry + 35, // 1: base_initial_blocks.MarketFetchRequest.params:type_name -> base_initial_blocks.MarketFetchRequest.ParamsEntry + 17, // 2: base_initial_blocks.CmsCategoryItem.child:type_name -> base_initial_blocks.CmsCategoryItem + 23, // 3: base_initial_blocks.OrderSummaryItem.details:type_name -> base_initial_blocks.OrderDetails + 25, // 4: base_initial_blocks.FeedPostListReply.list:type_name -> base_initial_blocks.FeedPostItem + 26, // 5: base_initial_blocks.FeedPostItem.attachs:type_name -> base_initial_blocks.FeedAttachItem + 27, // 6: base_initial_blocks.FeedPostItem.tags:type_name -> base_initial_blocks.FeedTagItem + 29, // 7: base_initial_blocks.GroupPostListReply.list:type_name -> base_initial_blocks.GroupPostItem + 30, // 8: base_initial_blocks.GroupPostItem.attachs:type_name -> base_initial_blocks.GroupAttachItem + 31, // 9: base_initial_blocks.GroupPostItem.tags:type_name -> base_initial_blocks.GroupTagItem + 32, // 10: base_initial_blocks.FetchRelationItemReply.data:type_name -> base_initial_blocks.RelationItem 11, // [11:11] is the sub-list for method output_type 11, // [11:11] is the sub-list for method input_type 11, // [11:11] is the sub-list for extension type_name diff --git a/module/base/initial/proto/const.proto b/module/base/initial/proto/const.proto index 4b17853..0f30c19 100644 --- a/module/base/initial/proto/const.proto +++ b/module/base/initial/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package base_initial_blocks; option go_package = "bsm/full/module/base/initial/pb;initial"; diff --git a/module/base/initial/service/expose.go b/module/base/initial/service/expose.go new file mode 100644 index 0000000..07e63c6 --- /dev/null +++ b/module/base/initial/service/expose.go @@ -0,0 +1,28 @@ +package service + +import ( + "context" + + "bsm/full/module/base/initial/internal/server" + pb "bsm/full/module/base/initial/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterCheckHandlerServer(ctx, options.Gateway, server.NewCheckServer()); err != nil { + return err + } + if err := pb.RegisterDataHandlerServer(ctx, options.Gateway, server.NewDataServer()); err != nil { + return err + } + return nil +} diff --git a/module/base/logs/cmd/main/main.go b/module/base/logs/cmd/main/main.go index 4cf6ebf..7a7eb41 100644 --- a/module/base/logs/cmd/main/main.go +++ b/module/base/logs/cmd/main/main.go @@ -1,4 +1,4 @@ -package service +package main import ( "fmt" diff --git a/module/base/logs/service/expose.go b/module/base/logs/service/expose.go new file mode 100644 index 0000000..560d989 --- /dev/null +++ b/module/base/logs/service/expose.go @@ -0,0 +1,11 @@ +package service + +import ( + "bsm/full/module/base/logs/internal/routers" + "github.com/gin-gonic/gin" +) + +func Expose(engine *gin.Engine) error { + routers.Register("logs", engine) + return nil +} diff --git a/module/base/mgt/cmd/main/main.go b/module/base/mgt/cmd/main/main.go index e34d064..7a0b516 100644 --- a/module/base/mgt/cmd/main/main.go +++ b/module/base/mgt/cmd/main/main.go @@ -1,4 +1,4 @@ -package service +package main import ( "context" diff --git a/module/base/mgt/service/expose.go b/module/base/mgt/service/expose.go new file mode 100644 index 0000000..3bf970f --- /dev/null +++ b/module/base/mgt/service/expose.go @@ -0,0 +1,11 @@ +package service + +import ( + "bsm/full/module/base/mgt/internal/routers" + "github.com/gin-gonic/gin" +) + +func Expose(engine *gin.Engine) error { + routers.Register("mgt", engine) + return nil +} diff --git a/module/base/passport/cmd/main/main.go b/module/base/passport/cmd/main/main.go index 964a952..34041dc 100644 --- a/module/base/passport/cmd/main/main.go +++ b/module/base/passport/cmd/main/main.go @@ -2,7 +2,7 @@ * @Author: david.yan(david.yan@qq.com) * @Date: 2021-11-26 15:25:03 */ -package service +package main import ( "bsm/full/module/base/passport/internal/config" @@ -20,7 +20,7 @@ func Run() { impl.NewImpl() // 初始化服务 - s := server.New(config.Spec.Addr) + s := server.New(nil) srv := service.New( s.Grpc, &service.Options{ diff --git a/module/base/passport/internal/server/new.go b/module/base/passport/internal/server/new.go index 8d7116a..60a5370 100644 --- a/module/base/passport/internal/server/new.go +++ b/module/base/passport/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -31,7 +36,9 @@ func New(addr string) *Server { pb.RegisterRegisterServer(srv.Grpc, NewRegisterServer()) pb.RegisterVerifyServer(srv.Grpc, NewVerifyServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/base/passport/pb/account.pb.go b/module/base/passport/pb/account.pb.go index bfb342c..cf9e2bd 100644 --- a/module/base/passport/pb/account.pb.go +++ b/module/base/passport/pb/account.pb.go @@ -538,7 +538,7 @@ var File_module_base_passport_proto_account_proto protoreflect.FileDescriptor const file_module_base_passport_proto_account_proto_rawDesc = "" + "\n" + - "(module/base/passport/proto/account.proto\x12\bpassport\x1a&module/base/passport/proto/const.proto\"\x80\x04\n" + + "(module/base/passport/proto/account.proto\x12\bpassport\x1a&module/base/passport/proto/const.proto\"\x8e\x04\n" + "\fGetFullReply\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\aaccount\x18\x02 \x01(\tR\aaccount\x12\x14\n" + @@ -557,8 +557,8 @@ const file_module_base_passport_proto_account_proto_rawDesc = "" + "\x04sign\x18\x0e \x01(\tR\x04sign\x12\x14\n" + "\x05cover\x18\x0f \x01(\tR\x05cover\x12\x14\n" + "\x05score\x18\x10 \x01(\x05R\x05score\x12\x14\n" + - "\x05level\x18\x11 \x01(\x05R\x05level\x129\n" + - "\rverify_status\x18\x12 \x01(\v2\x14.blocks.VerifyStatusR\fverifyStatus\x12%\n" + + "\x05level\x18\x11 \x01(\x05R\x05level\x12G\n" + + "\rverify_status\x18\x12 \x01(\v2\".base_passport_blocks.VerifyStatusR\fverifyStatus\x12%\n" + "\x04tags\x18\x13 \x03(\v2\x11.passport.TagItemR\x04tags\"1\n" + "\aTagItem\x12\x12\n" + "\x04name\x18\x01 \x01(\tR\x04name\x12\x12\n" + @@ -586,13 +586,13 @@ const file_module_base_passport_proto_account_proto_rawDesc = "" + "\x04Data\x18\x01 \x03(\v2#.passport.StatisticsReply.DataEntryR\x04Data\x1a7\n" + "\tDataEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\x03R\x05value:\x028\x012\xf2\x02\n" + - "\aAccount\x12.\n" + - "\x03Get\x12\r.blocks.Empty\x1a\x16.passport.GetFullReply\"\x00\x12:\n" + - "\aSetData\x12\x18.passport.SetDataRequest\x1a\x13.blocks.StatusReply\"\x00\x12B\n" + - "\vSetPassword\x12\x1c.passport.SetPasswordRequest\x1a\x13.blocks.StatusReply\"\x00\x125\n" + - "\tTagCreate\x12\x11.passport.TagItem\x1a\x13.blocks.StatusReply\"\x00\x128\n" + - "\tTagRemove\x12\x14.blocks.IdentRequest\x1a\x13.blocks.StatusReply\"\x00\x12F\n" + + "\x05value\x18\x02 \x01(\x03R\x05value:\x028\x012\xc6\x03\n" + + "\aAccount\x12<\n" + + "\x03Get\x12\x1b.base_passport_blocks.Empty\x1a\x16.passport.GetFullReply\"\x00\x12H\n" + + "\aSetData\x12\x18.passport.SetDataRequest\x1a!.base_passport_blocks.StatusReply\"\x00\x12P\n" + + "\vSetPassword\x12\x1c.passport.SetPasswordRequest\x1a!.base_passport_blocks.StatusReply\"\x00\x12C\n" + + "\tTagCreate\x12\x11.passport.TagItem\x1a!.base_passport_blocks.StatusReply\"\x00\x12T\n" + + "\tTagRemove\x12\".base_passport_blocks.IdentRequest\x1a!.base_passport_blocks.StatusReply\"\x00\x12F\n" + "\n" + "Statistics\x12\x1b.passport.StatisticsRequest\x1a\x19.passport.StatisticsReply\"\x00B+Z)bsm/full/module/base/passport/pb;passportb\x06proto3" @@ -617,26 +617,26 @@ var file_module_base_passport_proto_account_proto_goTypes = []any{ (*StatisticsRequest)(nil), // 4: passport.StatisticsRequest (*StatisticsReply)(nil), // 5: passport.StatisticsReply nil, // 6: passport.StatisticsReply.DataEntry - (*VerifyStatus)(nil), // 7: blocks.VerifyStatus - (*Empty)(nil), // 8: blocks.Empty - (*IdentRequest)(nil), // 9: blocks.IdentRequest - (*StatusReply)(nil), // 10: blocks.StatusReply + (*VerifyStatus)(nil), // 7: base_passport_blocks.VerifyStatus + (*Empty)(nil), // 8: base_passport_blocks.Empty + (*IdentRequest)(nil), // 9: base_passport_blocks.IdentRequest + (*StatusReply)(nil), // 10: base_passport_blocks.StatusReply } var file_module_base_passport_proto_account_proto_depIdxs = []int32{ - 7, // 0: passport.GetFullReply.verify_status:type_name -> blocks.VerifyStatus + 7, // 0: passport.GetFullReply.verify_status:type_name -> base_passport_blocks.VerifyStatus 1, // 1: passport.GetFullReply.tags:type_name -> passport.TagItem 6, // 2: passport.StatisticsReply.Data:type_name -> passport.StatisticsReply.DataEntry - 8, // 3: passport.Account.Get:input_type -> blocks.Empty + 8, // 3: passport.Account.Get:input_type -> base_passport_blocks.Empty 2, // 4: passport.Account.SetData:input_type -> passport.SetDataRequest 3, // 5: passport.Account.SetPassword:input_type -> passport.SetPasswordRequest 1, // 6: passport.Account.TagCreate:input_type -> passport.TagItem - 9, // 7: passport.Account.TagRemove:input_type -> blocks.IdentRequest + 9, // 7: passport.Account.TagRemove:input_type -> base_passport_blocks.IdentRequest 4, // 8: passport.Account.Statistics:input_type -> passport.StatisticsRequest 0, // 9: passport.Account.Get:output_type -> passport.GetFullReply - 10, // 10: passport.Account.SetData:output_type -> blocks.StatusReply - 10, // 11: passport.Account.SetPassword:output_type -> blocks.StatusReply - 10, // 12: passport.Account.TagCreate:output_type -> blocks.StatusReply - 10, // 13: passport.Account.TagRemove:output_type -> blocks.StatusReply + 10, // 10: passport.Account.SetData:output_type -> base_passport_blocks.StatusReply + 10, // 11: passport.Account.SetPassword:output_type -> base_passport_blocks.StatusReply + 10, // 12: passport.Account.TagCreate:output_type -> base_passport_blocks.StatusReply + 10, // 13: passport.Account.TagRemove:output_type -> base_passport_blocks.StatusReply 5, // 14: passport.Account.Statistics:output_type -> passport.StatisticsReply 9, // [9:15] is the sub-list for method output_type 3, // [3:9] is the sub-list for method input_type diff --git a/module/base/passport/pb/const.pb.go b/module/base/passport/pb/const.pb.go index be1f841..439c9d0 100644 --- a/module/base/passport/pb/const.pb.go +++ b/module/base/passport/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_base_passport_proto_const_proto protoreflect.FileDescriptor const file_module_base_passport_proto_const_proto_rawDesc = "" + "\n" + - "&module/base/passport/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "&module/base/passport/proto/const.proto\x12\x14base_passport_blocks\"\a\n" + + "\x05Empty\"\xc9\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12F\n" + + "\x06params\x18\x03 \x03(\v2..base_passport_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x84\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12J\n" + + "\x06params\x18\x03 \x03(\v22.base_passport_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xbd\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12L\n" + + "\x06params\x18\x03 \x03(\v24.base_passport_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xee\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x12;\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2%.base_passport_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xda\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x12<\n" + + "\adetails\x18! \x03(\v2\".base_passport_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"]\n" + + "\x11FeedPostListReply\x126\n" + + "\x04list\x18\x01 \x03(\v2\".base_passport_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xed\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12>\n" + + "\aattachs\x18\t \x03(\v2$.base_passport_blocks.FeedAttachItemR\aattachs\x125\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2!.base_passport_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"_\n" + + "\x12GroupPostListReply\x127\n" + + "\x04list\x18\x01 \x03(\v2#.base_passport_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\x80\x03\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12?\n" + + "\aattachs\x18\t \x03(\v2%.base_passport_blocks.GroupAttachItemR\aattachs\x126\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\".base_passport_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_base_passport_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"f\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB+Z)bsm/full/module/base/passport/pb;passportb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x126\n" + + "\x04data\x18\x02 \x03(\v2\".base_passport_blocks.RelationItemR\x04dataB+Z)bsm/full/module/base/passport/pb;passportb\x06proto3" var ( file_module_base_passport_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_base_passport_proto_const_proto_rawDescGZIP() []byte { var file_module_base_passport_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_base_passport_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: base_passport_blocks.Empty + (*FetchRequest)(nil), // 1: base_passport_blocks.FetchRequest + (*IdentRequest)(nil), // 2: base_passport_blocks.IdentRequest + (*VersionRequest)(nil), // 3: base_passport_blocks.VersionRequest + (*SearchRequest)(nil), // 4: base_passport_blocks.SearchRequest + (*StatusReply)(nil), // 5: base_passport_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: base_passport_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: base_passport_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: base_passport_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: base_passport_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: base_passport_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: base_passport_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: base_passport_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: base_passport_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: base_passport_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: base_passport_blocks.IDRequest + (*IDListRequest)(nil), // 16: base_passport_blocks.IDListRequest + (*StdIicuds)(nil), // 17: base_passport_blocks.StdIicuds + (*StdPassport)(nil), // 18: base_passport_blocks.StdPassport + (*CloudBase)(nil), // 19: base_passport_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: base_passport_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: base_passport_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: base_passport_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: base_passport_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: base_passport_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: base_passport_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: base_passport_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: base_passport_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: base_passport_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: base_passport_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: base_passport_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: base_passport_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: base_passport_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: base_passport_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: base_passport_blocks.GroupTagItem + (*RelationItem)(nil), // 35: base_passport_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: base_passport_blocks.FetchRelationItemReply + nil, // 37: base_passport_blocks.FetchRequest.ParamsEntry + nil, // 38: base_passport_blocks.MallFetchRequest.ParamsEntry + nil, // 39: base_passport_blocks.MarketFetchRequest.ParamsEntry } var file_module_base_passport_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: base_passport_blocks.FetchRequest.params:type_name -> base_passport_blocks.FetchRequest.ParamsEntry + 38, // 1: base_passport_blocks.MallFetchRequest.params:type_name -> base_passport_blocks.MallFetchRequest.ParamsEntry + 39, // 2: base_passport_blocks.MarketFetchRequest.params:type_name -> base_passport_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: base_passport_blocks.CmsCategoryItem.child:type_name -> base_passport_blocks.CmsCategoryItem + 26, // 4: base_passport_blocks.OrderSummaryItem.details:type_name -> base_passport_blocks.OrderDetails + 28, // 5: base_passport_blocks.FeedPostListReply.list:type_name -> base_passport_blocks.FeedPostItem + 29, // 6: base_passport_blocks.FeedPostItem.attachs:type_name -> base_passport_blocks.FeedAttachItem + 30, // 7: base_passport_blocks.FeedPostItem.tags:type_name -> base_passport_blocks.FeedTagItem + 32, // 8: base_passport_blocks.GroupPostListReply.list:type_name -> base_passport_blocks.GroupPostItem + 33, // 9: base_passport_blocks.GroupPostItem.attachs:type_name -> base_passport_blocks.GroupAttachItem + 34, // 10: base_passport_blocks.GroupPostItem.tags:type_name -> base_passport_blocks.GroupTagItem + 35, // 11: base_passport_blocks.FetchRelationItemReply.data:type_name -> base_passport_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/base/passport/pb/forget.pb.go b/module/base/passport/pb/forget.pb.go index 8d8d982..9400fcf 100644 --- a/module/base/passport/pb/forget.pb.go +++ b/module/base/passport/pb/forget.pb.go @@ -135,10 +135,10 @@ const file_module_base_passport_proto_forget_proto_rawDesc = "" + "\x04code\x18\x02 \x01(\tR\x04code\"L\n" + "\x12ForgetResetRequest\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1a\n" + - "\bpassword\x18\x02 \x01(\tR\bpassword2\x86\x01\n" + - "\x06Forget\x12>\n" + - "\x06Verify\x12\x1d.passport.ForgetVerifyRequest\x1a\x13.blocks.StatusReply\"\x00\x12<\n" + - "\x05Reset\x12\x1c.passport.ForgetResetRequest\x1a\x13.blocks.StatusReply\"\x00B+Z)bsm/full/module/base/passport/pb;passportb\x06proto3" + "\bpassword\x18\x02 \x01(\tR\bpassword2\xa2\x01\n" + + "\x06Forget\x12L\n" + + "\x06Verify\x12\x1d.passport.ForgetVerifyRequest\x1a!.base_passport_blocks.StatusReply\"\x00\x12J\n" + + "\x05Reset\x12\x1c.passport.ForgetResetRequest\x1a!.base_passport_blocks.StatusReply\"\x00B+Z)bsm/full/module/base/passport/pb;passportb\x06proto3" var ( file_module_base_passport_proto_forget_proto_rawDescOnce sync.Once @@ -156,13 +156,13 @@ var file_module_base_passport_proto_forget_proto_msgTypes = make([]protoimpl.Mes var file_module_base_passport_proto_forget_proto_goTypes = []any{ (*ForgetVerifyRequest)(nil), // 0: passport.ForgetVerifyRequest (*ForgetResetRequest)(nil), // 1: passport.ForgetResetRequest - (*StatusReply)(nil), // 2: blocks.StatusReply + (*StatusReply)(nil), // 2: base_passport_blocks.StatusReply } var file_module_base_passport_proto_forget_proto_depIdxs = []int32{ 0, // 0: passport.Forget.Verify:input_type -> passport.ForgetVerifyRequest 1, // 1: passport.Forget.Reset:input_type -> passport.ForgetResetRequest - 2, // 2: passport.Forget.Verify:output_type -> blocks.StatusReply - 2, // 3: passport.Forget.Reset:output_type -> blocks.StatusReply + 2, // 2: passport.Forget.Verify:output_type -> base_passport_blocks.StatusReply + 2, // 3: passport.Forget.Reset:output_type -> base_passport_blocks.StatusReply 2, // [2:4] is the sub-list for method output_type 0, // [0:2] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name diff --git a/module/base/passport/pb/login.pb.go b/module/base/passport/pb/login.pb.go index f365484..227ee64 100644 --- a/module/base/passport/pb/login.pb.go +++ b/module/base/passport/pb/login.pb.go @@ -256,14 +256,14 @@ const file_module_base_passport_proto_login_proto_rawDesc = "" + "\tagency_id\x18\x04 \x01(\x03R\bagencyId\x12\x19\n" + "\bstaff_id\x18\x05 \x01(\x03R\astaffId\x12\x1a\n" + "\bowner_id\x18\x06 \x01(\x03R\bowner_id\x12&\n" + - "\x0eowner_identity\x18\a \x01(\tR\x0eowner_identity\"\xfe\x01\n" + + "\x0eowner_identity\x18\a \x01(\tR\x0eowner_identity\"\x8c\x02\n" + "\n" + "LoginReply\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\bidentity\x18\x02 \x01(\tR\bidentity\x12\x14\n" + "\x05token\x18\x03 \x01(\tR\x05token\x128\n" + - "\x06extend\x18\x04 \x03(\v2 .passport.LoginReply.ExtendEntryR\x06extend\x129\n" + - "\rverify_status\x18\x05 \x01(\v2\x14.blocks.VerifyStatusR\fverifyStatus\x1a9\n" + + "\x06extend\x18\x04 \x03(\v2 .passport.LoginReply.ExtendEntryR\x06extend\x12G\n" + + "\rverify_status\x18\x05 \x01(\v2\".base_passport_blocks.VerifyStatusR\fverifyStatus\x1a9\n" + "\vExtendEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x012\xc0\x01\n" + @@ -290,11 +290,11 @@ var file_module_base_passport_proto_login_proto_goTypes = []any{ (*LoginByCodeRequest)(nil), // 1: passport.LoginByCodeRequest (*LoginReply)(nil), // 2: passport.LoginReply nil, // 3: passport.LoginReply.ExtendEntry - (*VerifyStatus)(nil), // 4: blocks.VerifyStatus + (*VerifyStatus)(nil), // 4: base_passport_blocks.VerifyStatus } var file_module_base_passport_proto_login_proto_depIdxs = []int32{ 3, // 0: passport.LoginReply.extend:type_name -> passport.LoginReply.ExtendEntry - 4, // 1: passport.LoginReply.verify_status:type_name -> blocks.VerifyStatus + 4, // 1: passport.LoginReply.verify_status:type_name -> base_passport_blocks.VerifyStatus 0, // 2: passport.Login.Pwd:input_type -> passport.LoginByPwdRequest 1, // 3: passport.Login.Code:input_type -> passport.LoginByCodeRequest 1, // 4: passport.Login.Quick:input_type -> passport.LoginByCodeRequest diff --git a/module/base/passport/pb/register.pb.go b/module/base/passport/pb/register.pb.go index 78ab60c..8f4be66 100644 --- a/module/base/passport/pb/register.pb.go +++ b/module/base/passport/pb/register.pb.go @@ -229,13 +229,13 @@ const file_module_base_passport_proto_register_proto_rawDesc = "" + "\bstaff_id\x18\b \x01(\x03R\astaffId\x12\x1a\n" + "\bowner_id\x18\t \x01(\x03R\bowner_id\x12&\n" + "\x0eowner_identity\x18\n" + - " \x01(\tR\x0eowner_identity\"\x84\x02\n" + + " \x01(\tR\x0eowner_identity\"\x92\x02\n" + "\rRegisterReply\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\bidentity\x18\x02 \x01(\tR\bidentity\x12\x14\n" + "\x05token\x18\x04 \x01(\tR\x05token\x12;\n" + - "\x06extend\x18\x05 \x03(\v2#.passport.RegisterReply.ExtendEntryR\x06extend\x129\n" + - "\rverify_status\x18\x06 \x01(\v2\x14.blocks.VerifyStatusR\fverifyStatus\x1a9\n" + + "\x06extend\x18\x05 \x03(\v2#.passport.RegisterReply.ExtendEntryR\x06extend\x12G\n" + + "\rverify_status\x18\x06 \x01(\v2\".base_passport_blocks.VerifyStatusR\fverifyStatus\x1a9\n" + "\vExtendEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x012\x85\x01\n" + @@ -260,11 +260,11 @@ var file_module_base_passport_proto_register_proto_goTypes = []any{ (*RegisterRequest)(nil), // 0: passport.RegisterRequest (*RegisterReply)(nil), // 1: passport.RegisterReply nil, // 2: passport.RegisterReply.ExtendEntry - (*VerifyStatus)(nil), // 3: blocks.VerifyStatus + (*VerifyStatus)(nil), // 3: base_passport_blocks.VerifyStatus } var file_module_base_passport_proto_register_proto_depIdxs = []int32{ 2, // 0: passport.RegisterReply.extend:type_name -> passport.RegisterReply.ExtendEntry - 3, // 1: passport.RegisterReply.verify_status:type_name -> blocks.VerifyStatus + 3, // 1: passport.RegisterReply.verify_status:type_name -> base_passport_blocks.VerifyStatus 0, // 2: passport.Register.Pwd:input_type -> passport.RegisterRequest 0, // 3: passport.Register.Code:input_type -> passport.RegisterRequest 1, // 4: passport.Register.Pwd:output_type -> passport.RegisterReply diff --git a/module/base/passport/pb/verify.pb.go b/module/base/passport/pb/verify.pb.go index 1cdd3f6..7170329 100644 --- a/module/base/passport/pb/verify.pb.go +++ b/module/base/passport/pb/verify.pb.go @@ -452,10 +452,10 @@ const file_module_base_passport_proto_verify_proto_rawDesc = "" + "\x06status\x18\x01 \x01(\tR\x06status\x12\x1e\n" + "\n" + "similarity\x18\x02 \x01(\x02R\n" + - "similarity2\x8b\x01\n" + - "\x06Verify\x129\n" + - "\aRequest\x12\x17.passport.VerifyRequest\x1a\x13.blocks.StatusReply\"\x00\x12F\n" + - "\rJumioCallback\x12\x1e.passport.JumioCallbackPayload\x1a\x13.blocks.StatusReply\"\x00B+Z)bsm/full/module/base/passport/pb;passportb\x06proto3" + "similarity2\xa7\x01\n" + + "\x06Verify\x12G\n" + + "\aRequest\x12\x17.passport.VerifyRequest\x1a!.base_passport_blocks.StatusReply\"\x00\x12T\n" + + "\rJumioCallback\x12\x1e.passport.JumioCallbackPayload\x1a!.base_passport_blocks.StatusReply\"\x00B+Z)bsm/full/module/base/passport/pb;passportb\x06proto3" var ( file_module_base_passport_proto_verify_proto_rawDescOnce sync.Once @@ -478,7 +478,7 @@ var file_module_base_passport_proto_verify_proto_goTypes = []any{ (*PersonalInformation)(nil), // 4: passport.PersonalInformation (*FaceMap)(nil), // 5: passport.FaceMap nil, // 6: passport.VerifyRequest.ArgsEntry - (*StatusReply)(nil), // 7: blocks.StatusReply + (*StatusReply)(nil), // 7: base_passport_blocks.StatusReply } var file_module_base_passport_proto_verify_proto_depIdxs = []int32{ 6, // 0: passport.VerifyRequest.args:type_name -> passport.VerifyRequest.ArgsEntry @@ -488,8 +488,8 @@ var file_module_base_passport_proto_verify_proto_depIdxs = []int32{ 5, // 4: passport.JumioCallbackPayload.face_map:type_name -> passport.FaceMap 0, // 5: passport.Verify.Request:input_type -> passport.VerifyRequest 1, // 6: passport.Verify.JumioCallback:input_type -> passport.JumioCallbackPayload - 7, // 7: passport.Verify.Request:output_type -> blocks.StatusReply - 7, // 8: passport.Verify.JumioCallback:output_type -> blocks.StatusReply + 7, // 7: passport.Verify.Request:output_type -> base_passport_blocks.StatusReply + 7, // 8: passport.Verify.JumioCallback:output_type -> base_passport_blocks.StatusReply 7, // [7:9] is the sub-list for method output_type 5, // [5:7] is the sub-list for method input_type 5, // [5:5] is the sub-list for extension type_name diff --git a/module/base/passport/proto/account.proto b/module/base/passport/proto/account.proto index 3753d05..57fcb3e 100644 --- a/module/base/passport/proto/account.proto +++ b/module/base/passport/proto/account.proto @@ -6,19 +6,19 @@ import "module/base/passport/proto/const.proto"; // assport通行证模块-帐号数据 service Account{ // 通过会员所有信息 - rpc Get(blocks.Empty) returns (GetFullReply) {} + rpc Get(base_passport_blocks.Empty) returns (GetFullReply) {} // 更新会员的信息数据,字段值为空或是0，将不更新此数据 - rpc SetData(SetDataRequest) returns (blocks.StatusReply) {} + rpc SetData(SetDataRequest) returns (base_passport_blocks.StatusReply) {} // 更新会员的密码 - rpc SetPassword(SetPasswordRequest) returns (blocks.StatusReply) {} + rpc SetPassword(SetPasswordRequest) returns (base_passport_blocks.StatusReply) {} // 新增标签 - rpc TagCreate(TagItem) returns (blocks.StatusReply) {} + rpc TagCreate(TagItem) returns (base_passport_blocks.StatusReply) {} // 删除标签 - rpc TagRemove(blocks.IdentRequest) returns (blocks.StatusReply) {} + rpc TagRemove(base_passport_blocks.IdentRequest) returns (base_passport_blocks.StatusReply) {} // 获取会员的相关统计数据 rpc Statistics(StatisticsRequest) returns (StatisticsReply) {} @@ -43,7 +43,7 @@ message GetFullReply { string cover = 15; // 背景&封面 int32 score = 16; // 积分 int32 level = 17; // 等级 - blocks.VerifyStatus verify_status = 18; // 用户验证状态 + base_passport_blocks.VerifyStatus verify_status = 18; // 用户验证状态 repeated TagItem tags = 19; // 用户标签 } @@ -79,4 +79,4 @@ message StatisticsRequest { message StatisticsReply { map Data=1; //数据以Map格式输出 -} \ No newline at end of file +} diff --git a/module/base/passport/proto/const.proto b/module/base/passport/proto/const.proto index 8889eba..76f9c6e 100644 --- a/module/base/passport/proto/const.proto +++ b/module/base/passport/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package base_passport_blocks; option go_package = "bsm/full/module/base/passport/pb;passport"; diff --git a/module/base/passport/proto/forget.proto b/module/base/passport/proto/forget.proto index 3ce111c..af8d5c1 100644 --- a/module/base/passport/proto/forget.proto +++ b/module/base/passport/proto/forget.proto @@ -6,10 +6,10 @@ import "module/base/passport/proto/const.proto"; // Passport通行证模块-找回密码 service Forget{ // 验证手机号和验证码 - rpc Verify(ForgetVerifyRequest) returns(blocks.StatusReply) {} + rpc Verify(ForgetVerifyRequest) returns(base_passport_blocks.StatusReply) {} // 重罢密码 - rpc Reset(ForgetResetRequest) returns (blocks.StatusReply) {} + rpc Reset(ForgetResetRequest) returns (base_passport_blocks.StatusReply) {} } message ForgetVerifyRequest { @@ -21,4 +21,4 @@ message ForgetVerifyRequest { message ForgetResetRequest { string identity = 1; //唯一码 string password = 2; // 密码 -} \ No newline at end of file +} diff --git a/module/base/passport/proto/login.proto b/module/base/passport/proto/login.proto index bb92ff5..0baffb6 100644 --- a/module/base/passport/proto/login.proto +++ b/module/base/passport/proto/login.proto @@ -37,6 +37,6 @@ message LoginReply { string identity = 2; //用户唯一码 string token = 3; //用户凭证 map extend = 4; //扩展字段 - blocks.VerifyStatus verify_status = 5; // 用户验证状态 + base_passport_blocks.VerifyStatus verify_status = 5; // 用户验证状态 } diff --git a/module/base/passport/proto/register.proto b/module/base/passport/proto/register.proto index 318583d..87a2df3 100644 --- a/module/base/passport/proto/register.proto +++ b/module/base/passport/proto/register.proto @@ -31,5 +31,5 @@ message RegisterReply { string identity = 2; //用户唯一码 string token = 4; //用户Header所需Token map extend = 5; //扩展字段 - blocks.VerifyStatus verify_status = 6; // 用户验证状态 + base_passport_blocks.VerifyStatus verify_status = 6; // 用户验证状态 } diff --git a/module/base/passport/proto/verify.proto b/module/base/passport/proto/verify.proto index 95ab560..9c78fd2 100644 --- a/module/base/passport/proto/verify.proto +++ b/module/base/passport/proto/verify.proto @@ -6,10 +6,10 @@ import "module/base/passport/proto/const.proto"; // Passport(会员通行证)-验证 service Verify{ // 认证请求 - rpc Request(VerifyRequest) returns (blocks.StatusReply) {} + rpc Request(VerifyRequest) returns (base_passport_blocks.StatusReply) {} // KYC 认证回调 - rpc JumioCallback(JumioCallbackPayload) returns (blocks.StatusReply) {} + rpc JumioCallback(JumioCallbackPayload) returns (base_passport_blocks.StatusReply) {} } message VerifyRequest { @@ -51,4 +51,4 @@ message PersonalInformation { message FaceMap { string status = 1; float similarity = 2; // 人脸比对相似度 -} \ No newline at end of file +} diff --git a/module/base/passport/service/expose.go b/module/base/passport/service/expose.go new file mode 100644 index 0000000..07e031b --- /dev/null +++ b/module/base/passport/service/expose.go @@ -0,0 +1,37 @@ +package service + +import ( + "context" + + "bsm/full/module/base/passport/internal/server" + pb "bsm/full/module/base/passport/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterAccountHandlerServer(ctx, options.Gateway, server.NewAccountServer()); err != nil { + return err + } + if err := pb.RegisterForgetHandlerServer(ctx, options.Gateway, server.NewForgetServer()); err != nil { + return err + } + if err := pb.RegisterLoginHandlerServer(ctx, options.Gateway, server.NewLoginServer()); err != nil { + return err + } + if err := pb.RegisterRegisterHandlerServer(ctx, options.Gateway, server.NewRegisterServer()); err != nil { + return err + } + if err := pb.RegisterVerifyHandlerServer(ctx, options.Gateway, server.NewVerifyServer()); err != nil { + return err + } + return nil +} diff --git a/module/base/sender/cmd/main/main.go b/module/base/sender/cmd/main/main.go index 3e00510..2d371a2 100644 --- a/module/base/sender/cmd/main/main.go +++ b/module/base/sender/cmd/main/main.go @@ -3,7 +3,7 @@ * @日期: 2021-11-26 15:25:03 * @描述: Sender微服务主入口程序，提供邮件和短信发送功能 */ -package service +package main import ( "bsm/full/module/base/sender/internal/config" @@ -26,7 +26,7 @@ func Run() { impl.NewImpl() // 初始化gRPC和HTTP服务器 - s := server.New(config.Spec.Addr) + s := server.New(nil) // 创建微服务实例 srv := service.New( diff --git a/module/base/sender/internal/server/new.go b/module/base/sender/internal/server/new.go index 78a577b..4c96656 100644 --- a/module/base/sender/internal/server/new.go +++ b/module/base/sender/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -28,7 +33,9 @@ func New(addr string) *Server { pb.RegisterMailServer(srv.Grpc, NewMailServer()) pb.RegisterSmsServer(srv.Grpc, NewSmsServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/base/sender/pb/const.pb.go b/module/base/sender/pb/const.pb.go index bfaef60..53817d0 100644 --- a/module/base/sender/pb/const.pb.go +++ b/module/base/sender/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_base_sender_proto_const_proto protoreflect.FileDescriptor const file_module_base_sender_proto_const_proto_rawDesc = "" + "\n" + - "$module/base/sender/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "$module/base/sender/proto/const.proto\x12\x12base_sender_blocks\"\a\n" + + "\x05Empty\"\xc7\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12D\n" + + "\x06params\x18\x03 \x03(\v2,.base_sender_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x82\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12H\n" + + "\x06params\x18\x03 \x03(\v20.base_sender_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xbb\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12J\n" + + "\x06params\x18\x03 \x03(\v22.base_sender_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xec\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x129\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2#.base_sender_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd8\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x12:\n" + + "\adetails\x18! \x03(\v2 .base_sender_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"[\n" + + "\x11FeedPostListReply\x124\n" + + "\x04list\x18\x01 \x03(\v2 .base_sender_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe9\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12<\n" + + "\aattachs\x18\t \x03(\v2\".base_sender_blocks.FeedAttachItemR\aattachs\x123\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1f.base_sender_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"]\n" + + "\x12GroupPostListReply\x125\n" + + "\x04list\x18\x01 \x03(\v2!.base_sender_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xfc\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12=\n" + + "\aattachs\x18\t \x03(\v2#.base_sender_blocks.GroupAttachItemR\aattachs\x124\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2 .base_sender_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_base_sender_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"d\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB'Z%bsm/full/module/base/sender/pb;senderb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x124\n" + + "\x04data\x18\x02 \x03(\v2 .base_sender_blocks.RelationItemR\x04dataB'Z%bsm/full/module/base/sender/pb;senderb\x06proto3" var ( file_module_base_sender_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_base_sender_proto_const_proto_rawDescGZIP() []byte { var file_module_base_sender_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_base_sender_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: base_sender_blocks.Empty + (*FetchRequest)(nil), // 1: base_sender_blocks.FetchRequest + (*IdentRequest)(nil), // 2: base_sender_blocks.IdentRequest + (*VersionRequest)(nil), // 3: base_sender_blocks.VersionRequest + (*SearchRequest)(nil), // 4: base_sender_blocks.SearchRequest + (*StatusReply)(nil), // 5: base_sender_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: base_sender_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: base_sender_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: base_sender_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: base_sender_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: base_sender_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: base_sender_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: base_sender_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: base_sender_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: base_sender_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: base_sender_blocks.IDRequest + (*IDListRequest)(nil), // 16: base_sender_blocks.IDListRequest + (*StdIicuds)(nil), // 17: base_sender_blocks.StdIicuds + (*StdPassport)(nil), // 18: base_sender_blocks.StdPassport + (*CloudBase)(nil), // 19: base_sender_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: base_sender_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: base_sender_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: base_sender_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: base_sender_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: base_sender_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: base_sender_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: base_sender_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: base_sender_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: base_sender_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: base_sender_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: base_sender_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: base_sender_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: base_sender_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: base_sender_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: base_sender_blocks.GroupTagItem + (*RelationItem)(nil), // 35: base_sender_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: base_sender_blocks.FetchRelationItemReply + nil, // 37: base_sender_blocks.FetchRequest.ParamsEntry + nil, // 38: base_sender_blocks.MallFetchRequest.ParamsEntry + nil, // 39: base_sender_blocks.MarketFetchRequest.ParamsEntry } var file_module_base_sender_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: base_sender_blocks.FetchRequest.params:type_name -> base_sender_blocks.FetchRequest.ParamsEntry + 38, // 1: base_sender_blocks.MallFetchRequest.params:type_name -> base_sender_blocks.MallFetchRequest.ParamsEntry + 39, // 2: base_sender_blocks.MarketFetchRequest.params:type_name -> base_sender_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: base_sender_blocks.CmsCategoryItem.child:type_name -> base_sender_blocks.CmsCategoryItem + 26, // 4: base_sender_blocks.OrderSummaryItem.details:type_name -> base_sender_blocks.OrderDetails + 28, // 5: base_sender_blocks.FeedPostListReply.list:type_name -> base_sender_blocks.FeedPostItem + 29, // 6: base_sender_blocks.FeedPostItem.attachs:type_name -> base_sender_blocks.FeedAttachItem + 30, // 7: base_sender_blocks.FeedPostItem.tags:type_name -> base_sender_blocks.FeedTagItem + 32, // 8: base_sender_blocks.GroupPostListReply.list:type_name -> base_sender_blocks.GroupPostItem + 33, // 9: base_sender_blocks.GroupPostItem.attachs:type_name -> base_sender_blocks.GroupAttachItem + 34, // 10: base_sender_blocks.GroupPostItem.tags:type_name -> base_sender_blocks.GroupTagItem + 35, // 11: base_sender_blocks.FetchRelationItemReply.data:type_name -> base_sender_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/base/sender/proto/const.proto b/module/base/sender/proto/const.proto index f5f4187..f0ce27c 100644 --- a/module/base/sender/proto/const.proto +++ b/module/base/sender/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package base_sender_blocks; option go_package = "bsm/full/module/base/sender/pb;sender"; diff --git a/module/base/sender/service/expose.go b/module/base/sender/service/expose.go new file mode 100644 index 0000000..3432579 --- /dev/null +++ b/module/base/sender/service/expose.go @@ -0,0 +1,28 @@ +package service + +import ( + "context" + + "bsm/full/module/base/sender/internal/server" + pb "bsm/full/module/base/sender/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterMailHandlerServer(ctx, options.Gateway, server.NewMailServer()); err != nil { + return err + } + if err := pb.RegisterSmsHandlerServer(ctx, options.Gateway, server.NewSmsServer()); err != nil { + return err + } + return nil +} diff --git a/module/ec/address/cmd/main/main.go b/module/ec/address/cmd/main/main.go index 4fdece9..0e76f5a 100644 --- a/module/ec/address/cmd/main/main.go +++ b/module/ec/address/cmd/main/main.go @@ -2,7 +2,7 @@ * @Author: david.yan(david.yan@qq.com) * @Date: 2021-11-26 15:25:03 */ -package service +package main import ( "bsm/full/module/ec/address/internal/config" @@ -20,7 +20,7 @@ func Run() { impl.NewImpl() // 初始化服务 - s := server.New(config.Spec.Addr) + s := server.New(nil) srv := service.New( s.Grpc, &service.Options{ diff --git a/module/ec/address/internal/server/new.go b/module/ec/address/internal/server/new.go index f692b87..cbcceec 100644 --- a/module/ec/address/internal/server/new.go +++ b/module/ec/address/internal/server/new.go @@ -17,17 +17,24 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } // register service to grpc.Server pb.RegisterLibraryServer(srv.Grpc, NewLibraryServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/ec/address/pb/const.pb.go b/module/ec/address/pb/const.pb.go index e039e1f..959373a 100644 --- a/module/ec/address/pb/const.pb.go +++ b/module/ec/address/pb/const.pb.go @@ -2795,7 +2795,7 @@ var File_module_ec_address_proto_const_proto protoreflect.FileDescriptor const file_module_ec_address_proto_const_proto_rawDesc = "" + "\n" + - "#module/ec/address/proto/const.proto\x12\x06blocks\"\a\n" + + "#module/ec/address/proto/const.proto\x12\x11ec_address_blocks\"\a\n" + "\x05Empty\"*\n" + "\x0eVersionRequest\x12\x18\n" + "\aversion\x18\x01 \x01(\x03R\aversion\")\n" + @@ -2804,11 +2804,11 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x81\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12G\n" + + "\x06params\x18\x03 \x03(\v2/.ec_address_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -2818,11 +2818,11 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xba\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12I\n" + + "\x06params\x18\x03 \x03(\v21.ec_address_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -2877,7 +2877,7 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xeb\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -2893,9 +2893,9 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x128\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2\".ec_address_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -2934,7 +2934,7 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd7\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -2970,8 +2970,8 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x129\n" + + "\adetails\x18! \x03(\v2\x1f.ec_address_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3001,10 +3001,10 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"Z\n" + + "\x11FeedPostListReply\x123\n" + + "\x04list\x18\x01 \x03(\v2\x1f.ec_address_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe7\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3015,10 +3015,10 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12;\n" + + "\aattachs\x18\t \x03(\v2!.ec_address_blocks.FeedAttachItemR\aattachs\x122\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1e.ec_address_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3026,10 +3026,10 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"\\\n" + + "\x12GroupPostListReply\x124\n" + + "\x04list\x18\x01 \x03(\v2 .ec_address_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xfa\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3041,10 +3041,10 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12<\n" + + "\aattachs\x18\t \x03(\v2\".ec_address_blocks.GroupAttachItemR\aattachs\x123\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\x1f.ec_address_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3068,10 +3068,10 @@ const file_module_ec_address_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"c\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB'Z%bsm/full/module/ec/address/pb;addressb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x123\n" + + "\x04data\x18\x02 \x03(\v2\x1f.ec_address_blocks.RelationItemR\x04dataB'Z%bsm/full/module/ec/address/pb;addressb\x06proto3" var ( file_module_ec_address_proto_const_proto_rawDescOnce sync.Once @@ -3087,55 +3087,55 @@ func file_module_ec_address_proto_const_proto_rawDescGZIP() []byte { var file_module_ec_address_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 36) var file_module_ec_address_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*VersionRequest)(nil), // 1: blocks.VersionRequest - (*SearchRequest)(nil), // 2: blocks.SearchRequest - (*CmsSearchRequest)(nil), // 3: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 4: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 5: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 6: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 7: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 8: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 9: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 10: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 11: blocks.StoreSerialRequest - (*IDRequest)(nil), // 12: blocks.IDRequest - (*IDListRequest)(nil), // 13: blocks.IDListRequest - (*StdIicuds)(nil), // 14: blocks.StdIicuds - (*StdPassport)(nil), // 15: blocks.StdPassport - (*CloudBase)(nil), // 16: blocks.CloudBase - (*CmsCategoryItem)(nil), // 17: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 18: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 19: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 20: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 21: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 22: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 23: blocks.OrderDetails - (*FeedPostListReply)(nil), // 24: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 25: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 26: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 27: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 28: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 29: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 30: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 31: blocks.GroupTagItem - (*RelationItem)(nil), // 32: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 33: blocks.FetchRelationItemReply - nil, // 34: blocks.MallFetchRequest.ParamsEntry - nil, // 35: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: ec_address_blocks.Empty + (*VersionRequest)(nil), // 1: ec_address_blocks.VersionRequest + (*SearchRequest)(nil), // 2: ec_address_blocks.SearchRequest + (*CmsSearchRequest)(nil), // 3: ec_address_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 4: ec_address_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 5: ec_address_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 6: ec_address_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 7: ec_address_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 8: ec_address_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 9: ec_address_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 10: ec_address_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 11: ec_address_blocks.StoreSerialRequest + (*IDRequest)(nil), // 12: ec_address_blocks.IDRequest + (*IDListRequest)(nil), // 13: ec_address_blocks.IDListRequest + (*StdIicuds)(nil), // 14: ec_address_blocks.StdIicuds + (*StdPassport)(nil), // 15: ec_address_blocks.StdPassport + (*CloudBase)(nil), // 16: ec_address_blocks.CloudBase + (*CmsCategoryItem)(nil), // 17: ec_address_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 18: ec_address_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 19: ec_address_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 20: ec_address_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 21: ec_address_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 22: ec_address_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 23: ec_address_blocks.OrderDetails + (*FeedPostListReply)(nil), // 24: ec_address_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 25: ec_address_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 26: ec_address_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 27: ec_address_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 28: ec_address_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 29: ec_address_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 30: ec_address_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 31: ec_address_blocks.GroupTagItem + (*RelationItem)(nil), // 32: ec_address_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 33: ec_address_blocks.FetchRelationItemReply + nil, // 34: ec_address_blocks.MallFetchRequest.ParamsEntry + nil, // 35: ec_address_blocks.MarketFetchRequest.ParamsEntry } var file_module_ec_address_proto_const_proto_depIdxs = []int32{ - 34, // 0: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 35, // 1: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 17, // 2: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 23, // 3: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 25, // 4: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 26, // 5: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 27, // 6: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 29, // 7: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 30, // 8: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 31, // 9: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 32, // 10: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 34, // 0: ec_address_blocks.MallFetchRequest.params:type_name -> ec_address_blocks.MallFetchRequest.ParamsEntry + 35, // 1: ec_address_blocks.MarketFetchRequest.params:type_name -> ec_address_blocks.MarketFetchRequest.ParamsEntry + 17, // 2: ec_address_blocks.CmsCategoryItem.child:type_name -> ec_address_blocks.CmsCategoryItem + 23, // 3: ec_address_blocks.OrderSummaryItem.details:type_name -> ec_address_blocks.OrderDetails + 25, // 4: ec_address_blocks.FeedPostListReply.list:type_name -> ec_address_blocks.FeedPostItem + 26, // 5: ec_address_blocks.FeedPostItem.attachs:type_name -> ec_address_blocks.FeedAttachItem + 27, // 6: ec_address_blocks.FeedPostItem.tags:type_name -> ec_address_blocks.FeedTagItem + 29, // 7: ec_address_blocks.GroupPostListReply.list:type_name -> ec_address_blocks.GroupPostItem + 30, // 8: ec_address_blocks.GroupPostItem.attachs:type_name -> ec_address_blocks.GroupAttachItem + 31, // 9: ec_address_blocks.GroupPostItem.tags:type_name -> ec_address_blocks.GroupTagItem + 32, // 10: ec_address_blocks.FetchRelationItemReply.data:type_name -> ec_address_blocks.RelationItem 11, // [11:11] is the sub-list for method output_type 11, // [11:11] is the sub-list for method input_type 11, // [11:11] is the sub-list for extension type_name diff --git a/module/ec/address/proto/const.proto b/module/ec/address/proto/const.proto index f25a3e0..c8c0357 100644 --- a/module/ec/address/proto/const.proto +++ b/module/ec/address/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package ec_address_blocks; option go_package = "bsm/full/module/ec/address/pb;address"; diff --git a/module/ec/address/service/expose.go b/module/ec/address/service/expose.go new file mode 100644 index 0000000..00d2d5e --- /dev/null +++ b/module/ec/address/service/expose.go @@ -0,0 +1,25 @@ +package service + +import ( + "context" + + "bsm/full/module/ec/address/internal/server" + pb "bsm/full/module/ec/address/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterLibraryHandlerServer(ctx, options.Gateway, server.NewLibraryServer()); err != nil { + return err + } + return nil +} diff --git a/module/ec/mall/cmd/main/main.go b/module/ec/mall/cmd/main/main.go index 81a374d..64a4618 100644 --- a/module/ec/mall/cmd/main/main.go +++ b/module/ec/mall/cmd/main/main.go @@ -2,7 +2,7 @@ * @Author: david.yan(david.yan@qq.com) * @Date: 2021-11-26 15:25:03 */ -package service +package main import ( "bsm/full/module/ec/mall/internal/config" @@ -22,7 +22,7 @@ func Run() { impl.NewImpl() // 初始化gRPC服务器 - s := server.New(config.Spec.Addr) + s := server.New(nil) // 创建微服务实例 srv := service.New( s.Grpc, diff --git a/module/ec/mall/internal/server/new.go b/module/ec/mall/internal/server/new.go index 7728c93..84a59d2 100644 --- a/module/ec/mall/internal/server/new.go +++ b/module/ec/mall/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -33,7 +38,9 @@ func New(addr string) *Server { pb.RegisterStaffServer(srv.Grpc, NewStaffServer()) pb.RegisterStoreServer(srv.Grpc, NewStoreServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/ec/mall/pb/ads.pb.go b/module/ec/mall/pb/ads.pb.go index 1e90112..4cf9b08 100644 --- a/module/ec/mall/pb/ads.pb.go +++ b/module/ec/mall/pb/ads.pb.go @@ -247,13 +247,13 @@ const file_module_ec_mall_proto_ads_proto_rawDesc = "" + "\n" + "created_at\x18\a \x01(\tR\n" + "created_at\x12\x16\n" + - "\x06status\x18\b \x01(\x03R\x06status2\xa0\x02\n" + + "\x06status\x18\b \x01(\x03R\x06status2\xc8\x02\n" + "\x03Ads\x121\n" + - "\x05ByPos\x12\x12.mall.ByPosRequest\x1a\x12.mall.AdsListReply\"\x00\x127\n" + - "\x05Fetch\x12\x18.blocks.MallFetchRequest\x1a\x12.mall.AdsListReply\"\x00\x126\n" + - "\x06Create\x12\r.mall.AdsItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x126\n" + - "\x06Modify\x12\r.mall.AdsItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" + "\x05ByPos\x12\x12.mall.ByPosRequest\x1a\x12.mall.AdsListReply\"\x00\x12?\n" + + "\x05Fetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x12.mall.AdsListReply\"\x00\x12>\n" + + "\x06Create\x12\r.mall.AdsItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12>\n" + + "\x06Modify\x12\r.mall.AdsItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12M\n" + + "\x06Delete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" var ( file_module_ec_mall_proto_ads_proto_rawDescOnce sync.Once @@ -272,22 +272,22 @@ var file_module_ec_mall_proto_ads_proto_goTypes = []any{ (*ByPosRequest)(nil), // 0: mall.ByPosRequest (*AdsListReply)(nil), // 1: mall.AdsListReply (*AdsItem)(nil), // 2: mall.AdsItem - (*MallFetchRequest)(nil), // 3: blocks.MallFetchRequest - (*IdentRequest)(nil), // 4: blocks.IdentRequest - (*IdentityStatusReply)(nil), // 5: blocks.IdentityStatusReply + (*MallFetchRequest)(nil), // 3: ec_mall_blocks.MallFetchRequest + (*IdentRequest)(nil), // 4: ec_mall_blocks.IdentRequest + (*IdentityStatusReply)(nil), // 5: ec_mall_blocks.IdentityStatusReply } var file_module_ec_mall_proto_ads_proto_depIdxs = []int32{ 2, // 0: mall.AdsListReply.data:type_name -> mall.AdsItem 0, // 1: mall.Ads.ByPos:input_type -> mall.ByPosRequest - 3, // 2: mall.Ads.Fetch:input_type -> blocks.MallFetchRequest + 3, // 2: mall.Ads.Fetch:input_type -> ec_mall_blocks.MallFetchRequest 2, // 3: mall.Ads.Create:input_type -> mall.AdsItem 2, // 4: mall.Ads.Modify:input_type -> mall.AdsItem - 4, // 5: mall.Ads.Delete:input_type -> blocks.IdentRequest + 4, // 5: mall.Ads.Delete:input_type -> ec_mall_blocks.IdentRequest 1, // 6: mall.Ads.ByPos:output_type -> mall.AdsListReply 1, // 7: mall.Ads.Fetch:output_type -> mall.AdsListReply - 5, // 8: mall.Ads.Create:output_type -> blocks.IdentityStatusReply - 5, // 9: mall.Ads.Modify:output_type -> blocks.IdentityStatusReply - 5, // 10: mall.Ads.Delete:output_type -> blocks.IdentityStatusReply + 5, // 8: mall.Ads.Create:output_type -> ec_mall_blocks.IdentityStatusReply + 5, // 9: mall.Ads.Modify:output_type -> ec_mall_blocks.IdentityStatusReply + 5, // 10: mall.Ads.Delete:output_type -> ec_mall_blocks.IdentityStatusReply 6, // [6:11] is the sub-list for method output_type 1, // [1:6] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/ec/mall/pb/category.pb.go b/module/ec/mall/pb/category.pb.go index 0ca7a10..11f2f26 100644 --- a/module/ec/mall/pb/category.pb.go +++ b/module/ec/mall/pb/category.pb.go @@ -312,12 +312,12 @@ const file_module_ec_mall_proto_category_proto_rawDesc = "" + "\n" + "categories\x18\f \x03(\v2\x12.mall.CategoryItemR\n" + "categories\x12\x12\n" + - "\x04keys\x18\r \x01(\tR\x04keys2\xff\x01\n" + + "\x04keys\x18\r \x01(\tR\x04keys2\x9f\x02\n" + "\bCategory\x12:\n" + - "\x05Fetch\x12\x1a.mall.CategoryFetchRequest\x1a\x13.mall.CategoryReply\"\x00\x12;\n" + - "\x06Create\x12\x12.mall.CategoryItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12;\n" + - "\x06Modify\x12\x12.mall.CategoryItem\x1a\x1b.blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" + "\x05Fetch\x12\x1a.mall.CategoryFetchRequest\x1a\x13.mall.CategoryReply\"\x00\x12C\n" + + "\x06Create\x12\x12.mall.CategoryItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12M\n" + + "\x06Delete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12C\n" + + "\x06Modify\x12\x12.mall.CategoryItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" var ( file_module_ec_mall_proto_category_proto_rawDescOnce sync.Once @@ -336,20 +336,20 @@ var file_module_ec_mall_proto_category_proto_goTypes = []any{ (*CategoryFetchRequest)(nil), // 0: mall.CategoryFetchRequest (*CategoryReply)(nil), // 1: mall.CategoryReply (*CategoryItem)(nil), // 2: mall.CategoryItem - (*IdentRequest)(nil), // 3: blocks.IdentRequest - (*IdentityStatusReply)(nil), // 4: blocks.IdentityStatusReply + (*IdentRequest)(nil), // 3: ec_mall_blocks.IdentRequest + (*IdentityStatusReply)(nil), // 4: ec_mall_blocks.IdentityStatusReply } var file_module_ec_mall_proto_category_proto_depIdxs = []int32{ 2, // 0: mall.CategoryReply.data:type_name -> mall.CategoryItem 2, // 1: mall.CategoryItem.categories:type_name -> mall.CategoryItem 0, // 2: mall.Category.Fetch:input_type -> mall.CategoryFetchRequest 2, // 3: mall.Category.Create:input_type -> mall.CategoryItem - 3, // 4: mall.Category.Delete:input_type -> blocks.IdentRequest + 3, // 4: mall.Category.Delete:input_type -> ec_mall_blocks.IdentRequest 2, // 5: mall.Category.Modify:input_type -> mall.CategoryItem 1, // 6: mall.Category.Fetch:output_type -> mall.CategoryReply - 4, // 7: mall.Category.Create:output_type -> blocks.IdentityStatusReply - 4, // 8: mall.Category.Delete:output_type -> blocks.IdentityStatusReply - 4, // 9: mall.Category.Modify:output_type -> blocks.IdentityStatusReply + 4, // 7: mall.Category.Create:output_type -> ec_mall_blocks.IdentityStatusReply + 4, // 8: mall.Category.Delete:output_type -> ec_mall_blocks.IdentityStatusReply + 4, // 9: mall.Category.Modify:output_type -> ec_mall_blocks.IdentityStatusReply 6, // [6:10] is the sub-list for method output_type 2, // [2:6] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name diff --git a/module/ec/mall/pb/const.pb.go b/module/ec/mall/pb/const.pb.go index ceb2ea2..927df8c 100644 --- a/module/ec/mall/pb/const.pb.go +++ b/module/ec/mall/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_ec_mall_proto_const_proto protoreflect.FileDescriptor const file_module_ec_mall_proto_const_proto_rawDesc = "" + "\n" + - " module/ec/mall/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + " module/ec/mall/proto/const.proto\x12\x0eec_mall_blocks\"\a\n" + + "\x05Empty\"\xc3\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12@\n" + + "\x06params\x18\x03 \x03(\v2(.ec_mall_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xfe\x02\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12D\n" + + "\x06params\x18\x03 \x03(\v2,.ec_mall_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xb7\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12F\n" + + "\x06params\x18\x03 \x03(\v2..ec_mall_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe8\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x125\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2\x1f.ec_mall_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd4\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x126\n" + + "\adetails\x18! \x03(\v2\x1c.ec_mall_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"W\n" + + "\x11FeedPostListReply\x120\n" + + "\x04list\x18\x01 \x03(\v2\x1c.ec_mall_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe1\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x128\n" + + "\aattachs\x18\t \x03(\v2\x1e.ec_mall_blocks.FeedAttachItemR\aattachs\x12/\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1b.ec_mall_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"Y\n" + + "\x12GroupPostListReply\x121\n" + + "\x04list\x18\x01 \x03(\v2\x1d.ec_mall_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xf4\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x129\n" + + "\aattachs\x18\t \x03(\v2\x1f.ec_mall_blocks.GroupAttachItemR\aattachs\x120\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\x1c.ec_mall_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_ec_mall_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"`\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x120\n" + + "\x04data\x18\x02 \x03(\v2\x1c.ec_mall_blocks.RelationItemR\x04dataB!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" var ( file_module_ec_mall_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_ec_mall_proto_const_proto_rawDescGZIP() []byte { var file_module_ec_mall_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_ec_mall_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: ec_mall_blocks.Empty + (*FetchRequest)(nil), // 1: ec_mall_blocks.FetchRequest + (*IdentRequest)(nil), // 2: ec_mall_blocks.IdentRequest + (*VersionRequest)(nil), // 3: ec_mall_blocks.VersionRequest + (*SearchRequest)(nil), // 4: ec_mall_blocks.SearchRequest + (*StatusReply)(nil), // 5: ec_mall_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: ec_mall_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: ec_mall_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: ec_mall_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: ec_mall_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: ec_mall_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: ec_mall_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: ec_mall_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: ec_mall_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: ec_mall_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: ec_mall_blocks.IDRequest + (*IDListRequest)(nil), // 16: ec_mall_blocks.IDListRequest + (*StdIicuds)(nil), // 17: ec_mall_blocks.StdIicuds + (*StdPassport)(nil), // 18: ec_mall_blocks.StdPassport + (*CloudBase)(nil), // 19: ec_mall_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: ec_mall_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: ec_mall_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: ec_mall_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: ec_mall_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: ec_mall_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: ec_mall_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: ec_mall_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: ec_mall_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: ec_mall_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: ec_mall_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: ec_mall_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: ec_mall_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: ec_mall_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: ec_mall_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: ec_mall_blocks.GroupTagItem + (*RelationItem)(nil), // 35: ec_mall_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: ec_mall_blocks.FetchRelationItemReply + nil, // 37: ec_mall_blocks.FetchRequest.ParamsEntry + nil, // 38: ec_mall_blocks.MallFetchRequest.ParamsEntry + nil, // 39: ec_mall_blocks.MarketFetchRequest.ParamsEntry } var file_module_ec_mall_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: ec_mall_blocks.FetchRequest.params:type_name -> ec_mall_blocks.FetchRequest.ParamsEntry + 38, // 1: ec_mall_blocks.MallFetchRequest.params:type_name -> ec_mall_blocks.MallFetchRequest.ParamsEntry + 39, // 2: ec_mall_blocks.MarketFetchRequest.params:type_name -> ec_mall_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: ec_mall_blocks.CmsCategoryItem.child:type_name -> ec_mall_blocks.CmsCategoryItem + 26, // 4: ec_mall_blocks.OrderSummaryItem.details:type_name -> ec_mall_blocks.OrderDetails + 28, // 5: ec_mall_blocks.FeedPostListReply.list:type_name -> ec_mall_blocks.FeedPostItem + 29, // 6: ec_mall_blocks.FeedPostItem.attachs:type_name -> ec_mall_blocks.FeedAttachItem + 30, // 7: ec_mall_blocks.FeedPostItem.tags:type_name -> ec_mall_blocks.FeedTagItem + 32, // 8: ec_mall_blocks.GroupPostListReply.list:type_name -> ec_mall_blocks.GroupPostItem + 33, // 9: ec_mall_blocks.GroupPostItem.attachs:type_name -> ec_mall_blocks.GroupAttachItem + 34, // 10: ec_mall_blocks.GroupPostItem.tags:type_name -> ec_mall_blocks.GroupTagItem + 35, // 11: ec_mall_blocks.FetchRelationItemReply.data:type_name -> ec_mall_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/ec/mall/pb/freight.pb.go b/module/ec/mall/pb/freight.pb.go index 4ddfcfd..777e097 100644 --- a/module/ec/mall/pb/freight.pb.go +++ b/module/ec/mall/pb/freight.pb.go @@ -541,17 +541,17 @@ const file_module_ec_mall_proto_freight_proto_rawDesc = "" + "\x04data\x18\x02 \x03(\v2\x11.mall.FreightItemR\x04data\"Q\n" + "\x0fDenyRegionReply\x12\x14\n" + "\x05count\x18\x01 \x01(\x03R\x05count\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.mall.DenyRegionItemR\x04data2\xcf\x04\n" + - "\aFreight\x127\n" + - "\x05Fetch\x12\x18.blocks.MallFetchRequest\x1a\x12.mall.FreightReply\"\x00\x12:\n" + - "\x06Modify\x12\x11.mall.FreightItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12:\n" + - "\x06Create\x12\x11.mall.FreightItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x123\n" + - "\x06Detail\x12\x14.blocks.IdentRequest\x1a\x11.mall.FreightItem\"\x00\x12D\n" + - "\x0fDenyRegionFetch\x12\x18.blocks.MallFetchRequest\x1a\x15.mall.DenyRegionReply\"\x00\x12G\n" + - "\x10DenyRegionCreate\x12\x14.mall.DenyRegionItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12G\n" + - "\x10DenyRegionDelete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12G\n" + - "\x10DenyRegionModify\x12\x14.mall.DenyRegionItem\x1a\x1b.blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" + "\x04data\x18\x02 \x03(\v2\x14.mall.DenyRegionItemR\x04data2\xa7\x05\n" + + "\aFreight\x12?\n" + + "\x05Fetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x12.mall.FreightReply\"\x00\x12B\n" + + "\x06Modify\x12\x11.mall.FreightItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12M\n" + + "\x06Delete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12B\n" + + "\x06Create\x12\x11.mall.FreightItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12;\n" + + "\x06Detail\x12\x1c.ec_mall_blocks.IdentRequest\x1a\x11.mall.FreightItem\"\x00\x12L\n" + + "\x0fDenyRegionFetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x15.mall.DenyRegionReply\"\x00\x12O\n" + + "\x10DenyRegionCreate\x12\x14.mall.DenyRegionItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12W\n" + + "\x10DenyRegionDelete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12O\n" + + "\x10DenyRegionModify\x12\x14.mall.DenyRegionItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" var ( file_module_ec_mall_proto_freight_proto_rawDescOnce sync.Once @@ -573,9 +573,9 @@ var file_module_ec_mall_proto_freight_proto_goTypes = []any{ (*FreightAttrItem)(nil), // 3: mall.FreightAttrItem (*FreightReply)(nil), // 4: mall.FreightReply (*DenyRegionReply)(nil), // 5: mall.DenyRegionReply - (*MallFetchRequest)(nil), // 6: blocks.MallFetchRequest - (*IdentRequest)(nil), // 7: blocks.IdentRequest - (*IdentityStatusReply)(nil), // 8: blocks.IdentityStatusReply + (*MallFetchRequest)(nil), // 6: ec_mall_blocks.MallFetchRequest + (*IdentRequest)(nil), // 7: ec_mall_blocks.IdentRequest + (*IdentityStatusReply)(nil), // 8: ec_mall_blocks.IdentityStatusReply } var file_module_ec_mall_proto_freight_proto_depIdxs = []int32{ 2, // 0: mall.DenyRegionItem.region:type_name -> mall.RegionItem @@ -584,24 +584,24 @@ var file_module_ec_mall_proto_freight_proto_depIdxs = []int32{ 2, // 3: mall.FreightAttrItem.region:type_name -> mall.RegionItem 1, // 4: mall.FreightReply.data:type_name -> mall.FreightItem 0, // 5: mall.DenyRegionReply.data:type_name -> mall.DenyRegionItem - 6, // 6: mall.Freight.Fetch:input_type -> blocks.MallFetchRequest + 6, // 6: mall.Freight.Fetch:input_type -> ec_mall_blocks.MallFetchRequest 1, // 7: mall.Freight.Modify:input_type -> mall.FreightItem - 7, // 8: mall.Freight.Delete:input_type -> blocks.IdentRequest + 7, // 8: mall.Freight.Delete:input_type -> ec_mall_blocks.IdentRequest 1, // 9: mall.Freight.Create:input_type -> mall.FreightItem - 7, // 10: mall.Freight.Detail:input_type -> blocks.IdentRequest - 6, // 11: mall.Freight.DenyRegionFetch:input_type -> blocks.MallFetchRequest + 7, // 10: mall.Freight.Detail:input_type -> ec_mall_blocks.IdentRequest + 6, // 11: mall.Freight.DenyRegionFetch:input_type -> ec_mall_blocks.MallFetchRequest 0, // 12: mall.Freight.DenyRegionCreate:input_type -> mall.DenyRegionItem - 7, // 13: mall.Freight.DenyRegionDelete:input_type -> blocks.IdentRequest + 7, // 13: mall.Freight.DenyRegionDelete:input_type -> ec_mall_blocks.IdentRequest 0, // 14: mall.Freight.DenyRegionModify:input_type -> mall.DenyRegionItem 4, // 15: mall.Freight.Fetch:output_type -> mall.FreightReply - 8, // 16: mall.Freight.Modify:output_type -> blocks.IdentityStatusReply - 8, // 17: mall.Freight.Delete:output_type -> blocks.IdentityStatusReply - 8, // 18: mall.Freight.Create:output_type -> blocks.IdentityStatusReply + 8, // 16: mall.Freight.Modify:output_type -> ec_mall_blocks.IdentityStatusReply + 8, // 17: mall.Freight.Delete:output_type -> ec_mall_blocks.IdentityStatusReply + 8, // 18: mall.Freight.Create:output_type -> ec_mall_blocks.IdentityStatusReply 1, // 19: mall.Freight.Detail:output_type -> mall.FreightItem 5, // 20: mall.Freight.DenyRegionFetch:output_type -> mall.DenyRegionReply - 8, // 21: mall.Freight.DenyRegionCreate:output_type -> blocks.IdentityStatusReply - 8, // 22: mall.Freight.DenyRegionDelete:output_type -> blocks.IdentityStatusReply - 8, // 23: mall.Freight.DenyRegionModify:output_type -> blocks.IdentityStatusReply + 8, // 21: mall.Freight.DenyRegionCreate:output_type -> ec_mall_blocks.IdentityStatusReply + 8, // 22: mall.Freight.DenyRegionDelete:output_type -> ec_mall_blocks.IdentityStatusReply + 8, // 23: mall.Freight.DenyRegionModify:output_type -> ec_mall_blocks.IdentityStatusReply 15, // [15:24] is the sub-list for method output_type 6, // [6:15] is the sub-list for method input_type 6, // [6:6] is the sub-list for extension type_name diff --git a/module/ec/mall/pb/notice.pb.go b/module/ec/mall/pb/notice.pb.go index af97c6d..d3d3d09 100644 --- a/module/ec/mall/pb/notice.pb.go +++ b/module/ec/mall/pb/notice.pb.go @@ -194,12 +194,12 @@ const file_module_ec_mall_proto_notice_proto_rawDesc = "" + "\n" + "created_at\x18\a \x01(\tR\n" + "created_at\x12\x16\n" + - "\x06status\x18\b \x01(\x03R\x06status2\xf9\x01\n" + - "\x06Notice\x12:\n" + - "\x05Fetch\x12\x18.blocks.MallFetchRequest\x1a\x15.mall.NoticeListReply\"\x00\x129\n" + - "\x06Create\x12\x10.mall.NoticeItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x129\n" + - "\x06Modify\x12\x10.mall.NoticeItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" + "\x06status\x18\b \x01(\x03R\x06status2\xa1\x02\n" + + "\x06Notice\x12B\n" + + "\x05Fetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x15.mall.NoticeListReply\"\x00\x12A\n" + + "\x06Create\x12\x10.mall.NoticeItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12A\n" + + "\x06Modify\x12\x10.mall.NoticeItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12M\n" + + "\x06Delete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" var ( file_module_ec_mall_proto_notice_proto_rawDescOnce sync.Once @@ -217,20 +217,20 @@ var file_module_ec_mall_proto_notice_proto_msgTypes = make([]protoimpl.MessageIn var file_module_ec_mall_proto_notice_proto_goTypes = []any{ (*NoticeListReply)(nil), // 0: mall.NoticeListReply (*NoticeItem)(nil), // 1: mall.NoticeItem - (*MallFetchRequest)(nil), // 2: blocks.MallFetchRequest - (*IdentRequest)(nil), // 3: blocks.IdentRequest - (*IdentityStatusReply)(nil), // 4: blocks.IdentityStatusReply + (*MallFetchRequest)(nil), // 2: ec_mall_blocks.MallFetchRequest + (*IdentRequest)(nil), // 3: ec_mall_blocks.IdentRequest + (*IdentityStatusReply)(nil), // 4: ec_mall_blocks.IdentityStatusReply } var file_module_ec_mall_proto_notice_proto_depIdxs = []int32{ 1, // 0: mall.NoticeListReply.data:type_name -> mall.NoticeItem - 2, // 1: mall.Notice.Fetch:input_type -> blocks.MallFetchRequest + 2, // 1: mall.Notice.Fetch:input_type -> ec_mall_blocks.MallFetchRequest 1, // 2: mall.Notice.Create:input_type -> mall.NoticeItem 1, // 3: mall.Notice.Modify:input_type -> mall.NoticeItem - 3, // 4: mall.Notice.Delete:input_type -> blocks.IdentRequest + 3, // 4: mall.Notice.Delete:input_type -> ec_mall_blocks.IdentRequest 0, // 5: mall.Notice.Fetch:output_type -> mall.NoticeListReply - 4, // 6: mall.Notice.Create:output_type -> blocks.IdentityStatusReply - 4, // 7: mall.Notice.Modify:output_type -> blocks.IdentityStatusReply - 4, // 8: mall.Notice.Delete:output_type -> blocks.IdentityStatusReply + 4, // 6: mall.Notice.Create:output_type -> ec_mall_blocks.IdentityStatusReply + 4, // 7: mall.Notice.Modify:output_type -> ec_mall_blocks.IdentityStatusReply + 4, // 8: mall.Notice.Delete:output_type -> ec_mall_blocks.IdentityStatusReply 5, // [5:9] is the sub-list for method output_type 1, // [1:5] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/ec/mall/pb/product.pb.go b/module/ec/mall/pb/product.pb.go index 74031b6..7da50c3 100644 --- a/module/ec/mall/pb/product.pb.go +++ b/module/ec/mall/pb/product.pb.go @@ -2358,38 +2358,37 @@ const file_module_ec_mall_proto_product_proto_rawDesc = "" + "\n" + "categories\x18\" \x03(\v2\x14.mall.CategoriesItemR\n" + "categories\x12 \n" + - "\vsupply_name\x18# \x01(\tR\vsupply_name2\xb7\n" + + "\vsupply_name\x18# \x01(\tR\vsupply_name2\xef\v\n" + + "\aProduct\x12@\n" + + "\tItemFetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x0f.mall.ListReply\"\x00\x12?\n" + "\n" + - "\aProduct\x128\n" + - "\tItemFetch\x12\x18.blocks.MallFetchRequest\x1a\x0f.mall.ListReply\"\x00\x127\n" + + "ItemDetail\x12\x1c.ec_mall_blocks.IdentRequest\x1a\x11.mall.ProductItem\"\x00\x12K\n" + + "\x12ItemDetailBySerial\x12\".ec_mall_blocks.StoreSerialRequest\x1a\x0f.mall.ListReply\"\x00\x12?\n" + + "\x10ItemDetailBySpec\x12\x19.mall.DetailBySpecRequest\x1a\x0e.mall.ListItem\"\x00\x12F\n" + "\n" + - "ItemDetail\x12\x14.blocks.IdentRequest\x1a\x11.mall.ProductItem\"\x00\x12C\n" + - "\x12ItemDetailBySerial\x12\x1a.blocks.StoreSerialRequest\x1a\x0f.mall.ListReply\"\x00\x12?\n" + - "\x10ItemDetailBySpec\x12\x19.mall.DetailBySpecRequest\x1a\x0e.mall.ListItem\"\x00\x12>\n" + + "ItemCreate\x12\x11.mall.ProductItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12Q\n" + "\n" + - "ItemCreate\x12\x11.mall.ProductItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12A\n" + + "ItemDelete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12H\n" + "\n" + - "ItemDelete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12@\n" + + "ItemModify\x12\x13.mall.ModifyRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12E\n" + + "\vItemBatchOp\x12\x0f.mall.OpRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12@\n" + + "\tSpecFetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x0f.mall.SpecReply\"\x00\x12C\n" + "\n" + - "ItemModify\x12\x13.mall.ModifyRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\vItemBatchOp\x12\x0f.mall.OpRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x128\n" + - "\tSpecFetch\x12\x18.blocks.MallFetchRequest\x1a\x0f.mall.SpecReply\"\x00\x12;\n" + + "SpecCreate\x12\x0e.mall.SpecItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12C\n" + "\n" + - "SpecCreate\x12\x0e.mall.SpecItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12;\n" + + "SpecModify\x12\x0e.mall.SpecItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12Q\n" + "\n" + - "SpecModify\x12\x0e.mall.SpecItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12A\n" + + "SpecDelete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12<\n" + "\n" + - "SpecDelete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x124\n" + - "\n" + - "SpecDetail\x12\x14.blocks.IdentRequest\x1a\x0e.mall.SpecItem\"\x00\x12=\n" + - "\vPhotoCreate\x12\x0f.mall.PhotoItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12B\n" + - "\vPhotoDelete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x120\n" + - "\tPhotoList\x12\x0f.mall.PhotoItem\x1a\x10.mall.PhotoReply\"\x00\x12B\n" + - "\fCommentFetch\x12\x18.blocks.MallFetchRequest\x1a\x16.mall.CommentListReply\"\x00\x12A\n" + - "\rCommentCreate\x12\x11.mall.CommentItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\tCommentRe\x12\x11.mall.CommentItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12D\n" + - "\rCommentDelete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12A\n" + - "\rCommentModify\x12\x11.mall.CommentItem\x1a\x1b.blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" + "SpecDetail\x12\x1c.ec_mall_blocks.IdentRequest\x1a\x0e.mall.SpecItem\"\x00\x12E\n" + + "\vPhotoCreate\x12\x0f.mall.PhotoItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12R\n" + + "\vPhotoDelete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x120\n" + + "\tPhotoList\x12\x0f.mall.PhotoItem\x1a\x10.mall.PhotoReply\"\x00\x12J\n" + + "\fCommentFetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x16.mall.CommentListReply\"\x00\x12I\n" + + "\rCommentCreate\x12\x11.mall.CommentItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12E\n" + + "\tCommentRe\x12\x11.mall.CommentItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12T\n" + + "\rCommentDelete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12I\n" + + "\rCommentModify\x12\x11.mall.CommentItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" var ( file_module_ec_mall_proto_product_proto_rawDescOnce sync.Once @@ -2426,10 +2425,10 @@ var file_module_ec_mall_proto_product_proto_goTypes = []any{ (*PhotoItem)(nil), // 18: mall.PhotoItem (*CategoriesItem)(nil), // 19: mall.CategoriesItem (*ProductItem)(nil), // 20: mall.ProductItem - (*MallFetchRequest)(nil), // 21: blocks.MallFetchRequest - (*IdentRequest)(nil), // 22: blocks.IdentRequest - (*StoreSerialRequest)(nil), // 23: blocks.StoreSerialRequest - (*IdentityStatusReply)(nil), // 24: blocks.IdentityStatusReply + (*MallFetchRequest)(nil), // 21: ec_mall_blocks.MallFetchRequest + (*IdentRequest)(nil), // 22: ec_mall_blocks.IdentRequest + (*StoreSerialRequest)(nil), // 23: ec_mall_blocks.StoreSerialRequest + (*IdentityStatusReply)(nil), // 24: ec_mall_blocks.IdentityStatusReply } var file_module_ec_mall_proto_product_proto_depIdxs = []int32{ 1, // 0: mall.CommentItemRep.list:type_name -> mall.CommentItem @@ -2442,48 +2441,48 @@ var file_module_ec_mall_proto_product_proto_depIdxs = []int32{ 18, // 7: mall.ProductItem.images:type_name -> mall.PhotoItem 17, // 8: mall.ProductItem.specification:type_name -> mall.SpecItem 19, // 9: mall.ProductItem.categories:type_name -> mall.CategoriesItem - 21, // 10: mall.Product.ItemFetch:input_type -> blocks.MallFetchRequest - 22, // 11: mall.Product.ItemDetail:input_type -> blocks.IdentRequest - 23, // 12: mall.Product.ItemDetailBySerial:input_type -> blocks.StoreSerialRequest + 21, // 10: mall.Product.ItemFetch:input_type -> ec_mall_blocks.MallFetchRequest + 22, // 11: mall.Product.ItemDetail:input_type -> ec_mall_blocks.IdentRequest + 23, // 12: mall.Product.ItemDetailBySerial:input_type -> ec_mall_blocks.StoreSerialRequest 3, // 13: mall.Product.ItemDetailBySpec:input_type -> mall.DetailBySpecRequest 20, // 14: mall.Product.ItemCreate:input_type -> mall.ProductItem - 22, // 15: mall.Product.ItemDelete:input_type -> blocks.IdentRequest + 22, // 15: mall.Product.ItemDelete:input_type -> ec_mall_blocks.IdentRequest 5, // 16: mall.Product.ItemModify:input_type -> mall.ModifyRequest 4, // 17: mall.Product.ItemBatchOp:input_type -> mall.OpRequest - 21, // 18: mall.Product.SpecFetch:input_type -> blocks.MallFetchRequest + 21, // 18: mall.Product.SpecFetch:input_type -> ec_mall_blocks.MallFetchRequest 17, // 19: mall.Product.SpecCreate:input_type -> mall.SpecItem 17, // 20: mall.Product.SpecModify:input_type -> mall.SpecItem - 22, // 21: mall.Product.SpecDelete:input_type -> blocks.IdentRequest - 22, // 22: mall.Product.SpecDetail:input_type -> blocks.IdentRequest + 22, // 21: mall.Product.SpecDelete:input_type -> ec_mall_blocks.IdentRequest + 22, // 22: mall.Product.SpecDetail:input_type -> ec_mall_blocks.IdentRequest 18, // 23: mall.Product.PhotoCreate:input_type -> mall.PhotoItem - 22, // 24: mall.Product.PhotoDelete:input_type -> blocks.IdentRequest + 22, // 24: mall.Product.PhotoDelete:input_type -> ec_mall_blocks.IdentRequest 18, // 25: mall.Product.PhotoList:input_type -> mall.PhotoItem - 21, // 26: mall.Product.CommentFetch:input_type -> blocks.MallFetchRequest + 21, // 26: mall.Product.CommentFetch:input_type -> ec_mall_blocks.MallFetchRequest 1, // 27: mall.Product.CommentCreate:input_type -> mall.CommentItem 1, // 28: mall.Product.CommentRe:input_type -> mall.CommentItem - 22, // 29: mall.Product.CommentDelete:input_type -> blocks.IdentRequest + 22, // 29: mall.Product.CommentDelete:input_type -> ec_mall_blocks.IdentRequest 1, // 30: mall.Product.CommentModify:input_type -> mall.CommentItem 15, // 31: mall.Product.ItemFetch:output_type -> mall.ListReply 20, // 32: mall.Product.ItemDetail:output_type -> mall.ProductItem 15, // 33: mall.Product.ItemDetailBySerial:output_type -> mall.ListReply 6, // 34: mall.Product.ItemDetailBySpec:output_type -> mall.ListItem - 24, // 35: mall.Product.ItemCreate:output_type -> blocks.IdentityStatusReply - 24, // 36: mall.Product.ItemDelete:output_type -> blocks.IdentityStatusReply - 24, // 37: mall.Product.ItemModify:output_type -> blocks.IdentityStatusReply - 24, // 38: mall.Product.ItemBatchOp:output_type -> blocks.IdentityStatusReply + 24, // 35: mall.Product.ItemCreate:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 36: mall.Product.ItemDelete:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 37: mall.Product.ItemModify:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 38: mall.Product.ItemBatchOp:output_type -> ec_mall_blocks.IdentityStatusReply 10, // 39: mall.Product.SpecFetch:output_type -> mall.SpecReply - 24, // 40: mall.Product.SpecCreate:output_type -> blocks.IdentityStatusReply - 24, // 41: mall.Product.SpecModify:output_type -> blocks.IdentityStatusReply - 24, // 42: mall.Product.SpecDelete:output_type -> blocks.IdentityStatusReply + 24, // 40: mall.Product.SpecCreate:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 41: mall.Product.SpecModify:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 42: mall.Product.SpecDelete:output_type -> ec_mall_blocks.IdentityStatusReply 17, // 43: mall.Product.SpecDetail:output_type -> mall.SpecItem - 24, // 44: mall.Product.PhotoCreate:output_type -> blocks.IdentityStatusReply - 24, // 45: mall.Product.PhotoDelete:output_type -> blocks.IdentityStatusReply + 24, // 44: mall.Product.PhotoCreate:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 45: mall.Product.PhotoDelete:output_type -> ec_mall_blocks.IdentityStatusReply 9, // 46: mall.Product.PhotoList:output_type -> mall.PhotoReply 11, // 47: mall.Product.CommentFetch:output_type -> mall.CommentListReply - 24, // 48: mall.Product.CommentCreate:output_type -> blocks.IdentityStatusReply - 24, // 49: mall.Product.CommentRe:output_type -> blocks.IdentityStatusReply - 24, // 50: mall.Product.CommentDelete:output_type -> blocks.IdentityStatusReply - 24, // 51: mall.Product.CommentModify:output_type -> blocks.IdentityStatusReply + 24, // 48: mall.Product.CommentCreate:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 49: mall.Product.CommentRe:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 50: mall.Product.CommentDelete:output_type -> ec_mall_blocks.IdentityStatusReply + 24, // 51: mall.Product.CommentModify:output_type -> ec_mall_blocks.IdentityStatusReply 31, // [31:52] is the sub-list for method output_type 10, // [10:31] is the sub-list for method input_type 10, // [10:10] is the sub-list for extension type_name diff --git a/module/ec/mall/pb/staff.pb.go b/module/ec/mall/pb/staff.pb.go index c2174ed..e40e5f1 100644 --- a/module/ec/mall/pb/staff.pb.go +++ b/module/ec/mall/pb/staff.pb.go @@ -497,17 +497,17 @@ const file_module_ec_mall_proto_staff_proto_rawDesc = "" + "created_at\"K\n" + "\x0eStaffListReply\x12#\n" + "\x04data\x18\x01 \x03(\v2\x0f.mall.StaffItemR\x04data\x12\x14\n" + - "\x05count\x18\x02 \x01(\x03R\x05count2\xa8\x03\n" + + "\x05count\x18\x02 \x01(\x03R\x05count2\xe0\x03\n" + "\x05Staff\x12/\n" + - "\x05Login\x12\x12.mall.LoginRequest\x1a\x10.mall.LoginReply\"\x00\x129\n" + - "\x05Fetch\x12\x18.blocks.MallFetchRequest\x1a\x14.mall.StaffListReply\"\x00\x128\n" + - "\x06Create\x12\x0f.mall.StaffItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x125\n" + + "\x05Login\x12\x12.mall.LoginRequest\x1a\x10.mall.LoginReply\"\x00\x12A\n" + + "\x05Fetch\x12 .ec_mall_blocks.MallFetchRequest\x1a\x14.mall.StaffListReply\"\x00\x12@\n" + + "\x06Create\x12\x0f.mall.StaffItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12M\n" + + "\x06Delete\x12\x1c.ec_mall_blocks.IdentRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12=\n" + "\n" + - "GetProfile\x12\x14.blocks.IdentRequest\x1a\x0f.mall.StaffItem\"\x00\x12<\n" + + "GetProfile\x12\x1c.ec_mall_blocks.IdentRequest\x1a\x0f.mall.StaffItem\"\x00\x12D\n" + "\n" + - "SetProfile\x12\x0f.mall.StaffItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12E\n" + - "\vSetPassword\x12\x17.mall.SetAccountRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" + "SetProfile\x12\x0f.mall.StaffItem\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12M\n" + + "\vSetPassword\x12\x17.mall.SetAccountRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" var ( file_module_ec_mall_proto_staff_proto_rawDescOnce sync.Once @@ -528,26 +528,26 @@ var file_module_ec_mall_proto_staff_proto_goTypes = []any{ (*SetAccountRequest)(nil), // 2: mall.SetAccountRequest (*StaffItem)(nil), // 3: mall.StaffItem (*StaffListReply)(nil), // 4: mall.StaffListReply - (*MallFetchRequest)(nil), // 5: blocks.MallFetchRequest - (*IdentRequest)(nil), // 6: blocks.IdentRequest - (*IdentityStatusReply)(nil), // 7: blocks.IdentityStatusReply + (*MallFetchRequest)(nil), // 5: ec_mall_blocks.MallFetchRequest + (*IdentRequest)(nil), // 6: ec_mall_blocks.IdentRequest + (*IdentityStatusReply)(nil), // 7: ec_mall_blocks.IdentityStatusReply } var file_module_ec_mall_proto_staff_proto_depIdxs = []int32{ 3, // 0: mall.StaffListReply.data:type_name -> mall.StaffItem 0, // 1: mall.Staff.Login:input_type -> mall.LoginRequest - 5, // 2: mall.Staff.Fetch:input_type -> blocks.MallFetchRequest + 5, // 2: mall.Staff.Fetch:input_type -> ec_mall_blocks.MallFetchRequest 3, // 3: mall.Staff.Create:input_type -> mall.StaffItem - 6, // 4: mall.Staff.Delete:input_type -> blocks.IdentRequest - 6, // 5: mall.Staff.GetProfile:input_type -> blocks.IdentRequest + 6, // 4: mall.Staff.Delete:input_type -> ec_mall_blocks.IdentRequest + 6, // 5: mall.Staff.GetProfile:input_type -> ec_mall_blocks.IdentRequest 3, // 6: mall.Staff.SetProfile:input_type -> mall.StaffItem 2, // 7: mall.Staff.SetPassword:input_type -> mall.SetAccountRequest 1, // 8: mall.Staff.Login:output_type -> mall.LoginReply 4, // 9: mall.Staff.Fetch:output_type -> mall.StaffListReply - 7, // 10: mall.Staff.Create:output_type -> blocks.IdentityStatusReply - 7, // 11: mall.Staff.Delete:output_type -> blocks.IdentityStatusReply + 7, // 10: mall.Staff.Create:output_type -> ec_mall_blocks.IdentityStatusReply + 7, // 11: mall.Staff.Delete:output_type -> ec_mall_blocks.IdentityStatusReply 3, // 12: mall.Staff.GetProfile:output_type -> mall.StaffItem - 7, // 13: mall.Staff.SetProfile:output_type -> blocks.IdentityStatusReply - 7, // 14: mall.Staff.SetPassword:output_type -> blocks.IdentityStatusReply + 7, // 13: mall.Staff.SetProfile:output_type -> ec_mall_blocks.IdentityStatusReply + 7, // 14: mall.Staff.SetPassword:output_type -> ec_mall_blocks.IdentityStatusReply 8, // [8:15] is the sub-list for method output_type 1, // [1:8] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/ec/mall/pb/store.pb.go b/module/ec/mall/pb/store.pb.go index 6e4505c..18c6f1d 100644 --- a/module/ec/mall/pb/store.pb.go +++ b/module/ec/mall/pb/store.pb.go @@ -714,20 +714,20 @@ const file_module_ec_mall_proto_store_proto_rawDesc = "" + "\akeyword\x18\x03 \x01(\tR\akeyword\"M\n" + "\x0fMallSearchReply\x12$\n" + "\x04list\x18\x01 \x03(\v2\x10.mall.StoreBasicR\x04list\x12\x14\n" + - "\x05count\x18\x02 \x01(\x03R\x05count2\xf2\x04\n" + - "\x05Store\x12B\n" + - "\tApplyJoin\x12\x16.mall.ApplyJoinRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12B\n" + - "\tLicensing\x12\x16.mall.LicensingRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x126\n" + + "\x05count\x18\x02 \x01(\x03R\x05count2\xb2\x05\n" + + "\x05Store\x12J\n" + + "\tApplyJoin\x12\x16.mall.ApplyJoinRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12J\n" + + "\tLicensing\x12\x16.mall.LicensingRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12>\n" + "\n" + - "GetSetting\x12\x14.blocks.IdentRequest\x1a\x10.mall.StoreBasic\"\x00\x12=\n" + + "GetSetting\x12\x1c.ec_mall_blocks.IdentRequest\x1a\x10.mall.StoreBasic\"\x00\x12E\n" + "\n" + - "SetSetting\x12\x10.mall.StoreBasic\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12A\n" + + "SetSetting\x12\x10.mall.StoreBasic\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12I\n" + "\n" + - "SetPayment\x12\x14.mall.SettingRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12?\n" + - "\bSetEmail\x12\x14.mall.SettingRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x128\n" + + "SetPayment\x12\x14.mall.SettingRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12G\n" + + "\bSetEmail\x12\x14.mall.SettingRequest\x1a#.ec_mall_blocks.IdentityStatusReply\"\x00\x12@\n" + "\n" + - "GetPayment\x12\x14.blocks.IdentRequest\x1a\x12.mall.ConfigsReply\"\x00\x126\n" + - "\bGetEmail\x12\x14.blocks.IdentRequest\x1a\x12.mall.ConfigsReply\"\x00\x128\n" + + "GetPayment\x12\x1c.ec_mall_blocks.IdentRequest\x1a\x12.mall.ConfigsReply\"\x00\x12>\n" + + "\bGetEmail\x12\x1c.ec_mall_blocks.IdentRequest\x1a\x12.mall.ConfigsReply\"\x00\x128\n" + "\bMiniCode\x12\x15.mall.MiniCodeRequest\x1a\x13.mall.MiniCodeReply\"\x00\x12:\n" + "\x06Search\x12\x17.mall.MallSearchRequest\x1a\x15.mall.MallSearchReply\"\x00B!Z\x1fbsm/full/module/ec/mall/pb;mallb\x06proto3" @@ -754,27 +754,27 @@ var file_module_ec_mall_proto_store_proto_goTypes = []any{ (*MiniCodeReply)(nil), // 6: mall.MiniCodeReply (*MallSearchRequest)(nil), // 7: mall.MallSearchRequest (*MallSearchReply)(nil), // 8: mall.MallSearchReply - (*IdentRequest)(nil), // 9: blocks.IdentRequest - (*IdentityStatusReply)(nil), // 10: blocks.IdentityStatusReply + (*IdentRequest)(nil), // 9: ec_mall_blocks.IdentRequest + (*IdentityStatusReply)(nil), // 10: ec_mall_blocks.IdentityStatusReply } var file_module_ec_mall_proto_store_proto_depIdxs = []int32{ 4, // 0: mall.MallSearchReply.list:type_name -> mall.StoreBasic 3, // 1: mall.Store.ApplyJoin:input_type -> mall.ApplyJoinRequest 2, // 2: mall.Store.Licensing:input_type -> mall.LicensingRequest - 9, // 3: mall.Store.GetSetting:input_type -> blocks.IdentRequest + 9, // 3: mall.Store.GetSetting:input_type -> ec_mall_blocks.IdentRequest 4, // 4: mall.Store.SetSetting:input_type -> mall.StoreBasic 0, // 5: mall.Store.SetPayment:input_type -> mall.SettingRequest 0, // 6: mall.Store.SetEmail:input_type -> mall.SettingRequest - 9, // 7: mall.Store.GetPayment:input_type -> blocks.IdentRequest - 9, // 8: mall.Store.GetEmail:input_type -> blocks.IdentRequest + 9, // 7: mall.Store.GetPayment:input_type -> ec_mall_blocks.IdentRequest + 9, // 8: mall.Store.GetEmail:input_type -> ec_mall_blocks.IdentRequest 5, // 9: mall.Store.MiniCode:input_type -> mall.MiniCodeRequest 7, // 10: mall.Store.Search:input_type -> mall.MallSearchRequest - 10, // 11: mall.Store.ApplyJoin:output_type -> blocks.IdentityStatusReply - 10, // 12: mall.Store.Licensing:output_type -> blocks.IdentityStatusReply + 10, // 11: mall.Store.ApplyJoin:output_type -> ec_mall_blocks.IdentityStatusReply + 10, // 12: mall.Store.Licensing:output_type -> ec_mall_blocks.IdentityStatusReply 4, // 13: mall.Store.GetSetting:output_type -> mall.StoreBasic - 10, // 14: mall.Store.SetSetting:output_type -> blocks.IdentityStatusReply - 10, // 15: mall.Store.SetPayment:output_type -> blocks.IdentityStatusReply - 10, // 16: mall.Store.SetEmail:output_type -> blocks.IdentityStatusReply + 10, // 14: mall.Store.SetSetting:output_type -> ec_mall_blocks.IdentityStatusReply + 10, // 15: mall.Store.SetPayment:output_type -> ec_mall_blocks.IdentityStatusReply + 10, // 16: mall.Store.SetEmail:output_type -> ec_mall_blocks.IdentityStatusReply 1, // 17: mall.Store.GetPayment:output_type -> mall.ConfigsReply 1, // 18: mall.Store.GetEmail:output_type -> mall.ConfigsReply 6, // 19: mall.Store.MiniCode:output_type -> mall.MiniCodeReply diff --git a/module/ec/mall/proto/ads.proto b/module/ec/mall/proto/ads.proto index 8a555e5..7acf6b4 100644 --- a/module/ec/mall/proto/ads.proto +++ b/module/ec/mall/proto/ads.proto @@ -9,16 +9,16 @@ service Ads{ rpc ByPos(ByPosRequest) returns (AdsListReply) {} // 广告列表 - rpc Fetch(blocks.MallFetchRequest) returns (AdsListReply){}; + rpc Fetch(ec_mall_blocks.MallFetchRequest) returns (AdsListReply){}; // 新建广告 - rpc Create (AdsItem) returns (blocks.IdentityStatusReply){}; + rpc Create (AdsItem) returns (ec_mall_blocks.IdentityStatusReply){}; // 修改广告 - rpc Modify (AdsItem) returns (blocks.IdentityStatusReply){}; + rpc Modify (AdsItem) returns (ec_mall_blocks.IdentityStatusReply){}; // 删除广告 - rpc Delete (blocks.IdentRequest) returns (blocks.IdentityStatusReply){}; + rpc Delete (ec_mall_blocks.IdentRequest) returns (ec_mall_blocks.IdentityStatusReply){}; } message ByPosRequest{ repeated string pos_key = 1 [json_name="pos_key"]; @@ -40,4 +40,4 @@ message AdsItem{ string to_url = 6 [json_name="to_url"];// 跳转链接 string created_at = 7 [json_name="created_at"];// 创建时间 int64 status = 8;// 状态：默认为0，-1禁止，1为正常 -} \ No newline at end of file +} diff --git a/module/ec/mall/proto/category.proto b/module/ec/mall/proto/category.proto index 152badd..f653e18 100644 --- a/module/ec/mall/proto/category.proto +++ b/module/ec/mall/proto/category.proto @@ -9,13 +9,13 @@ service Category{ rpc Fetch(CategoryFetchRequest) returns(CategoryReply) {}; // 添加分类 - rpc Create(CategoryItem) returns(blocks.IdentityStatusReply) {}; + rpc Create(CategoryItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 删除分类 - rpc Delete(blocks.IdentRequest) returns(blocks.IdentityStatusReply) {}; + rpc Delete(ec_mall_blocks.IdentRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 修改分类 - rpc Modify(CategoryItem) returns(blocks.IdentityStatusReply) {}; + rpc Modify(CategoryItem) returns(ec_mall_blocks.IdentityStatusReply) {}; } @@ -45,4 +45,4 @@ message CategoryItem{ string created_at = 11 [json_name="created_at"]; // 创建时间 repeated CategoryItem categories = 12; // 子集 string keys = 13; //关键词 -} \ No newline at end of file +} diff --git a/module/ec/mall/proto/const.proto b/module/ec/mall/proto/const.proto index 702cc00..f4aa473 100644 --- a/module/ec/mall/proto/const.proto +++ b/module/ec/mall/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package ec_mall_blocks; option go_package = "bsm/full/module/ec/mall/pb;mall"; diff --git a/module/ec/mall/proto/freight.proto b/module/ec/mall/proto/freight.proto index 801e54d..50592c0 100644 --- a/module/ec/mall/proto/freight.proto +++ b/module/ec/mall/proto/freight.proto @@ -6,31 +6,31 @@ import "module/ec/mall/proto/const.proto"; // 运费设置相关 service Freight{ // 运费模板列表 - rpc Fetch(blocks.MallFetchRequest) returns(FreightReply) {}; + rpc Fetch(ec_mall_blocks.MallFetchRequest) returns(FreightReply) {}; // 运费模板修改 - rpc Modify(FreightItem) returns(blocks.IdentityStatusReply) {}; + rpc Modify(FreightItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 运费模板删除 - rpc Delete(blocks.IdentRequest) returns(blocks.IdentityStatusReply) {}; + rpc Delete(ec_mall_blocks.IdentRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 运费模板创建 - rpc Create(FreightItem) returns(blocks.IdentityStatusReply) {}; + rpc Create(FreightItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 运费模板详情 - rpc Detail(blocks.IdentRequest) returns(FreightItem) {}; + rpc Detail(ec_mall_blocks.IdentRequest) returns(FreightItem) {}; // 限制区域列表 - rpc DenyRegionFetch (blocks.MallFetchRequest) returns(DenyRegionReply) {}; + rpc DenyRegionFetch (ec_mall_blocks.MallFetchRequest) returns(DenyRegionReply) {}; // 新建限制区域 - rpc DenyRegionCreate (DenyRegionItem) returns(blocks.IdentityStatusReply) {}; + rpc DenyRegionCreate (DenyRegionItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 移除限制区域 - rpc DenyRegionDelete (blocks.IdentRequest) returns(blocks.IdentityStatusReply) {}; + rpc DenyRegionDelete (ec_mall_blocks.IdentRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 编辑限制区域 - rpc DenyRegionModify (DenyRegionItem) returns(blocks.IdentityStatusReply) {}; + rpc DenyRegionModify (DenyRegionItem) returns(ec_mall_blocks.IdentityStatusReply) {}; } @@ -82,4 +82,4 @@ message FreightReply{ message DenyRegionReply{ int64 count = 1; repeated DenyRegionItem data = 2; -} \ No newline at end of file +} diff --git a/module/ec/mall/proto/notice.proto b/module/ec/mall/proto/notice.proto index 750aa3f..13e9404 100644 --- a/module/ec/mall/proto/notice.proto +++ b/module/ec/mall/proto/notice.proto @@ -6,16 +6,16 @@ import "module/ec/mall/proto/const.proto"; // Store(店铺)微服务-公告 service Notice{ // 公告列表 - rpc Fetch(blocks.MallFetchRequest) returns (NoticeListReply){}; + rpc Fetch(ec_mall_blocks.MallFetchRequest) returns (NoticeListReply){}; // 新建公告 - rpc Create (NoticeItem) returns (blocks.IdentityStatusReply){}; + rpc Create (NoticeItem) returns (ec_mall_blocks.IdentityStatusReply){}; // 修改公告 - rpc Modify (NoticeItem) returns (blocks.IdentityStatusReply){}; + rpc Modify (NoticeItem) returns (ec_mall_blocks.IdentityStatusReply){}; // 删除公告 - rpc Delete (blocks.IdentRequest) returns (blocks.IdentityStatusReply){}; + rpc Delete (ec_mall_blocks.IdentRequest) returns (ec_mall_blocks.IdentityStatusReply){}; } // 公告列表 diff --git a/module/ec/mall/proto/product.proto b/module/ec/mall/proto/product.proto index bebe4bb..31348c2 100644 --- a/module/ec/mall/proto/product.proto +++ b/module/ec/mall/proto/product.proto @@ -6,67 +6,67 @@ import "module/ec/mall/proto/const.proto"; // 产品相关 service Product{ // 获取产品列表 - rpc ItemFetch(blocks.MallFetchRequest) returns(ListReply) {}; + rpc ItemFetch(ec_mall_blocks.MallFetchRequest) returns(ListReply) {}; // 获取产品详情 - rpc ItemDetail(blocks.IdentRequest) returns(ProductItem) {}; + rpc ItemDetail(ec_mall_blocks.IdentRequest) returns(ProductItem) {}; // 通过产品序列获取产品详情 - rpc ItemDetailBySerial(blocks.StoreSerialRequest) returns(ListReply) {}; + rpc ItemDetailBySerial(ec_mall_blocks.StoreSerialRequest) returns(ListReply) {}; // 通过规格编号获取产品详情 rpc ItemDetailBySpec(DetailBySpecRequest) returns(ListItem) {}; // 添加产品 - rpc ItemCreate(ProductItem) returns(blocks.IdentityStatusReply) {}; + rpc ItemCreate(ProductItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 删除产品 - rpc ItemDelete(blocks.IdentRequest) returns(blocks.IdentityStatusReply) {}; + rpc ItemDelete(ec_mall_blocks.IdentRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 发布/取消发布 产品 - rpc ItemModify(ModifyRequest) returns(blocks.IdentityStatusReply) {}; + rpc ItemModify(ModifyRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 批量操作 - rpc ItemBatchOp(OpRequest) returns(blocks.IdentityStatusReply) {}; + rpc ItemBatchOp(OpRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 产品规格列表 - rpc SpecFetch(blocks.MallFetchRequest) returns(SpecReply) {}; + rpc SpecFetch(ec_mall_blocks.MallFetchRequest) returns(SpecReply) {}; // 添加产品规格 - rpc SpecCreate(SpecItem) returns(blocks.IdentityStatusReply) {}; + rpc SpecCreate(SpecItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 修改产品规格 - rpc SpecModify(SpecItem) returns(blocks.IdentityStatusReply) {}; + rpc SpecModify(SpecItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 删除产品规格 - rpc SpecDelete(blocks.IdentRequest) returns(blocks.IdentityStatusReply) {}; + rpc SpecDelete(ec_mall_blocks.IdentRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 产品详情 - rpc SpecDetail(blocks.IdentRequest) returns(SpecItem) {}; + rpc SpecDetail(ec_mall_blocks.IdentRequest) returns(SpecItem) {}; // 添加产品图片 - rpc PhotoCreate(PhotoItem) returns(blocks.IdentityStatusReply){}; + rpc PhotoCreate(PhotoItem) returns(ec_mall_blocks.IdentityStatusReply){}; // 删除产品图片 - rpc PhotoDelete(blocks.IdentRequest) returns(blocks.IdentityStatusReply){}; + rpc PhotoDelete(ec_mall_blocks.IdentRequest) returns(ec_mall_blocks.IdentityStatusReply){}; // 产品图片列表 rpc PhotoList(PhotoItem) returns(PhotoReply){}; // 产品的评论列表 - rpc CommentFetch(blocks.MallFetchRequest) returns (CommentListReply) {}; + rpc CommentFetch(ec_mall_blocks.MallFetchRequest) returns (CommentListReply) {}; // 评论 - rpc CommentCreate(CommentItem) returns(blocks.IdentityStatusReply) {}; + rpc CommentCreate(CommentItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 回复评论 - rpc CommentRe(CommentItem) returns(blocks.IdentityStatusReply) {}; + rpc CommentRe(CommentItem) returns(ec_mall_blocks.IdentityStatusReply) {}; // 删除评论 - rpc CommentDelete(blocks.IdentRequest) returns(blocks.IdentityStatusReply) {}; + rpc CommentDelete(ec_mall_blocks.IdentRequest) returns(ec_mall_blocks.IdentityStatusReply) {}; // 修改评论 - rpc CommentModify(CommentItem) returns(blocks.IdentityStatusReply) {}; + rpc CommentModify(CommentItem) returns(ec_mall_blocks.IdentityStatusReply) {}; } @@ -299,4 +299,4 @@ message ProductItem{ repeated int64 spec_id = 33 [json_name="spec_id"]; // 规格ID repeated CategoriesItem categories = 34;// 分类 string supply_name = 35 [json_name="supply_name"];// 供应商名称 -} \ No newline at end of file +} diff --git a/module/ec/mall/proto/staff.proto b/module/ec/mall/proto/staff.proto index e1f8c02..f81ede9 100644 --- a/module/ec/mall/proto/staff.proto +++ b/module/ec/mall/proto/staff.proto @@ -9,22 +9,22 @@ service Staff { rpc Login(LoginRequest) returns (LoginReply) {} // 获取工作人员列表 - rpc Fetch(blocks.MallFetchRequest) returns (StaffListReply) {} + rpc Fetch(ec_mall_blocks.MallFetchRequest) returns (StaffListReply) {} // 创建工作人员 - rpc Create(StaffItem) returns (blocks.IdentityStatusReply) {} + rpc Create(StaffItem) returns (ec_mall_blocks.IdentityStatusReply) {} // 删除工作人员 - rpc Delete(blocks.IdentRequest) returns (blocks.IdentityStatusReply) {} + rpc Delete(ec_mall_blocks.IdentRequest) returns (ec_mall_blocks.IdentityStatusReply) {} // 获取个人信息 - rpc GetProfile(blocks.IdentRequest) returns (StaffItem) {} + rpc GetProfile(ec_mall_blocks.IdentRequest) returns (StaffItem) {} // 设置个人信息 - rpc SetProfile(StaffItem) returns (blocks.IdentityStatusReply) {} + rpc SetProfile(StaffItem) returns (ec_mall_blocks.IdentityStatusReply) {} // 设置账号密码 - rpc SetPassword(SetAccountRequest) returns (blocks.IdentityStatusReply) {} + rpc SetPassword(SetAccountRequest) returns (ec_mall_blocks.IdentityStatusReply) {} } message LoginRequest { @@ -71,4 +71,4 @@ message StaffItem { message StaffListReply { repeated StaffItem data = 1; int64 count = 2; -} \ No newline at end of file +} diff --git a/module/ec/mall/proto/store.proto b/module/ec/mall/proto/store.proto index 083af67..232a333 100644 --- a/module/ec/mall/proto/store.proto +++ b/module/ec/mall/proto/store.proto @@ -7,28 +7,28 @@ import "module/ec/mall/proto/const.proto"; service Store { // 申请加入店铺 - rpc ApplyJoin(ApplyJoinRequest) returns (blocks.IdentityStatusReply) {}; + rpc ApplyJoin(ApplyJoinRequest) returns (ec_mall_blocks.IdentityStatusReply) {}; // 店铺许可授权 - rpc Licensing(LicensingRequest) returns (blocks.IdentityStatusReply) {} + rpc Licensing(LicensingRequest) returns (ec_mall_blocks.IdentityStatusReply) {} // 获取店铺基础配置 - rpc GetSetting(blocks.IdentRequest) returns(StoreBasic){}; + rpc GetSetting(ec_mall_blocks.IdentRequest) returns(StoreBasic){}; // 设置店铺基础配置 - rpc SetSetting(StoreBasic) returns(blocks.IdentityStatusReply){}; + rpc SetSetting(StoreBasic) returns(ec_mall_blocks.IdentityStatusReply){}; // 设置支付方式配置 - rpc SetPayment(SettingRequest) returns(blocks.IdentityStatusReply){} + rpc SetPayment(SettingRequest) returns(ec_mall_blocks.IdentityStatusReply){} // 设置邮件服务器配置 - rpc SetEmail(SettingRequest) returns(blocks.IdentityStatusReply){} + rpc SetEmail(SettingRequest) returns(ec_mall_blocks.IdentityStatusReply){} // 获取支付方式配置 - rpc GetPayment(blocks.IdentRequest) returns(ConfigsReply){} + rpc GetPayment(ec_mall_blocks.IdentRequest) returns(ConfigsReply){} // 获取邮件服务器配置 - rpc GetEmail(blocks.IdentRequest) returns(ConfigsReply){} + rpc GetEmail(ec_mall_blocks.IdentRequest) returns(ConfigsReply){} // 获取小程序推荐码 rpc MiniCode(MiniCodeRequest) returns(MiniCodeReply) {}; diff --git a/module/ec/mall/service/expose.go b/module/ec/mall/service/expose.go new file mode 100644 index 0000000..0c76d76 --- /dev/null +++ b/module/ec/mall/service/expose.go @@ -0,0 +1,43 @@ +package service + +import ( + "context" + + "bsm/full/module/ec/mall/internal/server" + pb "bsm/full/module/ec/mall/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterAdsHandlerServer(ctx, options.Gateway, server.NewAdsServer()); err != nil { + return err + } + if err := pb.RegisterCategoryHandlerServer(ctx, options.Gateway, server.NewCategoryServer()); err != nil { + return err + } + if err := pb.RegisterFreightHandlerServer(ctx, options.Gateway, server.NewFreightServer()); err != nil { + return err + } + if err := pb.RegisterNoticeHandlerServer(ctx, options.Gateway, server.NewNoticeServer()); err != nil { + return err + } + if err := pb.RegisterProductHandlerServer(ctx, options.Gateway, server.NewProductServer()); err != nil { + return err + } + if err := pb.RegisterStaffHandlerServer(ctx, options.Gateway, server.NewStaffServer()); err != nil { + return err + } + if err := pb.RegisterStoreHandlerServer(ctx, options.Gateway, server.NewStoreServer()); err != nil { + return err + } + return nil +} diff --git a/module/ec/market/cmd/main/main.go b/module/ec/market/cmd/main/main.go index aea533c..ebb46d6 100644 --- a/module/ec/market/cmd/main/main.go +++ b/module/ec/market/cmd/main/main.go @@ -2,7 +2,7 @@ * @Author: david.yan(david.yan@qq.com) * @Date: 2021-11-26 15:25:03 */ -package service +package main import ( "bsm/full/module/ec/market/internal/config" @@ -20,7 +20,7 @@ func Run() { impl.NewImpl() // 初始化服务 - s := server.New(config.Spec.Addr) + s := server.New(nil) srv := service.New( s.Grpc, &service.Options{ diff --git a/module/ec/market/internal/server/new.go b/module/ec/market/internal/server/new.go index 605d07b..c802c7d 100644 --- a/module/ec/market/internal/server/new.go +++ b/module/ec/market/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -29,7 +34,9 @@ func New(addr string) *Server { pb.RegisterDataServer(srv.Grpc, NewDataServer()) pb.RegisterSupplyServer(srv.Grpc, NewSupplyServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/ec/market/pb/agency.pb.go b/module/ec/market/pb/agency.pb.go index 277521e..a70a35d 100644 --- a/module/ec/market/pb/agency.pb.go +++ b/module/ec/market/pb/agency.pb.go @@ -483,17 +483,17 @@ const file_module_ec_market_proto_agency_proto_rawDesc = "" + "\x04data\x18\x02 \x03(\v2\x19.market.MarketAgenctyItemR\x04data\"F\n" + "\x0eApproveRequest\x12\x18\n" + "\aapprove\x18\x01 \x01(\x05R\aapprove\x12\x1a\n" + - "\bidentity\x18\x02 \x01(\tR\bidentity2\xca\x04\n" + - "\x06Agency\x129\n" + - "\x05Login\x12\x14.market.LoginRequest\x1a\x18.blocks.MarketLoginReply\"\x00\x12B\n" + - "\x06Create\x12\x19.market.MarketAgenctyItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x128\n" + - "\x03Get\x12\x14.blocks.IdentRequest\x1a\x19.market.MarketAgenctyItem\"\x00\x12:\n" + - "\x05Fetch\x12\x1a.blocks.MarketFetchRequest\x1a\x13.market.AgencyReply\"\x00\x12B\n" + - "\x06Modify\x12\x19.market.MarketAgenctyItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12H\n" + - "\vSetPassword\x12\x1a.market.SetPasswordRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12<\n" + - "\aPending\x12\x1a.blocks.MarketFetchRequest\x1a\x13.market.AgencyReply\"\x00\x12@\n" + - "\aApprove\x12\x16.market.ApproveRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00B%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" + "\bidentity\x18\x02 \x01(\tR\bidentity2\xae\x05\n" + + "\x06Agency\x12C\n" + + "\x05Login\x12\x14.market.LoginRequest\x1a\".ec_market_blocks.MarketLoginReply\"\x00\x12L\n" + + "\x06Create\x12\x19.market.MarketAgenctyItem\x1a%.ec_market_blocks.IdentityStatusReply\"\x00\x12B\n" + + "\x03Get\x12\x1e.ec_market_blocks.IdentRequest\x1a\x19.market.MarketAgenctyItem\"\x00\x12D\n" + + "\x05Fetch\x12$.ec_market_blocks.MarketFetchRequest\x1a\x13.market.AgencyReply\"\x00\x12L\n" + + "\x06Modify\x12\x19.market.MarketAgenctyItem\x1a%.ec_market_blocks.IdentityStatusReply\"\x00\x12Q\n" + + "\x06Delete\x12\x1e.ec_market_blocks.IdentRequest\x1a%.ec_market_blocks.IdentityStatusReply\"\x00\x12R\n" + + "\vSetPassword\x12\x1a.market.SetPasswordRequest\x1a%.ec_market_blocks.IdentityStatusReply\"\x00\x12F\n" + + "\aPending\x12$.ec_market_blocks.MarketFetchRequest\x1a\x13.market.AgencyReply\"\x00\x12J\n" + + "\aApprove\x12\x16.market.ApproveRequest\x1a%.ec_market_blocks.IdentityStatusReply\"\x00B%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" var ( file_module_ec_market_proto_agency_proto_rawDescOnce sync.Once @@ -514,31 +514,31 @@ var file_module_ec_market_proto_agency_proto_goTypes = []any{ (*SetPasswordRequest)(nil), // 2: market.SetPasswordRequest (*AgencyReply)(nil), // 3: market.AgencyReply (*ApproveRequest)(nil), // 4: market.ApproveRequest - (*IdentRequest)(nil), // 5: blocks.IdentRequest - (*MarketFetchRequest)(nil), // 6: blocks.MarketFetchRequest - (*MarketLoginReply)(nil), // 7: blocks.MarketLoginReply - (*IdentityStatusReply)(nil), // 8: blocks.IdentityStatusReply + (*IdentRequest)(nil), // 5: ec_market_blocks.IdentRequest + (*MarketFetchRequest)(nil), // 6: ec_market_blocks.MarketFetchRequest + (*MarketLoginReply)(nil), // 7: ec_market_blocks.MarketLoginReply + (*IdentityStatusReply)(nil), // 8: ec_market_blocks.IdentityStatusReply } var file_module_ec_market_proto_agency_proto_depIdxs = []int32{ 1, // 0: market.AgencyReply.data:type_name -> market.MarketAgenctyItem 0, // 1: market.Agency.Login:input_type -> market.LoginRequest 1, // 2: market.Agency.Create:input_type -> market.MarketAgenctyItem - 5, // 3: market.Agency.Get:input_type -> blocks.IdentRequest - 6, // 4: market.Agency.Fetch:input_type -> blocks.MarketFetchRequest + 5, // 3: market.Agency.Get:input_type -> ec_market_blocks.IdentRequest + 6, // 4: market.Agency.Fetch:input_type -> ec_market_blocks.MarketFetchRequest 1, // 5: market.Agency.Modify:input_type -> market.MarketAgenctyItem - 5, // 6: market.Agency.Delete:input_type -> blocks.IdentRequest + 5, // 6: market.Agency.Delete:input_type -> ec_market_blocks.IdentRequest 2, // 7: market.Agency.SetPassword:input_type -> market.SetPasswordRequest - 6, // 8: market.Agency.Pending:input_type -> blocks.MarketFetchRequest + 6, // 8: market.Agency.Pending:input_type -> ec_market_blocks.MarketFetchRequest 4, // 9: market.Agency.Approve:input_type -> market.ApproveRequest - 7, // 10: market.Agency.Login:output_type -> blocks.MarketLoginReply - 8, // 11: market.Agency.Create:output_type -> blocks.IdentityStatusReply + 7, // 10: market.Agency.Login:output_type -> ec_market_blocks.MarketLoginReply + 8, // 11: market.Agency.Create:output_type -> ec_market_blocks.IdentityStatusReply 1, // 12: market.Agency.Get:output_type -> market.MarketAgenctyItem 3, // 13: market.Agency.Fetch:output_type -> market.AgencyReply - 8, // 14: market.Agency.Modify:output_type -> blocks.IdentityStatusReply - 8, // 15: market.Agency.Delete:output_type -> blocks.IdentityStatusReply - 8, // 16: market.Agency.SetPassword:output_type -> blocks.IdentityStatusReply + 8, // 14: market.Agency.Modify:output_type -> ec_market_blocks.IdentityStatusReply + 8, // 15: market.Agency.Delete:output_type -> ec_market_blocks.IdentityStatusReply + 8, // 16: market.Agency.SetPassword:output_type -> ec_market_blocks.IdentityStatusReply 3, // 17: market.Agency.Pending:output_type -> market.AgencyReply - 8, // 18: market.Agency.Approve:output_type -> blocks.IdentityStatusReply + 8, // 18: market.Agency.Approve:output_type -> ec_market_blocks.IdentityStatusReply 10, // [10:19] is the sub-list for method output_type 1, // [1:10] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/ec/market/pb/const.pb.go b/module/ec/market/pb/const.pb.go index 4521cb2..76dee3c 100644 --- a/module/ec/market/pb/const.pb.go +++ b/module/ec/market/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_ec_market_proto_const_proto protoreflect.FileDescriptor const file_module_ec_market_proto_const_proto_rawDesc = "" + "\n" + - "\"module/ec/market/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "\"module/ec/market/proto/const.proto\x12\x10ec_market_blocks\"\a\n" + + "\x05Empty\"\xc5\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12B\n" + + "\x06params\x18\x03 \x03(\v2*.ec_market_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x80\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12F\n" + + "\x06params\x18\x03 \x03(\v2..ec_market_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xb9\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12H\n" + + "\x06params\x18\x03 \x03(\v20.ec_market_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xea\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x127\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2!.ec_market_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd6\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x128\n" + + "\adetails\x18! \x03(\v2\x1e.ec_market_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"Y\n" + + "\x11FeedPostListReply\x122\n" + + "\x04list\x18\x01 \x03(\v2\x1e.ec_market_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe5\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12:\n" + + "\aattachs\x18\t \x03(\v2 .ec_market_blocks.FeedAttachItemR\aattachs\x121\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1d.ec_market_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"[\n" + + "\x12GroupPostListReply\x123\n" + + "\x04list\x18\x01 \x03(\v2\x1f.ec_market_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xf8\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12;\n" + + "\aattachs\x18\t \x03(\v2!.ec_market_blocks.GroupAttachItemR\aattachs\x122\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\x1e.ec_market_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_ec_market_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"b\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x122\n" + + "\x04data\x18\x02 \x03(\v2\x1e.ec_market_blocks.RelationItemR\x04dataB%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" var ( file_module_ec_market_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_ec_market_proto_const_proto_rawDescGZIP() []byte { var file_module_ec_market_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_ec_market_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: ec_market_blocks.Empty + (*FetchRequest)(nil), // 1: ec_market_blocks.FetchRequest + (*IdentRequest)(nil), // 2: ec_market_blocks.IdentRequest + (*VersionRequest)(nil), // 3: ec_market_blocks.VersionRequest + (*SearchRequest)(nil), // 4: ec_market_blocks.SearchRequest + (*StatusReply)(nil), // 5: ec_market_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: ec_market_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: ec_market_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: ec_market_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: ec_market_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: ec_market_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: ec_market_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: ec_market_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: ec_market_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: ec_market_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: ec_market_blocks.IDRequest + (*IDListRequest)(nil), // 16: ec_market_blocks.IDListRequest + (*StdIicuds)(nil), // 17: ec_market_blocks.StdIicuds + (*StdPassport)(nil), // 18: ec_market_blocks.StdPassport + (*CloudBase)(nil), // 19: ec_market_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: ec_market_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: ec_market_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: ec_market_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: ec_market_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: ec_market_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: ec_market_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: ec_market_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: ec_market_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: ec_market_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: ec_market_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: ec_market_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: ec_market_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: ec_market_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: ec_market_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: ec_market_blocks.GroupTagItem + (*RelationItem)(nil), // 35: ec_market_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: ec_market_blocks.FetchRelationItemReply + nil, // 37: ec_market_blocks.FetchRequest.ParamsEntry + nil, // 38: ec_market_blocks.MallFetchRequest.ParamsEntry + nil, // 39: ec_market_blocks.MarketFetchRequest.ParamsEntry } var file_module_ec_market_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: ec_market_blocks.FetchRequest.params:type_name -> ec_market_blocks.FetchRequest.ParamsEntry + 38, // 1: ec_market_blocks.MallFetchRequest.params:type_name -> ec_market_blocks.MallFetchRequest.ParamsEntry + 39, // 2: ec_market_blocks.MarketFetchRequest.params:type_name -> ec_market_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: ec_market_blocks.CmsCategoryItem.child:type_name -> ec_market_blocks.CmsCategoryItem + 26, // 4: ec_market_blocks.OrderSummaryItem.details:type_name -> ec_market_blocks.OrderDetails + 28, // 5: ec_market_blocks.FeedPostListReply.list:type_name -> ec_market_blocks.FeedPostItem + 29, // 6: ec_market_blocks.FeedPostItem.attachs:type_name -> ec_market_blocks.FeedAttachItem + 30, // 7: ec_market_blocks.FeedPostItem.tags:type_name -> ec_market_blocks.FeedTagItem + 32, // 8: ec_market_blocks.GroupPostListReply.list:type_name -> ec_market_blocks.GroupPostItem + 33, // 9: ec_market_blocks.GroupPostItem.attachs:type_name -> ec_market_blocks.GroupAttachItem + 34, // 10: ec_market_blocks.GroupPostItem.tags:type_name -> ec_market_blocks.GroupTagItem + 35, // 11: ec_market_blocks.FetchRelationItemReply.data:type_name -> ec_market_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/ec/market/pb/data.pb.go b/module/ec/market/pb/data.pb.go index adffe4f..4548927 100644 --- a/module/ec/market/pb/data.pb.go +++ b/module/ec/market/pb/data.pb.go @@ -238,14 +238,14 @@ const file_module_ec_market_proto_data_proto_rawDesc = "" + "\x04data\x18\x02 \x03(\v2\x0e.market.KeyValR\x04data\",\n" + "\x06KeyVal\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x10\n" + - "\x03val\x18\x02 \x01(\tR\x03val2\xaa\x02\n" + - "\x04Data\x122\n" + - "\bOverview\x12\r.blocks.Empty\x1a\x15.market.OverviewReply\"\x00\x12>\n" + - "\vMemberFetch\x12\x1a.blocks.MarketFetchRequest\x1a\x11.market.DataReply\"\x00\x127\n" + - "\rMemberDetails\x12\x14.blocks.IdentRequest\x1a\x0e.market.KeyVal\"\x00\x12=\n" + + "\x03val\x18\x02 \x01(\tR\x03val2\xdc\x02\n" + + "\x04Data\x12<\n" + + "\bOverview\x12\x17.ec_market_blocks.Empty\x1a\x15.market.OverviewReply\"\x00\x12H\n" + + "\vMemberFetch\x12$.ec_market_blocks.MarketFetchRequest\x1a\x11.market.DataReply\"\x00\x12A\n" + + "\rMemberDetails\x12\x1e.ec_market_blocks.IdentRequest\x1a\x0e.market.KeyVal\"\x00\x12G\n" + "\n" + - "OrderFetch\x12\x1a.blocks.MarketFetchRequest\x1a\x11.market.DataReply\"\x00\x126\n" + - "\fOrderDetails\x12\x14.blocks.IdentRequest\x1a\x0e.market.KeyVal\"\x00B%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" + "OrderFetch\x12$.ec_market_blocks.MarketFetchRequest\x1a\x11.market.DataReply\"\x00\x12@\n" + + "\fOrderDetails\x12\x1e.ec_market_blocks.IdentRequest\x1a\x0e.market.KeyVal\"\x00B%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" var ( file_module_ec_market_proto_data_proto_rawDescOnce sync.Once @@ -266,19 +266,19 @@ var file_module_ec_market_proto_data_proto_goTypes = []any{ (*KeyVal)(nil), // 2: market.KeyVal nil, // 3: market.OverviewReply.ReportMonthEntry nil, // 4: market.OverviewReply.ReportStaffEntry - (*Empty)(nil), // 5: blocks.Empty - (*MarketFetchRequest)(nil), // 6: blocks.MarketFetchRequest - (*IdentRequest)(nil), // 7: blocks.IdentRequest + (*Empty)(nil), // 5: ec_market_blocks.Empty + (*MarketFetchRequest)(nil), // 6: ec_market_blocks.MarketFetchRequest + (*IdentRequest)(nil), // 7: ec_market_blocks.IdentRequest } var file_module_ec_market_proto_data_proto_depIdxs = []int32{ 3, // 0: market.OverviewReply.report_month:type_name -> market.OverviewReply.ReportMonthEntry 4, // 1: market.OverviewReply.report_staff:type_name -> market.OverviewReply.ReportStaffEntry 2, // 2: market.DataReply.data:type_name -> market.KeyVal - 5, // 3: market.Data.Overview:input_type -> blocks.Empty - 6, // 4: market.Data.MemberFetch:input_type -> blocks.MarketFetchRequest - 7, // 5: market.Data.MemberDetails:input_type -> blocks.IdentRequest - 6, // 6: market.Data.OrderFetch:input_type -> blocks.MarketFetchRequest - 7, // 7: market.Data.OrderDetails:input_type -> blocks.IdentRequest + 5, // 3: market.Data.Overview:input_type -> ec_market_blocks.Empty + 6, // 4: market.Data.MemberFetch:input_type -> ec_market_blocks.MarketFetchRequest + 7, // 5: market.Data.MemberDetails:input_type -> ec_market_blocks.IdentRequest + 6, // 6: market.Data.OrderFetch:input_type -> ec_market_blocks.MarketFetchRequest + 7, // 7: market.Data.OrderDetails:input_type -> ec_market_blocks.IdentRequest 0, // 8: market.Data.Overview:output_type -> market.OverviewReply 1, // 9: market.Data.MemberFetch:output_type -> market.DataReply 2, // 10: market.Data.MemberDetails:output_type -> market.KeyVal diff --git a/module/ec/market/pb/supply.pb.go b/module/ec/market/pb/supply.pb.go index c40eefc..238bb62 100644 --- a/module/ec/market/pb/supply.pb.go +++ b/module/ec/market/pb/supply.pb.go @@ -253,13 +253,13 @@ const file_module_ec_market_proto_supply_proto_rawDesc = "" + "\x02id\x18\x0f \x01(\x05R\x02id\"Q\n" + "\vSupplyReply\x12\x14\n" + "\x05count\x18\x01 \x01(\x03R\x05count\x12,\n" + - "\x04data\x18\x02 \x03(\v2\x18.market.MarketSupplyItemR\x04data2\xc2\x02\n" + - "\x06Supply\x12A\n" + - "\x06Create\x12\x18.market.MarketSupplyItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x127\n" + - "\x03Get\x12\x14.blocks.IdentRequest\x1a\x18.market.MarketSupplyItem\"\x00\x12:\n" + - "\x05Fetch\x12\x1a.blocks.MarketFetchRequest\x1a\x13.market.SupplyReply\"\x00\x12A\n" + - "\x06Modify\x12\x18.market.MarketSupplyItem\x1a\x1b.blocks.IdentityStatusReply\"\x00\x12=\n" + - "\x06Delete\x12\x14.blocks.IdentRequest\x1a\x1b.blocks.IdentityStatusReply\"\x00B%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" + "\x04data\x18\x02 \x03(\v2\x18.market.MarketSupplyItemR\x04data2\xfe\x02\n" + + "\x06Supply\x12K\n" + + "\x06Create\x12\x18.market.MarketSupplyItem\x1a%.ec_market_blocks.IdentityStatusReply\"\x00\x12A\n" + + "\x03Get\x12\x1e.ec_market_blocks.IdentRequest\x1a\x18.market.MarketSupplyItem\"\x00\x12D\n" + + "\x05Fetch\x12$.ec_market_blocks.MarketFetchRequest\x1a\x13.market.SupplyReply\"\x00\x12K\n" + + "\x06Modify\x12\x18.market.MarketSupplyItem\x1a%.ec_market_blocks.IdentityStatusReply\"\x00\x12Q\n" + + "\x06Delete\x12\x1e.ec_market_blocks.IdentRequest\x1a%.ec_market_blocks.IdentityStatusReply\"\x00B%Z#bsm/full/module/ec/market/pb;marketb\x06proto3" var ( file_module_ec_market_proto_supply_proto_rawDescOnce sync.Once @@ -277,22 +277,22 @@ var file_module_ec_market_proto_supply_proto_msgTypes = make([]protoimpl.Message var file_module_ec_market_proto_supply_proto_goTypes = []any{ (*MarketSupplyItem)(nil), // 0: market.MarketSupplyItem (*SupplyReply)(nil), // 1: market.SupplyReply - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*MarketFetchRequest)(nil), // 3: blocks.MarketFetchRequest - (*IdentityStatusReply)(nil), // 4: blocks.IdentityStatusReply + (*IdentRequest)(nil), // 2: ec_market_blocks.IdentRequest + (*MarketFetchRequest)(nil), // 3: ec_market_blocks.MarketFetchRequest + (*IdentityStatusReply)(nil), // 4: ec_market_blocks.IdentityStatusReply } var file_module_ec_market_proto_supply_proto_depIdxs = []int32{ 0, // 0: market.SupplyReply.data:type_name -> market.MarketSupplyItem 0, // 1: market.Supply.Create:input_type -> market.MarketSupplyItem - 2, // 2: market.Supply.Get:input_type -> blocks.IdentRequest - 3, // 3: market.Supply.Fetch:input_type -> blocks.MarketFetchRequest + 2, // 2: market.Supply.Get:input_type -> ec_market_blocks.IdentRequest + 3, // 3: market.Supply.Fetch:input_type -> ec_market_blocks.MarketFetchRequest 0, // 4: market.Supply.Modify:input_type -> market.MarketSupplyItem - 2, // 5: market.Supply.Delete:input_type -> blocks.IdentRequest - 4, // 6: market.Supply.Create:output_type -> blocks.IdentityStatusReply + 2, // 5: market.Supply.Delete:input_type -> ec_market_blocks.IdentRequest + 4, // 6: market.Supply.Create:output_type -> ec_market_blocks.IdentityStatusReply 0, // 7: market.Supply.Get:output_type -> market.MarketSupplyItem 1, // 8: market.Supply.Fetch:output_type -> market.SupplyReply - 4, // 9: market.Supply.Modify:output_type -> blocks.IdentityStatusReply - 4, // 10: market.Supply.Delete:output_type -> blocks.IdentityStatusReply + 4, // 9: market.Supply.Modify:output_type -> ec_market_blocks.IdentityStatusReply + 4, // 10: market.Supply.Delete:output_type -> ec_market_blocks.IdentityStatusReply 6, // [6:11] is the sub-list for method output_type 1, // [1:6] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name diff --git a/module/ec/market/proto/agency.proto b/module/ec/market/proto/agency.proto index c351e0e..01caf35 100644 --- a/module/ec/market/proto/agency.proto +++ b/module/ec/market/proto/agency.proto @@ -6,31 +6,31 @@ import "module/ec/market/proto/const.proto"; // 营销服务 - 代理商 service Agency{ // 登录 - rpc Login(LoginRequest) returns (blocks.MarketLoginReply) {} + rpc Login(LoginRequest) returns (ec_market_blocks.MarketLoginReply) {} // 新增代理商 - rpc Create(MarketAgenctyItem) returns (blocks.IdentityStatusReply) {} + rpc Create(MarketAgenctyItem) returns (ec_market_blocks.IdentityStatusReply) {} // 获取一个代理商 - rpc Get(blocks.IdentRequest) returns (MarketAgenctyItem) {} + rpc Get(ec_market_blocks.IdentRequest) returns (MarketAgenctyItem) {} // 代理商列表 - rpc Fetch(blocks.MarketFetchRequest) returns (AgencyReply) {} + rpc Fetch(ec_market_blocks.MarketFetchRequest) returns (AgencyReply) {} // 更新代理商数据 - rpc Modify(MarketAgenctyItem) returns (blocks.IdentityStatusReply) {} + rpc Modify(MarketAgenctyItem) returns (ec_market_blocks.IdentityStatusReply) {} // 删除一个代理商 - rpc Delete(blocks.IdentRequest) returns (blocks.IdentityStatusReply) {} + rpc Delete(ec_market_blocks.IdentRequest) returns (ec_market_blocks.IdentityStatusReply) {} // 更新密码 - rpc SetPassword(SetPasswordRequest) returns (blocks.IdentityStatusReply) {} + rpc SetPassword(SetPasswordRequest) returns (ec_market_blocks.IdentityStatusReply) {} //待审核 - rpc Pending(blocks.MarketFetchRequest) returns (AgencyReply) {} + rpc Pending(ec_market_blocks.MarketFetchRequest) returns (AgencyReply) {} // 审核 - rpc Approve(ApproveRequest) returns (blocks.IdentityStatusReply) {}; + rpc Approve(ApproveRequest) returns (ec_market_blocks.IdentityStatusReply) {}; } @@ -80,4 +80,4 @@ message AgencyReply { message ApproveRequest { int32 approve = 1; // 1:通过 2:拒绝 string identity = 2; // 唯一标识 -} \ No newline at end of file +} diff --git a/module/ec/market/proto/const.proto b/module/ec/market/proto/const.proto index 6735e6f..ed1d3ce 100644 --- a/module/ec/market/proto/const.proto +++ b/module/ec/market/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package ec_market_blocks; option go_package = "bsm/full/module/ec/market/pb;market"; diff --git a/module/ec/market/proto/data.proto b/module/ec/market/proto/data.proto index ef3757b..6749a6b 100644 --- a/module/ec/market/proto/data.proto +++ b/module/ec/market/proto/data.proto @@ -6,19 +6,19 @@ import "module/ec/market/proto/const.proto"; // 数据服务 service Data{ // 概况 - rpc Overview(blocks.Empty) returns (OverviewReply) {} + rpc Overview(ec_market_blocks.Empty) returns (OverviewReply) {} // 会员列表 - rpc MemberFetch(blocks.MarketFetchRequest) returns (DataReply) {} + rpc MemberFetch(ec_market_blocks.MarketFetchRequest) returns (DataReply) {} // 会员详情 - rpc MemberDetails(blocks.IdentRequest) returns (KeyVal) {} + rpc MemberDetails(ec_market_blocks.IdentRequest) returns (KeyVal) {} // 订单列表 - rpc OrderFetch(blocks.MarketFetchRequest) returns (DataReply) {} + rpc OrderFetch(ec_market_blocks.MarketFetchRequest) returns (DataReply) {} // 订单详情 - rpc OrderDetails(blocks.IdentRequest) returns (KeyVal) {} + rpc OrderDetails(ec_market_blocks.IdentRequest) returns (KeyVal) {} } message OverviewReply { @@ -46,4 +46,4 @@ message DataReply { message KeyVal { string key=1; string val=2; -} \ No newline at end of file +} diff --git a/module/ec/market/proto/supply.proto b/module/ec/market/proto/supply.proto index a01fed5..ac7e082 100644 --- a/module/ec/market/proto/supply.proto +++ b/module/ec/market/proto/supply.proto @@ -7,19 +7,19 @@ import "module/ec/market/proto/const.proto"; service Supply{ // 新增供应商 - rpc Create(MarketSupplyItem) returns (blocks.IdentityStatusReply) {} + rpc Create(MarketSupplyItem) returns (ec_market_blocks.IdentityStatusReply) {} // 获取一个供应商 - rpc Get(blocks.IdentRequest) returns (MarketSupplyItem) {} + rpc Get(ec_market_blocks.IdentRequest) returns (MarketSupplyItem) {} // 供应商列表 - rpc Fetch(blocks.MarketFetchRequest) returns (SupplyReply) {} + rpc Fetch(ec_market_blocks.MarketFetchRequest) returns (SupplyReply) {} // 更新供应商数据 - rpc Modify(MarketSupplyItem) returns (blocks.IdentityStatusReply) {} + rpc Modify(MarketSupplyItem) returns (ec_market_blocks.IdentityStatusReply) {} // 删除一个供应商 - rpc Delete(blocks.IdentRequest) returns (blocks.IdentityStatusReply) {} + rpc Delete(ec_market_blocks.IdentRequest) returns (ec_market_blocks.IdentityStatusReply) {} } @@ -49,4 +49,4 @@ message MarketSupplyItem { message SupplyReply { int64 count = 1;// 总数 repeated MarketSupplyItem data = 2;// 数据 -} \ No newline at end of file +} diff --git a/module/ec/market/service/expose.go b/module/ec/market/service/expose.go new file mode 100644 index 0000000..d50760c --- /dev/null +++ b/module/ec/market/service/expose.go @@ -0,0 +1,31 @@ +package service + +import ( + "context" + + "bsm/full/module/ec/market/internal/server" + pb "bsm/full/module/ec/market/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterAgencyHandlerServer(ctx, options.Gateway, server.NewAgencyServer()); err != nil { + return err + } + if err := pb.RegisterDataHandlerServer(ctx, options.Gateway, server.NewDataServer()); err != nil { + return err + } + if err := pb.RegisterSupplyHandlerServer(ctx, options.Gateway, server.NewSupplyServer()); err != nil { + return err + } + return nil +} diff --git a/module/ec/order/cmd/main/main.go b/module/ec/order/cmd/main/main.go index 74f0c81..0999cc1 100644 --- a/module/ec/order/cmd/main/main.go +++ b/module/ec/order/cmd/main/main.go @@ -2,7 +2,7 @@ * @Author: david.yan(david.yan@qq.com) * @Date: 2021-11-26 15:25:03 */ -package service +package main import ( "bsm/full/module/ec/order/internal/config" @@ -20,7 +20,7 @@ func Run() { impl.NewImpl() // 初始化服务 - s := server.New(config.Spec.Addr) + s := server.New(nil) srv := service.New( s.Grpc, &service.Options{ diff --git a/module/ec/order/internal/server/new.go b/module/ec/order/internal/server/new.go index cf94ed1..7d11fbf 100644 --- a/module/ec/order/internal/server/new.go +++ b/module/ec/order/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -30,7 +35,9 @@ func New(addr string) *Server { pb.RegisterMgtServer(srv.Grpc, NewMgtServer()) pb.RegisterSummaryServer(srv.Grpc, NewSummaryServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/ec/order/pb/cart.pb.go b/module/ec/order/pb/cart.pb.go index 859e407..13505ba 100644 --- a/module/ec/order/pb/cart.pb.go +++ b/module/ec/order/pb/cart.pb.go @@ -572,12 +572,12 @@ const file_module_ec_order_proto_cart_proto_rawDesc = "" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x16\n" + "\x06number\x18\x02 \x01(\x03R\x06number\" \n" + "\x0eCartDelRequest\x12\x0e\n" + - "\x02id\x18\x03 \x03(\x03R\x02id2\xf4\x01\n" + + "\x02id\x18\x03 \x03(\x03R\x02id2\x8f\x02\n" + "\x04Cart\x125\n" + - "\x05Fetch\x12\x15.order.CartGetRequest\x1a\x13.order.CartGetReply\"\x00\x12;\n" + - "\x06Create\x12\x15.order.CartAddRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12;\n" + - "\x06Modify\x12\x15.order.CartSetRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12;\n" + - "\x06Delete\x12\x15.order.CartDelRequest\x1a\x18.blocks.OrderStatusReply\"\x00B#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" + "\x05Fetch\x12\x15.order.CartGetRequest\x1a\x13.order.CartGetReply\"\x00\x12D\n" + + "\x06Create\x12\x15.order.CartAddRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12D\n" + + "\x06Modify\x12\x15.order.CartSetRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12D\n" + + "\x06Delete\x12\x15.order.CartDelRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00B#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" var ( file_module_ec_order_proto_cart_proto_rawDescOnce sync.Once @@ -600,7 +600,7 @@ var file_module_ec_order_proto_cart_proto_goTypes = []any{ (*CartSetRequest)(nil), // 4: order.CartSetRequest (*Updates)(nil), // 5: order.Updates (*CartDelRequest)(nil), // 6: order.CartDelRequest - (*OrderStatusReply)(nil), // 7: blocks.OrderStatusReply + (*OrderStatusReply)(nil), // 7: ec_order_blocks.OrderStatusReply } var file_module_ec_order_proto_cart_proto_depIdxs = []int32{ 2, // 0: order.CartGetReply.data:type_name -> order.CartItem @@ -610,9 +610,9 @@ var file_module_ec_order_proto_cart_proto_depIdxs = []int32{ 4, // 4: order.Cart.Modify:input_type -> order.CartSetRequest 6, // 5: order.Cart.Delete:input_type -> order.CartDelRequest 1, // 6: order.Cart.Fetch:output_type -> order.CartGetReply - 7, // 7: order.Cart.Create:output_type -> blocks.OrderStatusReply - 7, // 8: order.Cart.Modify:output_type -> blocks.OrderStatusReply - 7, // 9: order.Cart.Delete:output_type -> blocks.OrderStatusReply + 7, // 7: order.Cart.Create:output_type -> ec_order_blocks.OrderStatusReply + 7, // 8: order.Cart.Modify:output_type -> ec_order_blocks.OrderStatusReply + 7, // 9: order.Cart.Delete:output_type -> ec_order_blocks.OrderStatusReply 6, // [6:10] is the sub-list for method output_type 2, // [2:6] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name diff --git a/module/ec/order/pb/const.pb.go b/module/ec/order/pb/const.pb.go index 036cfb7..5d690a6 100644 --- a/module/ec/order/pb/const.pb.go +++ b/module/ec/order/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_ec_order_proto_const_proto protoreflect.FileDescriptor const file_module_ec_order_proto_const_proto_rawDesc = "" + "\n" + - "!module/ec/order/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "!module/ec/order/proto/const.proto\x12\x0fec_order_blocks\"\a\n" + + "\x05Empty\"\xc4\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12A\n" + + "\x06params\x18\x03 \x03(\v2).ec_order_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xff\x02\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12E\n" + + "\x06params\x18\x03 \x03(\v2-.ec_order_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xb8\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12G\n" + + "\x06params\x18\x03 \x03(\v2/.ec_order_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe9\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x126\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2 .ec_order_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xd5\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x127\n" + + "\adetails\x18! \x03(\v2\x1d.ec_order_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"X\n" + + "\x11FeedPostListReply\x121\n" + + "\x04list\x18\x01 \x03(\v2\x1d.ec_order_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe3\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x129\n" + + "\aattachs\x18\t \x03(\v2\x1f.ec_order_blocks.FeedAttachItemR\aattachs\x120\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\x1c.ec_order_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"Z\n" + + "\x12GroupPostListReply\x122\n" + + "\x04list\x18\x01 \x03(\v2\x1e.ec_order_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xf6\x02\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12:\n" + + "\aattachs\x18\t \x03(\v2 .ec_order_blocks.GroupAttachItemR\aattachs\x121\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2\x1d.ec_order_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_ec_order_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"a\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x121\n" + + "\x04data\x18\x02 \x03(\v2\x1d.ec_order_blocks.RelationItemR\x04dataB#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" var ( file_module_ec_order_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_ec_order_proto_const_proto_rawDescGZIP() []byte { var file_module_ec_order_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_ec_order_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: ec_order_blocks.Empty + (*FetchRequest)(nil), // 1: ec_order_blocks.FetchRequest + (*IdentRequest)(nil), // 2: ec_order_blocks.IdentRequest + (*VersionRequest)(nil), // 3: ec_order_blocks.VersionRequest + (*SearchRequest)(nil), // 4: ec_order_blocks.SearchRequest + (*StatusReply)(nil), // 5: ec_order_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: ec_order_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: ec_order_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: ec_order_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: ec_order_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: ec_order_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: ec_order_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: ec_order_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: ec_order_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: ec_order_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: ec_order_blocks.IDRequest + (*IDListRequest)(nil), // 16: ec_order_blocks.IDListRequest + (*StdIicuds)(nil), // 17: ec_order_blocks.StdIicuds + (*StdPassport)(nil), // 18: ec_order_blocks.StdPassport + (*CloudBase)(nil), // 19: ec_order_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: ec_order_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: ec_order_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: ec_order_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: ec_order_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: ec_order_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: ec_order_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: ec_order_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: ec_order_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: ec_order_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: ec_order_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: ec_order_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: ec_order_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: ec_order_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: ec_order_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: ec_order_blocks.GroupTagItem + (*RelationItem)(nil), // 35: ec_order_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: ec_order_blocks.FetchRelationItemReply + nil, // 37: ec_order_blocks.FetchRequest.ParamsEntry + nil, // 38: ec_order_blocks.MallFetchRequest.ParamsEntry + nil, // 39: ec_order_blocks.MarketFetchRequest.ParamsEntry } var file_module_ec_order_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: ec_order_blocks.FetchRequest.params:type_name -> ec_order_blocks.FetchRequest.ParamsEntry + 38, // 1: ec_order_blocks.MallFetchRequest.params:type_name -> ec_order_blocks.MallFetchRequest.ParamsEntry + 39, // 2: ec_order_blocks.MarketFetchRequest.params:type_name -> ec_order_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: ec_order_blocks.CmsCategoryItem.child:type_name -> ec_order_blocks.CmsCategoryItem + 26, // 4: ec_order_blocks.OrderSummaryItem.details:type_name -> ec_order_blocks.OrderDetails + 28, // 5: ec_order_blocks.FeedPostListReply.list:type_name -> ec_order_blocks.FeedPostItem + 29, // 6: ec_order_blocks.FeedPostItem.attachs:type_name -> ec_order_blocks.FeedAttachItem + 30, // 7: ec_order_blocks.FeedPostItem.tags:type_name -> ec_order_blocks.FeedTagItem + 32, // 8: ec_order_blocks.GroupPostListReply.list:type_name -> ec_order_blocks.GroupPostItem + 33, // 9: ec_order_blocks.GroupPostItem.attachs:type_name -> ec_order_blocks.GroupAttachItem + 34, // 10: ec_order_blocks.GroupPostItem.tags:type_name -> ec_order_blocks.GroupTagItem + 35, // 11: ec_order_blocks.FetchRelationItemReply.data:type_name -> ec_order_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/ec/order/pb/mgt.pb.go b/module/ec/order/pb/mgt.pb.go index d443005..502c03c 100644 --- a/module/ec/order/pb/mgt.pb.go +++ b/module/ec/order/pb/mgt.pb.go @@ -368,9 +368,9 @@ const file_module_ec_order_proto_mgt_proto_rawDesc = "" + "\x04spec\x18\x05 \x03(\v2\x0f.order.SpecListR\x04spec\"N\n" + "\bSpecList\x12\x16\n" + "\x06number\x18\x01 \x01(\x05R\x06number\x12*\n" + - "\x10product_identity\x18\x02 \x01(\tR\x10product_identity\"C\n" + - "\rOrderGetReply\x122\n" + - "\asummary\x18\x01 \x01(\v2\x18.blocks.OrderSummaryItemR\asummary\"\xa2\x02\n" + + "\x10product_identity\x18\x02 \x01(\tR\x10product_identity\"L\n" + + "\rOrderGetReply\x12;\n" + + "\asummary\x18\x01 \x01(\v2!.ec_order_blocks.OrderSummaryItemR\asummary\"\xa2\x02\n" + "\x17OrderListByStoreRequest\x12\x1a\n" + "\bpay_type\x18\x01 \x01(\x05R\bpay_type\x12\"\n" + "\forder_status\x18\x02 \x03(\x05R\forder_status\x12\x18\n" + @@ -382,18 +382,18 @@ const file_module_ec_order_proto_mgt_proto_rawDesc = "" + "\x06agency\x18\x06 \x01(\tR\x06agency\x12%\n" + "\x0estore_identity\x18\a \x01(\tR\rstoreIdentity\x12\x16\n" + "\x06status\x18\b \x01(\x05R\x06status\x12\x18\n" + - "\akeyword\x18\t \x01(\tR\akeyword\"[\n" + + "\akeyword\x18\t \x01(\tR\akeyword\"d\n" + "\x15OrderListByStoreReply\x12\x14\n" + - "\x05count\x18\x01 \x01(\x05R\x05count\x12,\n" + - "\x04data\x18\x02 \x03(\v2\x18.blocks.OrderSummaryItemR\x04data2\xfa\x03\n" + - "\x03Mgt\x12D\n" + - "\vOrderCreate\x12\x19.order.CreateOrderRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12C\n" + - "\vOrderModify\x12\x18.blocks.OrderSummaryItem\x1a\x18.blocks.OrderStatusReply\"\x00\x12=\n" + - "\bOrderGet\x12\x19.blocks.OrderIdentRequest\x1a\x14.order.OrderGetReply\"\x00\x12R\n" + - "\x10OrderListByStore\x12\x1e.order.OrderListByStoreRequest\x1a\x1c.order.OrderListByStoreReply\"\x00\x12D\n" + - "\vOrderCancel\x12\x19.blocks.OrderIdentRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12H\n" + - "\x0fOrderReturnable\x12\x19.blocks.OrderIdentRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12E\n" + - "\fOrderApprove\x12\x19.blocks.OrderIdentRequest\x1a\x18.blocks.OrderStatusReply\"\x00B#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" + "\x05count\x18\x01 \x01(\x05R\x05count\x125\n" + + "\x04data\x18\x02 \x03(\v2!.ec_order_blocks.OrderSummaryItemR\x04data2\xd4\x04\n" + + "\x03Mgt\x12M\n" + + "\vOrderCreate\x12\x19.order.CreateOrderRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12U\n" + + "\vOrderModify\x12!.ec_order_blocks.OrderSummaryItem\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12F\n" + + "\bOrderGet\x12\".ec_order_blocks.OrderIdentRequest\x1a\x14.order.OrderGetReply\"\x00\x12R\n" + + "\x10OrderListByStore\x12\x1e.order.OrderListByStoreRequest\x1a\x1c.order.OrderListByStoreReply\"\x00\x12V\n" + + "\vOrderCancel\x12\".ec_order_blocks.OrderIdentRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12Z\n" + + "\x0fOrderReturnable\x12\".ec_order_blocks.OrderIdentRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12W\n" + + "\fOrderApprove\x12\".ec_order_blocks.OrderIdentRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00B#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" var ( file_module_ec_order_proto_mgt_proto_rawDescOnce sync.Once @@ -414,28 +414,28 @@ var file_module_ec_order_proto_mgt_proto_goTypes = []any{ (*OrderGetReply)(nil), // 2: order.OrderGetReply (*OrderListByStoreRequest)(nil), // 3: order.OrderListByStoreRequest (*OrderListByStoreReply)(nil), // 4: order.OrderListByStoreReply - (*OrderSummaryItem)(nil), // 5: blocks.OrderSummaryItem - (*OrderIdentRequest)(nil), // 6: blocks.OrderIdentRequest - (*OrderStatusReply)(nil), // 7: blocks.OrderStatusReply + (*OrderSummaryItem)(nil), // 5: ec_order_blocks.OrderSummaryItem + (*OrderIdentRequest)(nil), // 6: ec_order_blocks.OrderIdentRequest + (*OrderStatusReply)(nil), // 7: ec_order_blocks.OrderStatusReply } var file_module_ec_order_proto_mgt_proto_depIdxs = []int32{ 1, // 0: order.CreateOrderRequest.spec:type_name -> order.SpecList - 5, // 1: order.OrderGetReply.summary:type_name -> blocks.OrderSummaryItem - 5, // 2: order.OrderListByStoreReply.data:type_name -> blocks.OrderSummaryItem + 5, // 1: order.OrderGetReply.summary:type_name -> ec_order_blocks.OrderSummaryItem + 5, // 2: order.OrderListByStoreReply.data:type_name -> ec_order_blocks.OrderSummaryItem 0, // 3: order.Mgt.OrderCreate:input_type -> order.CreateOrderRequest - 5, // 4: order.Mgt.OrderModify:input_type -> blocks.OrderSummaryItem - 6, // 5: order.Mgt.OrderGet:input_type -> blocks.OrderIdentRequest + 5, // 4: order.Mgt.OrderModify:input_type -> ec_order_blocks.OrderSummaryItem + 6, // 5: order.Mgt.OrderGet:input_type -> ec_order_blocks.OrderIdentRequest 3, // 6: order.Mgt.OrderListByStore:input_type -> order.OrderListByStoreRequest - 6, // 7: order.Mgt.OrderCancel:input_type -> blocks.OrderIdentRequest - 6, // 8: order.Mgt.OrderReturnable:input_type -> blocks.OrderIdentRequest - 6, // 9: order.Mgt.OrderApprove:input_type -> blocks.OrderIdentRequest - 7, // 10: order.Mgt.OrderCreate:output_type -> blocks.OrderStatusReply - 7, // 11: order.Mgt.OrderModify:output_type -> blocks.OrderStatusReply + 6, // 7: order.Mgt.OrderCancel:input_type -> ec_order_blocks.OrderIdentRequest + 6, // 8: order.Mgt.OrderReturnable:input_type -> ec_order_blocks.OrderIdentRequest + 6, // 9: order.Mgt.OrderApprove:input_type -> ec_order_blocks.OrderIdentRequest + 7, // 10: order.Mgt.OrderCreate:output_type -> ec_order_blocks.OrderStatusReply + 7, // 11: order.Mgt.OrderModify:output_type -> ec_order_blocks.OrderStatusReply 2, // 12: order.Mgt.OrderGet:output_type -> order.OrderGetReply 4, // 13: order.Mgt.OrderListByStore:output_type -> order.OrderListByStoreReply - 7, // 14: order.Mgt.OrderCancel:output_type -> blocks.OrderStatusReply - 7, // 15: order.Mgt.OrderReturnable:output_type -> blocks.OrderStatusReply - 7, // 16: order.Mgt.OrderApprove:output_type -> blocks.OrderStatusReply + 7, // 14: order.Mgt.OrderCancel:output_type -> ec_order_blocks.OrderStatusReply + 7, // 15: order.Mgt.OrderReturnable:output_type -> ec_order_blocks.OrderStatusReply + 7, // 16: order.Mgt.OrderApprove:output_type -> ec_order_blocks.OrderStatusReply 10, // [10:17] is the sub-list for method output_type 3, // [3:10] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/module/ec/order/pb/summary.pb.go b/module/ec/order/pb/summary.pb.go index 7c87b63..95223e5 100644 --- a/module/ec/order/pb/summary.pb.go +++ b/module/ec/order/pb/summary.pb.go @@ -894,17 +894,17 @@ const file_module_ec_order_proto_summary_proto_rawDesc = "" + "\acontact\x18\x06 \x01(\tR\acontact\x12\x14\n" + "\x05phone\x18\a \x01(\tR\x05phone\x12\x14\n" + "\x05email\x18\b \x01(\tR\x05email\x12\x19\n" + - "\bzip_code\x18\t \x01(\tR\azipCode\"E\n" + - "\x0fSummaryGetReply\x122\n" + - "\asummary\x18\x01 \x01(\v2\x18.blocks.OrderSummaryItemR\asummary\"\x8c\x01\n" + + "\bzip_code\x18\t \x01(\tR\azipCode\"N\n" + + "\x0fSummaryGetReply\x12;\n" + + "\asummary\x18\x01 \x01(\v2!.ec_order_blocks.OrderSummaryItemR\asummary\"\x8c\x01\n" + "\x12SummaryListRequest\x12\x1a\n" + "\bpay_type\x18\x01 \x01(\x05R\bpay_type\x12\"\n" + "\forder_status\x18\x02 \x01(\x05R\forder_status\x12\x18\n" + "\apage_no\x18\x03 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x04 \x01(\x03R\tpage_size\"V\n" + + "\tpage_size\x18\x04 \x01(\x03R\tpage_size\"_\n" + "\x10SummaryListReply\x12\x14\n" + - "\x05count\x18\x01 \x01(\x05R\x05count\x12,\n" + - "\x04data\x18\x02 \x03(\v2\x18.blocks.OrderSummaryItemR\x04data\"\xc0\x01\n" + + "\x05count\x18\x01 \x01(\x05R\x05count\x125\n" + + "\x04data\x18\x02 \x03(\v2!.ec_order_blocks.OrderSummaryItemR\x04data\"\xc0\x01\n" + "\x0eConfirmRequest\x12\x1a\n" + "\border_no\x18\x01 \x01(\tR\border_no\x12*\n" + "\x10address_identity\x18\x02 \x01(\tR\x10address_identity\x12(\n" + @@ -915,18 +915,18 @@ const file_module_ec_order_proto_summary_proto_rawDesc = "" + "\vtotal_price\x18\x01 \x01(\x03R\vtotal_price\"?\n" + "\rCancelRequest\x12\x1a\n" + "\border_no\x18\x01 \x01(\tR\border_no\x12\x12\n" + - "\x04type\x18\x02 \x01(\tR\x04type2\xa4\x05\n" + - "\aSummary\x12V\n" + - "\x14QuickCreateByProduct\x12\".order.QuickCreateByProductRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12:\n" + - "\x06Submit\x12\x14.order.SubmitRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x122\n" + - "\x05Check\x12\r.blocks.Empty\x1a\x18.blocks.OrderStatusReply\"\x00\x12:\n" + - "\x03Get\x12\x19.blocks.OrderIdentRequest\x1a\x16.order.SummaryGetReply\"\x00\x12<\n" + + "\x04type\x18\x02 \x01(\tR\x04type2\xfe\x05\n" + + "\aSummary\x12_\n" + + "\x14QuickCreateByProduct\x12\".order.QuickCreateByProductRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12C\n" + + "\x06Submit\x12\x14.order.SubmitRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12D\n" + + "\x05Check\x12\x16.ec_order_blocks.Empty\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12C\n" + + "\x03Get\x12\".ec_order_blocks.OrderIdentRequest\x1a\x16.order.SummaryGetReply\"\x00\x12<\n" + "\x04List\x12\x19.order.SummaryListRequest\x1a\x17.order.SummaryListReply\"\x00\x127\n" + - "\aConfirm\x12\x15.order.ConfirmRequest\x1a\x13.order.ConfirmReply\"\x00\x12:\n" + - "\x06Cancel\x12\x14.order.CancelRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12D\n" + - "\vSimulatePay\x12\x19.order.SimulatePayRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12P\n" + - "\x11SimulateShipments\x12\x1f.order.SimulateShipmentsRequest\x1a\x18.blocks.OrderStatusReply\"\x00\x12J\n" + - "\x11SimulateReceiving\x12\x19.blocks.OrderIdentRequest\x1a\x18.blocks.OrderStatusReply\"\x00B#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" + "\aConfirm\x12\x15.order.ConfirmRequest\x1a\x13.order.ConfirmReply\"\x00\x12C\n" + + "\x06Cancel\x12\x14.order.CancelRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12M\n" + + "\vSimulatePay\x12\x19.order.SimulatePayRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12Y\n" + + "\x11SimulateShipments\x12\x1f.order.SimulateShipmentsRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00\x12\\\n" + + "\x11SimulateReceiving\x12\".ec_order_blocks.OrderIdentRequest\x1a!.ec_order_blocks.OrderStatusReply\"\x00B#Z!bsm/full/module/ec/order/pb;orderb\x06proto3" var ( file_module_ec_order_proto_summary_proto_rawDescOnce sync.Once @@ -954,35 +954,35 @@ var file_module_ec_order_proto_summary_proto_goTypes = []any{ (*ConfirmRequest)(nil), // 9: order.ConfirmRequest (*ConfirmReply)(nil), // 10: order.ConfirmReply (*CancelRequest)(nil), // 11: order.CancelRequest - (*OrderSummaryItem)(nil), // 12: blocks.OrderSummaryItem - (*Empty)(nil), // 13: blocks.Empty - (*OrderIdentRequest)(nil), // 14: blocks.OrderIdentRequest - (*OrderStatusReply)(nil), // 15: blocks.OrderStatusReply + (*OrderSummaryItem)(nil), // 12: ec_order_blocks.OrderSummaryItem + (*Empty)(nil), // 13: ec_order_blocks.Empty + (*OrderIdentRequest)(nil), // 14: ec_order_blocks.OrderIdentRequest + (*OrderStatusReply)(nil), // 15: ec_order_blocks.OrderStatusReply } var file_module_ec_order_proto_summary_proto_depIdxs = []int32{ 5, // 0: order.SubmitRequest.address:type_name -> order.OrderAddress - 12, // 1: order.SummaryGetReply.summary:type_name -> blocks.OrderSummaryItem - 12, // 2: order.SummaryListReply.data:type_name -> blocks.OrderSummaryItem + 12, // 1: order.SummaryGetReply.summary:type_name -> ec_order_blocks.OrderSummaryItem + 12, // 2: order.SummaryListReply.data:type_name -> ec_order_blocks.OrderSummaryItem 3, // 3: order.Summary.QuickCreateByProduct:input_type -> order.QuickCreateByProductRequest 4, // 4: order.Summary.Submit:input_type -> order.SubmitRequest - 13, // 5: order.Summary.Check:input_type -> blocks.Empty - 14, // 6: order.Summary.Get:input_type -> blocks.OrderIdentRequest + 13, // 5: order.Summary.Check:input_type -> ec_order_blocks.Empty + 14, // 6: order.Summary.Get:input_type -> ec_order_blocks.OrderIdentRequest 7, // 7: order.Summary.List:input_type -> order.SummaryListRequest 9, // 8: order.Summary.Confirm:input_type -> order.ConfirmRequest 11, // 9: order.Summary.Cancel:input_type -> order.CancelRequest 2, // 10: order.Summary.SimulatePay:input_type -> order.SimulatePayRequest 0, // 11: order.Summary.SimulateShipments:input_type -> order.SimulateShipmentsRequest - 14, // 12: order.Summary.SimulateReceiving:input_type -> blocks.OrderIdentRequest - 15, // 13: order.Summary.QuickCreateByProduct:output_type -> blocks.OrderStatusReply - 15, // 14: order.Summary.Submit:output_type -> blocks.OrderStatusReply - 15, // 15: order.Summary.Check:output_type -> blocks.OrderStatusReply + 14, // 12: order.Summary.SimulateReceiving:input_type -> ec_order_blocks.OrderIdentRequest + 15, // 13: order.Summary.QuickCreateByProduct:output_type -> ec_order_blocks.OrderStatusReply + 15, // 14: order.Summary.Submit:output_type -> ec_order_blocks.OrderStatusReply + 15, // 15: order.Summary.Check:output_type -> ec_order_blocks.OrderStatusReply 6, // 16: order.Summary.Get:output_type -> order.SummaryGetReply 8, // 17: order.Summary.List:output_type -> order.SummaryListReply 10, // 18: order.Summary.Confirm:output_type -> order.ConfirmReply - 15, // 19: order.Summary.Cancel:output_type -> blocks.OrderStatusReply - 15, // 20: order.Summary.SimulatePay:output_type -> blocks.OrderStatusReply - 15, // 21: order.Summary.SimulateShipments:output_type -> blocks.OrderStatusReply - 15, // 22: order.Summary.SimulateReceiving:output_type -> blocks.OrderStatusReply + 15, // 19: order.Summary.Cancel:output_type -> ec_order_blocks.OrderStatusReply + 15, // 20: order.Summary.SimulatePay:output_type -> ec_order_blocks.OrderStatusReply + 15, // 21: order.Summary.SimulateShipments:output_type -> ec_order_blocks.OrderStatusReply + 15, // 22: order.Summary.SimulateReceiving:output_type -> ec_order_blocks.OrderStatusReply 13, // [13:23] is the sub-list for method output_type 3, // [3:13] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name diff --git a/module/ec/order/proto/cart.proto b/module/ec/order/proto/cart.proto index c2d2b35..59050bd 100644 --- a/module/ec/order/proto/cart.proto +++ b/module/ec/order/proto/cart.proto @@ -9,13 +9,13 @@ service Cart { rpc Fetch(CartGetRequest) returns (CartGetReply) {}; // 将商品增加至购物车 - rpc Create(CartAddRequest) returns (blocks.OrderStatusReply) {}; + rpc Create(CartAddRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 修改购物车中的商品数量 - rpc Modify(CartSetRequest) returns (blocks.OrderStatusReply) {}; + rpc Modify(CartSetRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 删除购物车中的商品 - rpc Delete(CartDelRequest) returns (blocks.OrderStatusReply) {}; + rpc Delete(CartDelRequest) returns (ec_order_blocks.OrderStatusReply) {}; } message CartGetRequest { @@ -68,4 +68,4 @@ message Updates { message CartDelRequest { repeated int64 id = 3; // 购物车ID -} \ No newline at end of file +} diff --git a/module/ec/order/proto/const.proto b/module/ec/order/proto/const.proto index 4397768..a901d1c 100644 --- a/module/ec/order/proto/const.proto +++ b/module/ec/order/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package ec_order_blocks; option go_package = "bsm/full/module/ec/order/pb;order"; diff --git a/module/ec/order/proto/mgt.proto b/module/ec/order/proto/mgt.proto index 47ccd82..db182fb 100644 --- a/module/ec/order/proto/mgt.proto +++ b/module/ec/order/proto/mgt.proto @@ -8,25 +8,25 @@ import "module/ec/order/proto/const.proto"; service Mgt { // 创建订单 - rpc OrderCreate(CreateOrderRequest) returns (blocks.OrderStatusReply) {}; + rpc OrderCreate(CreateOrderRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 修改订单 - rpc OrderModify(blocks.OrderSummaryItem) returns (blocks.OrderStatusReply) {}; + rpc OrderModify(ec_order_blocks.OrderSummaryItem) returns (ec_order_blocks.OrderStatusReply) {}; // 获取一个订单的详情数据 - rpc OrderGet(blocks.OrderIdentRequest) returns (OrderGetReply) {}; + rpc OrderGet(ec_order_blocks.OrderIdentRequest) returns (OrderGetReply) {}; // 根据不同的类型获取店铺的订单列表 rpc OrderListByStore(OrderListByStoreRequest) returns (OrderListByStoreReply) {}; // 取消订单 - rpc OrderCancel(blocks.OrderIdentRequest) returns (blocks.OrderStatusReply) {}; + rpc OrderCancel(ec_order_blocks.OrderIdentRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 退货 - rpc OrderReturnable(blocks.OrderIdentRequest) returns (blocks.OrderStatusReply) {}; + rpc OrderReturnable(ec_order_blocks.OrderIdentRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 订单审批 - rpc OrderApprove(blocks.OrderIdentRequest) returns (blocks.OrderStatusReply) {}; + rpc OrderApprove(ec_order_blocks.OrderIdentRequest) returns (ec_order_blocks.OrderStatusReply) {}; } @@ -46,7 +46,7 @@ message SpecList { message OrderGetReply { - blocks.OrderSummaryItem summary = 1; // 订单概要详情 + ec_order_blocks.OrderSummaryItem summary = 1; // 订单概要详情 } @@ -64,5 +64,5 @@ message OrderListByStoreRequest { message OrderListByStoreReply { int32 count = 1; - repeated blocks.OrderSummaryItem data = 2; // 订单列表 + repeated ec_order_blocks.OrderSummaryItem data = 2; // 订单列表 } diff --git a/module/ec/order/proto/summary.proto b/module/ec/order/proto/summary.proto index 8aae39f..d723ed2 100644 --- a/module/ec/order/proto/summary.proto +++ b/module/ec/order/proto/summary.proto @@ -8,16 +8,16 @@ import "module/ec/order/proto/const.proto"; service Summary { // 快速创建一个店铺订单 - rpc QuickCreateByProduct(QuickCreateByProductRequest) returns (blocks.OrderStatusReply) {}; + rpc QuickCreateByProduct(QuickCreateByProductRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 将购物车的数据提交生成订单 - rpc Submit(SubmitRequest) returns (blocks.OrderStatusReply) {}; + rpc Submit(SubmitRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 检测是否有未确认及付款的订单 - rpc Check(blocks.Empty) returns (blocks.OrderStatusReply) {}; + rpc Check(ec_order_blocks.Empty) returns (ec_order_blocks.OrderStatusReply) {}; // 获取一个订单的详情数据 - rpc Get(blocks.OrderIdentRequest) returns (SummaryGetReply) {}; + rpc Get(ec_order_blocks.OrderIdentRequest) returns (SummaryGetReply) {}; // 根据不同的类型获取我的订单列表 rpc List(SummaryListRequest) returns (SummaryListReply) {}; @@ -27,16 +27,16 @@ service Summary { // 取消订单 - rpc Cancel(CancelRequest) returns (blocks.OrderStatusReply) {}; + rpc Cancel(CancelRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 模拟支付 - rpc SimulatePay(SimulatePayRequest) returns (blocks.OrderStatusReply) {}; + rpc SimulatePay(SimulatePayRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 模拟发货 - rpc SimulateShipments(SimulateShipmentsRequest) returns (blocks.OrderStatusReply) {}; + rpc SimulateShipments(SimulateShipmentsRequest) returns (ec_order_blocks.OrderStatusReply) {}; // 模拟收货 - rpc SimulateReceiving(blocks.OrderIdentRequest) returns (blocks.OrderStatusReply) {}; + rpc SimulateReceiving(ec_order_blocks.OrderIdentRequest) returns (ec_order_blocks.OrderStatusReply) {}; } message SimulateShipmentsRequest{ string identity = 1; // 订单唯一标识 @@ -88,7 +88,7 @@ message OrderAddress { } message SummaryGetReply { - blocks.OrderSummaryItem summary = 1; // 订单概要详情 + ec_order_blocks.OrderSummaryItem summary = 1; // 订单概要详情 } @@ -101,7 +101,7 @@ message SummaryListRequest { message SummaryListReply { int32 count = 1; - repeated blocks.OrderSummaryItem data = 2; // 订单列表 + repeated ec_order_blocks.OrderSummaryItem data = 2; // 订单列表 } message ConfirmRequest { diff --git a/module/ec/order/service/expose.go b/module/ec/order/service/expose.go new file mode 100644 index 0000000..71353be --- /dev/null +++ b/module/ec/order/service/expose.go @@ -0,0 +1,34 @@ +package service + +import ( + "context" + + "bsm/full/module/ec/order/internal/server" + pb "bsm/full/module/ec/order/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterCartHandlerServer(ctx, options.Gateway, server.NewCartServer()); err != nil { + return err + } + if err := pb.RegisterCouponHandlerServer(ctx, options.Gateway, server.NewCouponServer()); err != nil { + return err + } + if err := pb.RegisterMgtHandlerServer(ctx, options.Gateway, server.NewMgtServer()); err != nil { + return err + } + if err := pb.RegisterSummaryHandlerServer(ctx, options.Gateway, server.NewSummaryServer()); err != nil { + return err + } + return nil +} diff --git a/module/finance/wallet/cmd/main/main.go b/module/finance/wallet/cmd/main/main.go index 19c05bf..89e3344 100644 --- a/module/finance/wallet/cmd/main/main.go +++ b/module/finance/wallet/cmd/main/main.go @@ -3,7 +3,7 @@ * @Date: 2021-11-26 15:25:03 * @Description: 钱包微服务主入口 */ -package service +package main import ( "bsm/full/module/finance/wallet/internal/config" @@ -25,7 +25,7 @@ func Run() { impl.NewImpl() // 创建 gRPC 服务器，监听指定地址 - s := server.New(config.Spec.Addr) + s := server.New(nil) // 创建微服务实例，配置服务参数 srv := service.New( diff --git a/module/finance/wallet/internal/server/new.go b/module/finance/wallet/internal/server/new.go index 10793c9..9cb6097 100644 --- a/module/finance/wallet/internal/server/new.go +++ b/module/finance/wallet/internal/server/new.go @@ -17,10 +17,15 @@ type Server struct { grpcConns map[string]*grpc.ClientConn // 连接池 } -func New(addr string) *Server { +func New(grpcServ *grpc.Server) *Server { + standalone := grpcServ == nil + if standalone { + grpcServ = grpc.NewServer() + } + srv := &Server{ Ctx: context.Background(), - Grpc: grpc.NewServer(), + Grpc: grpcServ, grpcConns: make(map[string]*grpc.ClientConn), } @@ -30,7 +35,9 @@ func New(addr string) *Server { pb.RegisterBasicServer(srv.Grpc, NewBasicServer()) pb.RegisterWechatServer(srv.Grpc, NewWechatServer()) - reflection.Register(srv.Grpc) + if standalone { + reflection.Register(srv.Grpc) + } return srv } diff --git a/module/finance/wallet/pb/const.pb.go b/module/finance/wallet/pb/const.pb.go index f7d8329..1153b8c 100644 --- a/module/finance/wallet/pb/const.pb.go +++ b/module/finance/wallet/pb/const.pb.go @@ -2975,12 +2975,12 @@ var File_module_finance_wallet_proto_const_proto protoreflect.FileDescriptor const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "\n" + - "'module/finance/wallet/proto/const.proto\x12\x06blocks\"\a\n" + - "\x05Empty\"\xbb\x01\n" + + "'module/finance/wallet/proto/const.proto\x12\x15finance_wallet_blocks\"\a\n" + + "\x05Empty\"\xca\x01\n" + "\fFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x128\n" + - "\x06params\x18\x03 \x03(\v2 .blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12G\n" + + "\x06params\x18\x03 \x03(\v2/.finance_wallet_blocks.FetchRequest.ParamsEntryR\x06params\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\":\n" + @@ -2999,11 +2999,11 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "\x10CmsSearchRequest\x12\x18\n" + "\akeyword\x18\x01 \x01(\tR\akeyword\x12\x18\n" + "\apage_no\x18\x02 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\xf6\x02\n" + + "\tpage_size\x18\x03 \x01(\x03R\tpage_size\"\x85\x03\n" + "\x10MallFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12<\n" + - "\x06params\x18\x03 \x03(\v2$.blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12K\n" + + "\x06params\x18\x03 \x03(\v23.finance_wallet_blocks.MallFetchRequest.ParamsEntryR\x06params\x12&\n" + "\x0estore_identity\x18\x04 \x01(\tR\x0estore_identity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x1f\n" + "\vcategory_id\x18\x06 \x03(\x03R\n" + @@ -3013,11 +3013,11 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "\tmax_price\x18\t \x01(\x03R\tmax_price\x1a9\n" + "\vParamsEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xaf\x02\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x01\"\xbe\x02\n" + "\x12MarketFetchRequest\x12\x18\n" + "\apage_no\x18\x01 \x01(\x03R\apage_no\x12\x1c\n" + - "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12>\n" + - "\x06params\x18\x03 \x03(\v2&.blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + + "\tpage_size\x18\x02 \x01(\x03R\tpage_size\x12M\n" + + "\x06params\x18\x03 \x03(\v25.finance_wallet_blocks.MarketFetchRequest.ParamsEntryR\x06params\x12\x1a\n" + "\bidentity\x18\x04 \x01(\tR\bidentity\x12\x18\n" + "\akeyword\x18\x05 \x01(\tR\akeyword\x12\x16\n" + "\x06status\x18\x06 \x01(\x05R\x06status\x12\x18\n" + @@ -3072,7 +3072,7 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "\x11passport_identity\x18\x02 \x01(\tR\x10passportIdentity\"M\n" + "\tCloudBase\x12\x19\n" + "\bcloud_id\x18\x01 \x01(\x04R\acloudId\x12%\n" + - "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xe0\x02\n" + + "\x0ecloud_identity\x18\x02 \x01(\tR\rcloudIdentity\"\xef\x02\n" + "\x0fCmsCategoryItem\x12$\n" + "\rsite_identity\x18\x01 \x01(\tR\rsite_identity\x12\x0e\n" + "\x02id\x18\x02 \x01(\x03R\x02id\x12\x1a\n" + @@ -3088,9 +3088,9 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "created_at\x12\x1e\n" + "\n" + "updated_at\x18\t \x01(\tR\n" + - "updated_at\x12-\n" + + "updated_at\x12<\n" + "\x05child\x18\n" + - " \x03(\v2\x17.blocks.CmsCategoryItemR\x05child\x12\"\n" + + " \x03(\v2&.finance_wallet_blocks.CmsCategoryItemR\x05child\x12\"\n" + "\fcategory_key\x18\v \x01(\tR\fcategory_key\"\xa5\x01\n" + "\vCmsTagsItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + @@ -3129,7 +3129,7 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "\n" + "created_at\x18\b \x01(\tR\n" + "created_at\x12 \n" + - "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xcc\t\n" + + "\vmarket_name\x18\t \x01(\tR\vmarket_name\"\xdb\t\n" + "\x10OrderSummaryItem\x12\x0e\n" + "\x02id\x18\x01 \x01(\x03R\x02id\x12\x1a\n" + "\border_no\x18\x02 \x01(\tR\border_no\x12\x1e\n" + @@ -3165,8 +3165,8 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "pay_remark\x18\x1e \x01(\tR\n" + "pay_remark\x12\x18\n" + "\acreated\x18\x1f \x01(\tR\acreated\x12\x18\n" + - "\aupdated\x18 \x01(\tR\aupdated\x12.\n" + - "\adetails\x18! \x03(\v2\x14.blocks.OrderDetailsR\adetails\x12\x12\n" + + "\aupdated\x18 \x01(\tR\aupdated\x12=\n" + + "\adetails\x18! \x03(\v2#.finance_wallet_blocks.OrderDetailsR\adetails\x12\x12\n" + "\x04addr\x18\" \x01(\tR\x04addr\x12\"\n" + "\fcar_identity\x18# \x01(\tR\fcar_identity\x12*\n" + "\x10delivery_address\x18$ \x01(\tR\x10delivery_address\x12\x14\n" + @@ -3196,10 +3196,10 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "\aspec_id\x18\f \x01(\x03R\aspec_id\x12*\n" + "\x10product_identity\x18\r \x01(\tR\x10product_identity\x12\x1c\n" + "\tgas_types\x18\x0e \x01(\x03R\tgas_types\x12 \n" + - "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"O\n" + - "\x11FeedPostListReply\x12(\n" + - "\x04list\x18\x01 \x03(\v2\x14.blocks.FeedPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xd1\x02\n" + + "\vtotal_price\x18\x0f \x01(\x03R\vtotal_price\"^\n" + + "\x11FeedPostListReply\x127\n" + + "\x04list\x18\x01 \x03(\v2#.finance_wallet_blocks.FeedPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xef\x02\n" + "\fFeedPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x17\n" + @@ -3210,10 +3210,10 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x120\n" + - "\aattachs\x18\t \x03(\v2\x16.blocks.FeedAttachItemR\aattachs\x12'\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12?\n" + + "\aattachs\x18\t \x03(\v2%.finance_wallet_blocks.FeedAttachItemR\aattachs\x126\n" + "\x04tags\x18\n" + - " \x03(\v2\x13.blocks.FeedTagItemR\x04tags\"_\n" + + " \x03(\v2\".finance_wallet_blocks.FeedTagItemR\x04tags\"_\n" + "\x0eFeedAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3221,10 +3221,10 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "\x03url\x18\x03 \x01(\tR\x03url\"9\n" + "\vFeedTagItem\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x18\n" + - "\acontent\x18\x02 \x01(\tR\acontent\"Q\n" + - "\x12GroupPostListReply\x12)\n" + - "\x04list\x18\x01 \x03(\v2\x15.blocks.GroupPostItemR\x04list\x12\x10\n" + - "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\xe4\x02\n" + + "\acontent\x18\x02 \x01(\tR\acontent\"`\n" + + "\x12GroupPostListReply\x128\n" + + "\x04list\x18\x01 \x03(\v2$.finance_wallet_blocks.GroupPostItemR\x04list\x12\x10\n" + + "\x03cnt\x18\x02 \x01(\x03R\x03cnt\"\x82\x03\n" + "\rGroupPostItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x18\n" + "\acontent\x18\x02 \x01(\tR\acontent\x12\x1f\n" + @@ -3236,10 +3236,10 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + "cnt_unlike\x18\x06 \x01(\x03R\tcntUnlike\x12\x1f\n" + "\vcnt_comment\x18\a \x01(\x03R\n" + "cntComment\x12\x19\n" + - "\bcnt_like\x18\b \x01(\x03R\acntLike\x121\n" + - "\aattachs\x18\t \x03(\v2\x17.blocks.GroupAttachItemR\aattachs\x12(\n" + + "\bcnt_like\x18\b \x01(\x03R\acntLike\x12@\n" + + "\aattachs\x18\t \x03(\v2&.finance_wallet_blocks.GroupAttachItemR\aattachs\x127\n" + "\x04tags\x18\n" + - " \x03(\v2\x14.blocks.GroupTagItemR\x04tags\"`\n" + + " \x03(\v2#.finance_wallet_blocks.GroupTagItemR\x04tags\"`\n" + "\x0fGroupAttachItem\x12\x1a\n" + "\bidentity\x18\x01 \x01(\tR\bidentity\x12\x1f\n" + "\vattach_type\x18\x02 \x01(\tR\n" + @@ -3263,10 +3263,10 @@ const file_module_finance_wallet_proto_const_proto_rawDesc = "" + " \x01(\x05R\x04area\x12\x12\n" + "\x04sign\x18\v \x01(\tR\x04sign\x12\x12\n" + "\x04tags\x18\f \x03(\tR\x04tags\x12%\n" + - "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"X\n" + + "\x0eforeign_status\x18\r \x01(\x05R\rforeignStatus\"g\n" + "\x16FetchRelationItemReply\x12\x14\n" + - "\x05total\x18\x01 \x01(\x03R\x05total\x12(\n" + - "\x04data\x18\x02 \x03(\v2\x14.blocks.RelationItemR\x04dataB*Z(bsm/full/module/finance/wallet/pb;walletb\x06proto3" + "\x05total\x18\x01 \x01(\x03R\x05total\x127\n" + + "\x04data\x18\x02 \x03(\v2#.finance_wallet_blocks.RelationItemR\x04dataB*Z(bsm/full/module/finance/wallet/pb;walletb\x06proto3" var ( file_module_finance_wallet_proto_const_proto_rawDescOnce sync.Once @@ -3282,60 +3282,60 @@ func file_module_finance_wallet_proto_const_proto_rawDescGZIP() []byte { var file_module_finance_wallet_proto_const_proto_msgTypes = make([]protoimpl.MessageInfo, 40) var file_module_finance_wallet_proto_const_proto_goTypes = []any{ - (*Empty)(nil), // 0: blocks.Empty - (*FetchRequest)(nil), // 1: blocks.FetchRequest - (*IdentRequest)(nil), // 2: blocks.IdentRequest - (*VersionRequest)(nil), // 3: blocks.VersionRequest - (*SearchRequest)(nil), // 4: blocks.SearchRequest - (*StatusReply)(nil), // 5: blocks.StatusReply - (*CmsSearchRequest)(nil), // 6: blocks.CmsSearchRequest - (*MallFetchRequest)(nil), // 7: blocks.MallFetchRequest - (*MarketFetchRequest)(nil), // 8: blocks.MarketFetchRequest - (*OrderIdentRequest)(nil), // 9: blocks.OrderIdentRequest - (*DeliveryStatusReply)(nil), // 10: blocks.DeliveryStatusReply - (*IdentityStatusReply)(nil), // 11: blocks.IdentityStatusReply - (*OrderStatusReply)(nil), // 12: blocks.OrderStatusReply - (*DataStatusReply)(nil), // 13: blocks.DataStatusReply - (*StoreSerialRequest)(nil), // 14: blocks.StoreSerialRequest - (*IDRequest)(nil), // 15: blocks.IDRequest - (*IDListRequest)(nil), // 16: blocks.IDListRequest - (*StdIicuds)(nil), // 17: blocks.StdIicuds - (*StdPassport)(nil), // 18: blocks.StdPassport - (*CloudBase)(nil), // 19: blocks.CloudBase - (*CmsCategoryItem)(nil), // 20: blocks.CmsCategoryItem - (*CmsTagsItem)(nil), // 21: blocks.CmsTagsItem - (*CmsAccessoryItem)(nil), // 22: blocks.CmsAccessoryItem - (*VerifyStatus)(nil), // 23: blocks.VerifyStatus - (*MarketLoginReply)(nil), // 24: blocks.MarketLoginReply - (*OrderSummaryItem)(nil), // 25: blocks.OrderSummaryItem - (*OrderDetails)(nil), // 26: blocks.OrderDetails - (*FeedPostListReply)(nil), // 27: blocks.FeedPostListReply - (*FeedPostItem)(nil), // 28: blocks.FeedPostItem - (*FeedAttachItem)(nil), // 29: blocks.FeedAttachItem - (*FeedTagItem)(nil), // 30: blocks.FeedTagItem - (*GroupPostListReply)(nil), // 31: blocks.GroupPostListReply - (*GroupPostItem)(nil), // 32: blocks.GroupPostItem - (*GroupAttachItem)(nil), // 33: blocks.GroupAttachItem - (*GroupTagItem)(nil), // 34: blocks.GroupTagItem - (*RelationItem)(nil), // 35: blocks.RelationItem - (*FetchRelationItemReply)(nil), // 36: blocks.FetchRelationItemReply - nil, // 37: blocks.FetchRequest.ParamsEntry - nil, // 38: blocks.MallFetchRequest.ParamsEntry - nil, // 39: blocks.MarketFetchRequest.ParamsEntry + (*Empty)(nil), // 0: finance_wallet_blocks.Empty + (*FetchRequest)(nil), // 1: finance_wallet_blocks.FetchRequest + (*IdentRequest)(nil), // 2: finance_wallet_blocks.IdentRequest + (*VersionRequest)(nil), // 3: finance_wallet_blocks.VersionRequest + (*SearchRequest)(nil), // 4: finance_wallet_blocks.SearchRequest + (*StatusReply)(nil), // 5: finance_wallet_blocks.StatusReply + (*CmsSearchRequest)(nil), // 6: finance_wallet_blocks.CmsSearchRequest + (*MallFetchRequest)(nil), // 7: finance_wallet_blocks.MallFetchRequest + (*MarketFetchRequest)(nil), // 8: finance_wallet_blocks.MarketFetchRequest + (*OrderIdentRequest)(nil), // 9: finance_wallet_blocks.OrderIdentRequest + (*DeliveryStatusReply)(nil), // 10: finance_wallet_blocks.DeliveryStatusReply + (*IdentityStatusReply)(nil), // 11: finance_wallet_blocks.IdentityStatusReply + (*OrderStatusReply)(nil), // 12: finance_wallet_blocks.OrderStatusReply + (*DataStatusReply)(nil), // 13: finance_wallet_blocks.DataStatusReply + (*StoreSerialRequest)(nil), // 14: finance_wallet_blocks.StoreSerialRequest + (*IDRequest)(nil), // 15: finance_wallet_blocks.IDRequest + (*IDListRequest)(nil), // 16: finance_wallet_blocks.IDListRequest + (*StdIicuds)(nil), // 17: finance_wallet_blocks.StdIicuds + (*StdPassport)(nil), // 18: finance_wallet_blocks.StdPassport + (*CloudBase)(nil), // 19: finance_wallet_blocks.CloudBase + (*CmsCategoryItem)(nil), // 20: finance_wallet_blocks.CmsCategoryItem + (*CmsTagsItem)(nil), // 21: finance_wallet_blocks.CmsTagsItem + (*CmsAccessoryItem)(nil), // 22: finance_wallet_blocks.CmsAccessoryItem + (*VerifyStatus)(nil), // 23: finance_wallet_blocks.VerifyStatus + (*MarketLoginReply)(nil), // 24: finance_wallet_blocks.MarketLoginReply + (*OrderSummaryItem)(nil), // 25: finance_wallet_blocks.OrderSummaryItem + (*OrderDetails)(nil), // 26: finance_wallet_blocks.OrderDetails + (*FeedPostListReply)(nil), // 27: finance_wallet_blocks.FeedPostListReply + (*FeedPostItem)(nil), // 28: finance_wallet_blocks.FeedPostItem + (*FeedAttachItem)(nil), // 29: finance_wallet_blocks.FeedAttachItem + (*FeedTagItem)(nil), // 30: finance_wallet_blocks.FeedTagItem + (*GroupPostListReply)(nil), // 31: finance_wallet_blocks.GroupPostListReply + (*GroupPostItem)(nil), // 32: finance_wallet_blocks.GroupPostItem + (*GroupAttachItem)(nil), // 33: finance_wallet_blocks.GroupAttachItem + (*GroupTagItem)(nil), // 34: finance_wallet_blocks.GroupTagItem + (*RelationItem)(nil), // 35: finance_wallet_blocks.RelationItem + (*FetchRelationItemReply)(nil), // 36: finance_wallet_blocks.FetchRelationItemReply + nil, // 37: finance_wallet_blocks.FetchRequest.ParamsEntry + nil, // 38: finance_wallet_blocks.MallFetchRequest.ParamsEntry + nil, // 39: finance_wallet_blocks.MarketFetchRequest.ParamsEntry } var file_module_finance_wallet_proto_const_proto_depIdxs = []int32{ - 37, // 0: blocks.FetchRequest.params:type_name -> blocks.FetchRequest.ParamsEntry - 38, // 1: blocks.MallFetchRequest.params:type_name -> blocks.MallFetchRequest.ParamsEntry - 39, // 2: blocks.MarketFetchRequest.params:type_name -> blocks.MarketFetchRequest.ParamsEntry - 20, // 3: blocks.CmsCategoryItem.child:type_name -> blocks.CmsCategoryItem - 26, // 4: blocks.OrderSummaryItem.details:type_name -> blocks.OrderDetails - 28, // 5: blocks.FeedPostListReply.list:type_name -> blocks.FeedPostItem - 29, // 6: blocks.FeedPostItem.attachs:type_name -> blocks.FeedAttachItem - 30, // 7: blocks.FeedPostItem.tags:type_name -> blocks.FeedTagItem - 32, // 8: blocks.GroupPostListReply.list:type_name -> blocks.GroupPostItem - 33, // 9: blocks.GroupPostItem.attachs:type_name -> blocks.GroupAttachItem - 34, // 10: blocks.GroupPostItem.tags:type_name -> blocks.GroupTagItem - 35, // 11: blocks.FetchRelationItemReply.data:type_name -> blocks.RelationItem + 37, // 0: finance_wallet_blocks.FetchRequest.params:type_name -> finance_wallet_blocks.FetchRequest.ParamsEntry + 38, // 1: finance_wallet_blocks.MallFetchRequest.params:type_name -> finance_wallet_blocks.MallFetchRequest.ParamsEntry + 39, // 2: finance_wallet_blocks.MarketFetchRequest.params:type_name -> finance_wallet_blocks.MarketFetchRequest.ParamsEntry + 20, // 3: finance_wallet_blocks.CmsCategoryItem.child:type_name -> finance_wallet_blocks.CmsCategoryItem + 26, // 4: finance_wallet_blocks.OrderSummaryItem.details:type_name -> finance_wallet_blocks.OrderDetails + 28, // 5: finance_wallet_blocks.FeedPostListReply.list:type_name -> finance_wallet_blocks.FeedPostItem + 29, // 6: finance_wallet_blocks.FeedPostItem.attachs:type_name -> finance_wallet_blocks.FeedAttachItem + 30, // 7: finance_wallet_blocks.FeedPostItem.tags:type_name -> finance_wallet_blocks.FeedTagItem + 32, // 8: finance_wallet_blocks.GroupPostListReply.list:type_name -> finance_wallet_blocks.GroupPostItem + 33, // 9: finance_wallet_blocks.GroupPostItem.attachs:type_name -> finance_wallet_blocks.GroupAttachItem + 34, // 10: finance_wallet_blocks.GroupPostItem.tags:type_name -> finance_wallet_blocks.GroupTagItem + 35, // 11: finance_wallet_blocks.FetchRelationItemReply.data:type_name -> finance_wallet_blocks.RelationItem 12, // [12:12] is the sub-list for method output_type 12, // [12:12] is the sub-list for method input_type 12, // [12:12] is the sub-list for extension type_name diff --git a/module/finance/wallet/pb/payment.pb.go b/module/finance/wallet/pb/payment.pb.go index 0e4cfd8..51190e2 100644 --- a/module/finance/wallet/pb/payment.pb.go +++ b/module/finance/wallet/pb/payment.pb.go @@ -625,14 +625,14 @@ const file_module_finance_wallet_proto_payment_proto_rawDesc = "" + "\x06result\x18\x02 \x03(\v2 .wallet.PaymentReply.ResultEntryR\x06result\x1a9\n" + "\vResultEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\tR\x03key\x12\x14\n" + - "\x05value\x18\x02 \x01(\tR\x05value:\x028\x012\xcc\x02\n" + - "\aPayment\x12.\n" + - "\x05Hello\x12\r.blocks.Empty\x1a\x14.wallet.PaymentReply\"\x00\x12-\n" + - "\x03Way\x12\x12.wallet.WayRequest\x1a\x10.wallet.WayReply\"\x00\x122\n" + - "\x03Get\x12\x14.blocks.IdentRequest\x1a\x13.wallet.PaymentItem\"\x00\x127\n" + + "\x05value\x18\x02 \x01(\tR\x05value:\x028\x012\xf9\x02\n" + + "\aPayment\x12=\n" + + "\x05Hello\x12\x1c.finance_wallet_blocks.Empty\x1a\x14.wallet.PaymentReply\"\x00\x12-\n" + + "\x03Way\x12\x12.wallet.WayRequest\x1a\x10.wallet.WayReply\"\x00\x12A\n" + + "\x03Get\x12#.finance_wallet_blocks.IdentRequest\x1a\x13.wallet.PaymentItem\"\x00\x127\n" + "\aByOrder\x12\x14.wallet.OrderRequest\x1a\x14.wallet.PaymentReply\"\x00\x129\n" + - "\bByCharge\x12\x15.wallet.ChargeRequest\x1a\x14.wallet.PaymentReply\"\x00\x12:\n" + - "\bCallback\x12\x17.wallet.CallbackRequest\x1a\x13.blocks.StatusReply\"\x00B*Z(bsm/full/module/finance/wallet/pb;walletb\x06proto3" + "\bByCharge\x12\x15.wallet.ChargeRequest\x1a\x14.wallet.PaymentReply\"\x00\x12I\n" + + "\bCallback\x12\x17.wallet.CallbackRequest\x1a\".finance_wallet_blocks.StatusReply\"\x00B*Z(bsm/full/module/finance/wallet/pb;walletb\x06proto3" var ( file_module_finance_wallet_proto_payment_proto_rawDescOnce sync.Once @@ -657,16 +657,16 @@ var file_module_finance_wallet_proto_payment_proto_goTypes = []any{ (*CallbackRequest)(nil), // 6: wallet.CallbackRequest (*PaymentReply)(nil), // 7: wallet.PaymentReply nil, // 8: wallet.PaymentReply.ResultEntry - (*Empty)(nil), // 9: blocks.Empty - (*IdentRequest)(nil), // 10: blocks.IdentRequest - (*StatusReply)(nil), // 11: blocks.StatusReply + (*Empty)(nil), // 9: finance_wallet_blocks.Empty + (*IdentRequest)(nil), // 10: finance_wallet_blocks.IdentRequest + (*StatusReply)(nil), // 11: finance_wallet_blocks.StatusReply } var file_module_finance_wallet_proto_payment_proto_depIdxs = []int32{ 2, // 0: wallet.WayReply.way:type_name -> wallet.WayItem 8, // 1: wallet.PaymentReply.result:type_name -> wallet.PaymentReply.ResultEntry - 9, // 2: wallet.Payment.Hello:input_type -> blocks.Empty + 9, // 2: wallet.Payment.Hello:input_type -> finance_wallet_blocks.Empty 0, // 3: wallet.Payment.Way:input_type -> wallet.WayRequest - 10, // 4: wallet.Payment.Get:input_type -> blocks.IdentRequest + 10, // 4: wallet.Payment.Get:input_type -> finance_wallet_blocks.IdentRequest 5, // 5: wallet.Payment.ByOrder:input_type -> wallet.OrderRequest 4, // 6: wallet.Payment.ByCharge:input_type -> wallet.ChargeRequest 6, // 7: wallet.Payment.Callback:input_type -> wallet.CallbackRequest @@ -675,7 +675,7 @@ var file_module_finance_wallet_proto_payment_proto_depIdxs = []int32{ 3, // 10: wallet.Payment.Get:output_type -> wallet.PaymentItem 7, // 11: wallet.Payment.ByOrder:output_type -> wallet.PaymentReply 7, // 12: wallet.Payment.ByCharge:output_type -> wallet.PaymentReply - 11, // 13: wallet.Payment.Callback:output_type -> blocks.StatusReply + 11, // 13: wallet.Payment.Callback:output_type -> finance_wallet_blocks.StatusReply 8, // [8:14] is the sub-list for method output_type 2, // [2:8] is the sub-list for method input_type 2, // [2:2] is the sub-list for extension type_name diff --git a/module/finance/wallet/pb/wallet.pb.go b/module/finance/wallet/pb/wallet.pb.go index 542ff1a..8624b8e 100644 --- a/module/finance/wallet/pb/wallet.pb.go +++ b/module/finance/wallet/pb/wallet.pb.go @@ -1183,17 +1183,17 @@ const file_module_finance_wallet_proto_wallet_proto_rawDesc = "" + "\x10ApplyCashRequest\x12\x18\n" + "\achannel\x18\x01 \x01(\x05R\achannel\x12\x16\n" + "\x06amount\x18\x02 \x01(\x03R\x06amount\x12\x16\n" + - "\x06remark\x18\x03 \x01(\tR\x06remark2\xa1\x04\n" + + "\x06remark\x18\x03 \x01(\tR\x06remark2\xec\x04\n" + "\x05Basic\x12?\n" + - "\tGetWallet\x12\x18.wallet.GetWalletRequest\x1a\x16.wallet.GetWalletReply\"\x00\x12F\n" + - "\x0eSetPayPassword\x12\x1d.wallet.SetPayPasswordRequest\x1a\x13.blocks.StatusReply\"\x00\x12D\n" + - "\rBindPaymentId\x12\x1c.wallet.BindPaymentIDRequest\x1a\x13.blocks.StatusReply\"\x00\x12H\n" + - "\fTransactions\x12\x1b.wallet.TransactionsRequest\x1a\x19.wallet.TransactionsReply\"\x00\x12@\n" + - "\vAddBankCard\x12\x1a.wallet.AddBankCardRequest\x1a\x13.blocks.StatusReply\"\x00\x12?\n" + - "\vGetBankCard\x12\x14.wallet.FinanceEmpty\x1a\x18.wallet.GetBankCardReply\"\x00\x12>\n" + + "\tGetWallet\x12\x18.wallet.GetWalletRequest\x1a\x16.wallet.GetWalletReply\"\x00\x12U\n" + + "\x0eSetPayPassword\x12\x1d.wallet.SetPayPasswordRequest\x1a\".finance_wallet_blocks.StatusReply\"\x00\x12S\n" + + "\rBindPaymentId\x12\x1c.wallet.BindPaymentIDRequest\x1a\".finance_wallet_blocks.StatusReply\"\x00\x12H\n" + + "\fTransactions\x12\x1b.wallet.TransactionsRequest\x1a\x19.wallet.TransactionsReply\"\x00\x12O\n" + + "\vAddBankCard\x12\x1a.wallet.AddBankCardRequest\x1a\".finance_wallet_blocks.StatusReply\"\x00\x12?\n" + + "\vGetBankCard\x12\x14.wallet.FinanceEmpty\x1a\x18.wallet.GetBankCardReply\"\x00\x12M\n" + "\n" + - "RmBankCard\x12\x19.wallet.RmBankCardRequest\x1a\x13.blocks.StatusReply\"\x00\x12<\n" + - "\tApplyCash\x12\x18.wallet.ApplyCashRequest\x1a\x13.blocks.StatusReply\"\x00B*Z(bsm/full/module/finance/wallet/pb;walletb\x06proto3" + "RmBankCard\x12\x19.wallet.RmBankCardRequest\x1a\".finance_wallet_blocks.StatusReply\"\x00\x12K\n" + + "\tApplyCash\x12\x18.wallet.ApplyCashRequest\x1a\".finance_wallet_blocks.StatusReply\"\x00B*Z(bsm/full/module/finance/wallet/pb;walletb\x06proto3" var ( file_module_finance_wallet_proto_wallet_proto_rawDescOnce sync.Once @@ -1225,7 +1225,7 @@ var file_module_finance_wallet_proto_wallet_proto_goTypes = []any{ (*BankCardInfo)(nil), // 13: wallet.BankCardInfo (*ApplyCashRequest)(nil), // 14: wallet.ApplyCashRequest nil, // 15: wallet.GetWalletReply.TotalEntry - (*StatusReply)(nil), // 16: blocks.StatusReply + (*StatusReply)(nil), // 16: finance_wallet_blocks.StatusReply } var file_module_finance_wallet_proto_wallet_proto_depIdxs = []int32{ 15, // 0: wallet.GetWalletReply.total:type_name -> wallet.GetWalletReply.TotalEntry @@ -1241,13 +1241,13 @@ var file_module_finance_wallet_proto_wallet_proto_depIdxs = []int32{ 11, // 10: wallet.Basic.RmBankCard:input_type -> wallet.RmBankCardRequest 14, // 11: wallet.Basic.ApplyCash:input_type -> wallet.ApplyCashRequest 1, // 12: wallet.Basic.GetWallet:output_type -> wallet.GetWalletReply - 16, // 13: wallet.Basic.SetPayPassword:output_type -> blocks.StatusReply - 16, // 14: wallet.Basic.BindPaymentId:output_type -> blocks.StatusReply + 16, // 13: wallet.Basic.SetPayPassword:output_type -> finance_wallet_blocks.StatusReply + 16, // 14: wallet.Basic.BindPaymentId:output_type -> finance_wallet_blocks.StatusReply 3, // 15: wallet.Basic.Transactions:output_type -> wallet.TransactionsReply - 16, // 16: wallet.Basic.AddBankCard:output_type -> blocks.StatusReply + 16, // 16: wallet.Basic.AddBankCard:output_type -> finance_wallet_blocks.StatusReply 12, // 17: wallet.Basic.GetBankCard:output_type -> wallet.GetBankCardReply - 16, // 18: wallet.Basic.RmBankCard:output_type -> blocks.StatusReply - 16, // 19: wallet.Basic.ApplyCash:output_type -> blocks.StatusReply + 16, // 18: wallet.Basic.RmBankCard:output_type -> finance_wallet_blocks.StatusReply + 16, // 19: wallet.Basic.ApplyCash:output_type -> finance_wallet_blocks.StatusReply 12, // [12:20] is the sub-list for method output_type 4, // [4:12] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name diff --git a/module/finance/wallet/proto/const.proto b/module/finance/wallet/proto/const.proto index 981efa2..39ea704 100644 --- a/module/finance/wallet/proto/const.proto +++ b/module/finance/wallet/proto/const.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -package blocks; +package finance_wallet_blocks; option go_package = "bsm/full/module/finance/wallet/pb;wallet"; diff --git a/module/finance/wallet/proto/payment.proto b/module/finance/wallet/proto/payment.proto index 8899746..08c82b3 100644 --- a/module/finance/wallet/proto/payment.proto +++ b/module/finance/wallet/proto/payment.proto @@ -4,13 +4,13 @@ option go_package = "bsm/full/module/finance/wallet/pb;wallet"; import "module/finance/wallet/proto/const.proto"; service Payment { - rpc Hello(blocks.Empty) returns (PaymentReply) {} + rpc Hello(finance_wallet_blocks.Empty) returns (PaymentReply) {} //获取平台支持的支付网关 rpc Way(WayRequest) returns (WayReply) {} //获取支付的详情 - rpc Get(blocks.IdentRequest) returns (PaymentItem){} + rpc Get(finance_wallet_blocks.IdentRequest) returns (PaymentItem){} //支付-电商订单 rpc ByOrder (OrderRequest) returns (PaymentReply) {}; @@ -19,7 +19,7 @@ service Payment { rpc ByCharge (ChargeRequest) returns (PaymentReply) {}; //回调更新支付的结果和状态 - rpc Callback (CallbackRequest) returns (blocks.StatusReply) {}; + rpc Callback (CallbackRequest) returns (finance_wallet_blocks.StatusReply) {}; } message WayRequest { @@ -77,4 +77,4 @@ message CallbackRequest { message PaymentReply { int64 code =1; map result =2; //预支付返回 -} \ No newline at end of file +} diff --git a/module/finance/wallet/proto/wallet.proto b/module/finance/wallet/proto/wallet.proto index 6d76065..25b993c 100644 --- a/module/finance/wallet/proto/wallet.proto +++ b/module/finance/wallet/proto/wallet.proto @@ -8,26 +8,26 @@ service Basic { rpc GetWallet(GetWalletRequest) returns (GetWalletReply) {} //设置支付密码 - rpc SetPayPassword(SetPayPasswordRequest) returns (blocks.StatusReply) {} + rpc SetPayPassword(SetPayPasswordRequest) returns (finance_wallet_blocks.StatusReply) {} //绑定微信或支付宝账户 - rpc BindPaymentId(BindPaymentIDRequest) returns (blocks.StatusReply) {} + rpc BindPaymentId(BindPaymentIDRequest) returns (finance_wallet_blocks.StatusReply) {} //查询交易记录 rpc Transactions(TransactionsRequest) returns (TransactionsReply) {} //添加银行卡 - rpc AddBankCard (AddBankCardRequest) returns (blocks.StatusReply) {}; + rpc AddBankCard (AddBankCardRequest) returns (finance_wallet_blocks.StatusReply) {}; //获取用户银行卡列表 rpc GetBankCard (FinanceEmpty) returns (GetBankCardReply) {}; //删除银行卡 - rpc RmBankCard (RmBankCardRequest) returns (blocks.StatusReply) {}; + rpc RmBankCard (RmBankCardRequest) returns (finance_wallet_blocks.StatusReply) {}; //申请提现 - rpc ApplyCash (ApplyCashRequest) returns (blocks.StatusReply) {}; + rpc ApplyCash (ApplyCashRequest) returns (finance_wallet_blocks.StatusReply) {}; } message GetWalletRequest { diff --git a/module/finance/wallet/service/expose.go b/module/finance/wallet/service/expose.go new file mode 100644 index 0000000..ea7ac1f --- /dev/null +++ b/module/finance/wallet/service/expose.go @@ -0,0 +1,34 @@ +package service + +import ( + "context" + + "bsm/full/module/finance/wallet/internal/server" + pb "bsm/full/module/finance/wallet/pb" + gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" + "google.golang.org/grpc" +) + +type ExposeOptions struct { + GRPC *grpc.Server + Gateway *gwRuntime.ServeMux +} + +func Expose(options ExposeOptions) error { + server.New(options.GRPC) + + ctx := context.Background() + if err := pb.RegisterAlipayHandlerServer(ctx, options.Gateway, server.NewAlipayServer()); err != nil { + return err + } + if err := pb.RegisterPaymentHandlerServer(ctx, options.Gateway, server.NewPaymentServer()); err != nil { + return err + } + if err := pb.RegisterBasicHandlerServer(ctx, options.Gateway, server.NewBasicServer()); err != nil { + return err + } + if err := pb.RegisterWechatHandlerServer(ctx, options.Gateway, server.NewWechatServer()); err != nil { + return err + } + return nil +}