fix ads,passport

This commit is contained in:
2026-09-23 00:13:03 +08:00
parent b8ff9acc3d
commit 80b6c140fe
14 changed files with 575 additions and 3755 deletions

View File

@@ -25,13 +25,15 @@ func New(grpcServ *grpc.Server) *Server {
srv := &Server{
Ctx: context.Background(),
Grpc: grpcServ,
Grpc: grpc.NewServer(),
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)
}

View File

@@ -1,8 +1,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.36.11
// protoc v7.35.1
// source: module/base/ads/proto/ads.proto
// protoc-gen-go v1.36.12
// protoc v7.36.0
// source: ads.proto
package ads
@@ -30,7 +30,7 @@ type ByPosRequest struct {
func (x *ByPosRequest) Reset() {
*x = ByPosRequest{}
mi := &file_module_base_ads_proto_ads_proto_msgTypes[0]
mi := &file_ads_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -42,7 +42,7 @@ func (x *ByPosRequest) String() string {
func (*ByPosRequest) ProtoMessage() {}
func (x *ByPosRequest) ProtoReflect() protoreflect.Message {
mi := &file_module_base_ads_proto_ads_proto_msgTypes[0]
mi := &file_ads_proto_msgTypes[0]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -55,7 +55,7 @@ func (x *ByPosRequest) ProtoReflect() protoreflect.Message {
// Deprecated: Use ByPosRequest.ProtoReflect.Descriptor instead.
func (*ByPosRequest) Descriptor() ([]byte, []int) {
return file_module_base_ads_proto_ads_proto_rawDescGZIP(), []int{0}
return file_ads_proto_rawDescGZIP(), []int{0}
}
func (x *ByPosRequest) GetKey() string {
@@ -74,7 +74,7 @@ type ByPosReply struct {
func (x *ByPosReply) Reset() {
*x = ByPosReply{}
mi := &file_module_base_ads_proto_ads_proto_msgTypes[1]
mi := &file_ads_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -86,7 +86,7 @@ func (x *ByPosReply) String() string {
func (*ByPosReply) ProtoMessage() {}
func (x *ByPosReply) ProtoReflect() protoreflect.Message {
mi := &file_module_base_ads_proto_ads_proto_msgTypes[1]
mi := &file_ads_proto_msgTypes[1]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -99,7 +99,7 @@ func (x *ByPosReply) ProtoReflect() protoreflect.Message {
// Deprecated: Use ByPosReply.ProtoReflect.Descriptor instead.
func (*ByPosReply) Descriptor() ([]byte, []int) {
return file_module_base_ads_proto_ads_proto_rawDescGZIP(), []int{1}
return file_ads_proto_rawDescGZIP(), []int{1}
}
func (x *ByPosReply) GetData() []*AdsItem {
@@ -123,7 +123,7 @@ type AdsItem struct {
func (x *AdsItem) Reset() {
*x = AdsItem{}
mi := &file_module_base_ads_proto_ads_proto_msgTypes[2]
mi := &file_ads_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -135,7 +135,7 @@ func (x *AdsItem) String() string {
func (*AdsItem) ProtoMessage() {}
func (x *AdsItem) ProtoReflect() protoreflect.Message {
mi := &file_module_base_ads_proto_ads_proto_msgTypes[2]
mi := &file_ads_proto_msgTypes[2]
if x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -148,7 +148,7 @@ func (x *AdsItem) ProtoReflect() protoreflect.Message {
// Deprecated: Use AdsItem.ProtoReflect.Descriptor instead.
func (*AdsItem) Descriptor() ([]byte, []int) {
return file_module_base_ads_proto_ads_proto_rawDescGZIP(), []int{2}
return file_ads_proto_rawDescGZIP(), []int{2}
}
func (x *AdsItem) GetId() int64 {
@@ -193,11 +193,11 @@ func (x *AdsItem) GetCreated() string {
return ""
}
var File_module_base_ads_proto_ads_proto protoreflect.FileDescriptor
var File_ads_proto protoreflect.FileDescriptor
const file_module_base_ads_proto_ads_proto_rawDesc = "" +
const file_ads_proto_rawDesc = "" +
"\n" +
"\x1fmodule/base/ads/proto/ads.proto\x12\x03ads\" \n" +
"\tads.proto\x12\x03ads\" \n" +
"\fByPosRequest\x12\x10\n" +
"\x03key\x18\x01 \x01(\tR\x03key\".\n" +
"\n" +
@@ -211,27 +211,27 @@ const file_module_base_ads_proto_ads_proto_rawDesc = "" +
"\x05toUrl\x18\x05 \x01(\tR\x05toUrl\x12\x18\n" +
"\acreated\x18\x06 \x01(\tR\acreated26\n" +
"\x05Fetch\x12-\n" +
"\x05ByPos\x12\x11.ads.ByPosRequest\x1a\x0f.ads.ByPosReply\"\x00B!Z\x1fbsm/full/module/base/ads/pb;adsb\x06proto3"
"\x05ByPos\x12\x11.ads.ByPosRequest\x1a\x0f.ads.ByPosReply\"\x00B\aZ\x05.;adsb\x06proto3"
var (
file_module_base_ads_proto_ads_proto_rawDescOnce sync.Once
file_module_base_ads_proto_ads_proto_rawDescData []byte
file_ads_proto_rawDescOnce sync.Once
file_ads_proto_rawDescData []byte
)
func file_module_base_ads_proto_ads_proto_rawDescGZIP() []byte {
file_module_base_ads_proto_ads_proto_rawDescOnce.Do(func() {
file_module_base_ads_proto_ads_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_module_base_ads_proto_ads_proto_rawDesc), len(file_module_base_ads_proto_ads_proto_rawDesc)))
func file_ads_proto_rawDescGZIP() []byte {
file_ads_proto_rawDescOnce.Do(func() {
file_ads_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_ads_proto_rawDesc), len(file_ads_proto_rawDesc)))
})
return file_module_base_ads_proto_ads_proto_rawDescData
return file_ads_proto_rawDescData
}
var file_module_base_ads_proto_ads_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_module_base_ads_proto_ads_proto_goTypes = []any{
var file_ads_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_ads_proto_goTypes = []any{
(*ByPosRequest)(nil), // 0: ads.ByPosRequest
(*ByPosReply)(nil), // 1: ads.ByPosReply
(*AdsItem)(nil), // 2: ads.AdsItem
}
var file_module_base_ads_proto_ads_proto_depIdxs = []int32{
var file_ads_proto_depIdxs = []int32{
2, // 0: ads.ByPosReply.data:type_name -> ads.AdsItem
0, // 1: ads.Fetch.ByPos:input_type -> ads.ByPosRequest
1, // 2: ads.Fetch.ByPos:output_type -> ads.ByPosReply
@@ -242,26 +242,26 @@ var file_module_base_ads_proto_ads_proto_depIdxs = []int32{
0, // [0:1] is the sub-list for field type_name
}
func init() { file_module_base_ads_proto_ads_proto_init() }
func file_module_base_ads_proto_ads_proto_init() {
if File_module_base_ads_proto_ads_proto != nil {
func init() { file_ads_proto_init() }
func file_ads_proto_init() {
if File_ads_proto != nil {
return
}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_module_base_ads_proto_ads_proto_rawDesc), len(file_module_base_ads_proto_ads_proto_rawDesc)),
RawDescriptor: unsafe.Slice(unsafe.StringData(file_ads_proto_rawDesc), len(file_ads_proto_rawDesc)),
NumEnums: 0,
NumMessages: 3,
NumExtensions: 0,
NumServices: 1,
},
GoTypes: file_module_base_ads_proto_ads_proto_goTypes,
DependencyIndexes: file_module_base_ads_proto_ads_proto_depIdxs,
MessageInfos: file_module_base_ads_proto_ads_proto_msgTypes,
GoTypes: file_ads_proto_goTypes,
DependencyIndexes: file_ads_proto_depIdxs,
MessageInfos: file_ads_proto_msgTypes,
}.Build()
File_module_base_ads_proto_ads_proto = out.File
file_module_base_ads_proto_ads_proto_goTypes = nil
file_module_base_ads_proto_ads_proto_depIdxs = nil
File_ads_proto = out.File
file_ads_proto_goTypes = nil
file_ads_proto_depIdxs = nil
}

View File

@@ -1,5 +1,5 @@
// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
// source: module/base/ads/proto/ads.proto
// source: ads.proto
/*
Package ads is a reverse proxy.

View File

@@ -1,8 +1,8 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
// - protoc-gen-go-grpc v1.6.2
// - protoc v7.35.1
// source: module/base/ads/proto/ads.proto
// - protoc v7.36.0
// source: ads.proto
package ads
@@ -28,7 +28,7 @@ const (
//
// 广告子系统
type FetchClient interface {
// 通过广告位获取广告信息
//通过广告位获取广告信息
ByPos(ctx context.Context, in *ByPosRequest, opts ...grpc.CallOption) (*ByPosReply, error)
}
@@ -51,16 +51,17 @@ func (c *fetchClient) ByPos(ctx context.Context, in *ByPosRequest, opts ...grpc.
}
// FetchServer is the server API for Fetch service.
// All implementations should embed UnimplementedFetchServer
// All implementations must embed UnimplementedFetchServer
// for forward compatibility.
//
// 广告子系统
type FetchServer interface {
// 通过广告位获取广告信息
//通过广告位获取广告信息
ByPos(context.Context, *ByPosRequest) (*ByPosReply, error)
mustEmbedUnimplementedFetchServer()
}
// UnimplementedFetchServer should be embedded to have
// UnimplementedFetchServer must be embedded to have
// forward compatible implementations.
//
// NOTE: this should be embedded by value instead of pointer to avoid a nil
@@ -70,7 +71,8 @@ type UnimplementedFetchServer struct{}
func (UnimplementedFetchServer) ByPos(context.Context, *ByPosRequest) (*ByPosReply, error) {
return nil, status.Error(codes.Unimplemented, "method ByPos not implemented")
}
func (UnimplementedFetchServer) testEmbeddedByValue() {}
func (UnimplementedFetchServer) mustEmbedUnimplementedFetchServer() {}
func (UnimplementedFetchServer) testEmbeddedByValue() {}
// UnsafeFetchServer may be embedded to opt out of forward compatibility for this service.
// Use of this interface is not recommended, as added methods to FetchServer will
@@ -121,5 +123,5 @@ var Fetch_ServiceDesc = grpc.ServiceDesc{
},
},
Streams: []grpc.StreamDesc{},
Metadata: "module/base/ads/proto/ads.proto",
Metadata: "ads.proto",
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
syntax = "proto3";
package ads;
option go_package = "bsm/full/module/base/ads/pb;ads";
option go_package = ".;ads";
//广告子系统
service Fetch{

View File

@@ -1,326 +0,0 @@
syntax = "proto3";
package base_ads_blocks;
option go_package = "bsm/full/module/base/ads/pb;ads";
// Shared request and response messages.
message Empty {}
message FetchRequest {
int64 page_no = 1 [json_name = "page_no"];
int64 page_size = 2 [json_name = "page_size"];
map<string, string> params = 3;
}
message IdentRequest {
int64 id = 1;
string identity = 2;
}
message VersionRequest {
int64 version = 1;
}
message SearchRequest {
string keyword = 1;
}
message StatusReply {
int32 code = 1;
string message = 2;
string details = 3;
int64 timeseq = 4;
}
// Service-specific variants whose wire formats differ from the shared types.
message CmsSearchRequest {
string keyword = 1;
int64 page_no = 2 [json_name = "page_no"];
int64 page_size = 3 [json_name = "page_size"];
}
message MallFetchRequest {
int64 page_no = 1 [json_name = "page_no"];
int64 page_size = 2 [json_name = "page_size"];
map<string, string> params = 3;
string store_identity = 4 [json_name = "store_identity"];
string keyword = 5;
repeated int64 category_id = 6;
string sort = 7;
int64 min_price = 8 [json_name = "min_price"];
int64 max_price = 9 [json_name = "max_price"];
}
message MarketFetchRequest {
int64 page_no = 1 [json_name = "page_no"];
int64 page_size = 2 [json_name = "page_size"];
map<string, string> params = 3;
string identity = 4;
string keyword = 5;
int32 status = 6;
int32 approve = 7;
}
message OrderIdentRequest {
int64 id = 1;
string identity = 2;
string reason = 3;
int32 approve = 4;
string agency = 5;
string store_identity = 6;
}
message DeliveryStatusReply {
int64 status = 1;
string identity = 2;
string message = 3;
int64 timeseq = 4;
}
message IdentityStatusReply {
int32 code = 1;
string identity = 2;
string message = 3;
int64 timeseq = 4;
}
message OrderStatusReply {
int32 code = 1;
string identity = 2;
string message = 3;
int64 timeseq = 4;
string reason = 5;
}
message DataStatusReply {
string data = 1;
int64 timeseq = 2;
}
message StoreSerialRequest {
string store_identity = 1 [json_name = "store_identity"];
repeated string serial_id = 2 [json_name = "serial_id"];
}
// Cloud messages.
message IDRequest {
uint64 id = 1;
}
message IDListRequest {
repeated uint64 ids = 1;
}
message StdIicuds {
uint64 id = 1;
string created_at = 2;
string updated_at = 3;
string deleted_at = 4;
}
message StdPassport {
uint64 passport_id = 1;
string passport_identity = 2;
}
message CloudBase {
uint64 cloud_id = 1;
string cloud_identity = 2;
}
// CMS messages.
message CmsCategoryItem {
string site_identity = 1 [json_name = "site_identity"];
int64 id = 2;
string identity = 3;
int64 parent_id = 4 [json_name = "parent_id"];
string title = 5;
string cover_path = 6 [json_name = "cover_path"];
string intro = 7;
string created_at = 8 [json_name = "created_at"];
string updated_at = 9 [json_name = "updated_at"];
repeated CmsCategoryItem child = 10;
string category_key = 11 [json_name = "category_key"];
}
message CmsTagsItem {
int64 id = 1;
string identity = 2;
string title = 3;
string cover_path = 4 [json_name = "cover_path"];
string intro = 5;
string created_at = 6 [json_name = "created_at"];
}
message CmsAccessoryItem {
string identity = 1;
string title = 2;
string file_path = 3 [json_name = "file_path"];
string created_at = 4 [json_name = "created_at"];
}
// Passport messages.
message VerifyStatus {
int32 email_verify = 1;
int32 phone_verify = 2;
int32 face_verify = 3;
int32 document_verify = 4;
int32 kyc_verify = 5;
}
// Market messages.
message MarketLoginReply {
string token = 1;
string identity = 2;
string market_identity = 3 [json_name = "market_identity"];
string name = 4;
string account = 5;
string role = 6;
int32 status = 7;
string created_at = 8 [json_name = "created_at"];
string market_name = 9 [json_name = "market_name"];
}
// Order messages.
message OrderSummaryItem {
int64 id = 1;
string order_no = 2 [json_name = "order_no"];
int64 partner_id = 3 [json_name = "partner_id"];
string identity = 4;
int64 total_price = 7 [json_name = "total_price"];
int64 trans_price = 8 [json_name = "trans_price"];
int64 refund_price = 9 [json_name = "refund_price"];
int64 logistics_fee = 11 [json_name = "logistics_fee"];
int64 coupon_amount = 12 [json_name = "coupon_amount"];
string remark = 13;
int32 status = 14;
string logistics_number = 15 [json_name = "logistics_number"];
string address_identity = 16 [json_name = "address_identity"];
string county = 17;
string province = 18;
string city = 19;
string area = 20;
string address = 21;
string contact = 22;
string phone = 23;
string delivery_time = 24 [json_name = "delivery_time"];
string delivery_identity = 25 [json_name = "delivery_identity"];
int32 pay_type = 26 [json_name = "pay_type"];
int64 pay_amount = 27 [json_name = "pay_amount"];
string pay_trade_no = 28 [json_name = "pay_trade_no"];
string pay_time = 29 [json_name = "pay_time"];
string pay_remark = 30 [json_name = "pay_remark"];
string created = 31;
string updated = 32;
repeated OrderDetails details = 33;
string addr = 34;
string car_identity = 35 [json_name = "car_identity"];
string delivery_address = 36 [json_name = "delivery_address"];
string brand = 37;
string version = 38;
string license_number = 39 [json_name = "license_number"];
string member_name = 40 [json_name = "member_name"];
string member_phone = 41 [json_name = "member_phone"];
int32 approve = 42;
}
message OrderDetails {
int64 id = 1;
int64 product_id = 2 [json_name = "product_id"];
string spec_no = 3 [json_name = "spec_no"];
string spec = 4;
int64 type = 5;
string title = 6;
string cover_image = 7 [json_name = "cover_image"];
int64 sales_price = 8 [json_name = "sales_price"];
string product_args = 9 [json_name = "product_args"];
int64 number = 10;
int64 unit_price = 11 [json_name = "unit_price"];
int64 spec_id = 12 [json_name = "spec_id"];
string product_identity = 13 [json_name = "product_identity"];
int64 gas_types = 14 [json_name = "gas_types"];
int64 total_price = 15 [json_name = "total_price"];
}
// Social feed messages.
message FeedPostListReply {
repeated FeedPostItem list = 1;
int64 cnt = 2;
}
message FeedPostItem {
string identity = 1;
string content = 2;
int64 feed_id = 3;
string feed_identity = 4;
bool is_open = 5;
int64 cnt_unlike = 6;
int64 cnt_comment = 7;
int64 cnt_like = 8;
repeated FeedAttachItem attachs = 9;
repeated FeedTagItem tags = 10;
}
message FeedAttachItem {
string identity = 1;
string attach_type = 2;
string url = 3;
}
message FeedTagItem {
string key = 1;
string content = 2;
}
// Social group messages.
message GroupPostListReply {
repeated GroupPostItem list = 1;
int64 cnt = 2;
}
message GroupPostItem {
string identity = 1;
string content = 2;
int64 passport_id = 3;
string passport_identity = 4;
bool is_open = 5;
int64 cnt_unlike = 6;
int64 cnt_comment = 7;
int64 cnt_like = 8;
repeated GroupAttachItem attachs = 9;
repeated GroupTagItem tags = 10;
}
message GroupAttachItem {
string identity = 1;
string attach_type = 2;
string url = 3;
}
message GroupTagItem {
string key = 1;
string content = 2;
}
// Social relation messages.
message RelationItem {
string identity = 1;
string nickname = 2;
string remark_name = 3;
int32 popular = 4;
string avatar = 5;
string birthday = 6;
int32 sex = 7;
int32 province = 8;
int32 city = 9;
int32 area = 10;
string sign = 11;
repeated string tags = 12;
int32 foreign_status = 13;
}
message FetchRelationItemReply {
int64 total = 1;
repeated RelationItem data = 2;
}