浏览代码

remove base

wfz 3 年之前
父节点
当前提交
b9d5c2a854
共有 5 个文件被更改,包括 89 次插入1185 次删除
  1. 14 554
      api/base/base.pb.go
  2. 61 61
      api/base/base.proto
  3. 3 384
      api/base/base_grpc.pb.go
  4. 0 174
      api/base/base_http.pb.go
  5. 11 12
      client/base.go

+ 14 - 554
api/base/base.pb.go

@@ -7,12 +7,11 @@
 package base
 
 import (
-	common "git.ikuban.com/server/pw-protobuf/api/common"
+	_ "git.ikuban.com/server/pw-protobuf/api/common"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -22,335 +21,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-type CheckTextRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Text string `protobuf:"bytes,1,opt,name=text,proto3" json:"text"` // 待审核的文本
-}
-
-func (x *CheckTextRequest) Reset() {
-	*x = CheckTextRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CheckTextRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CheckTextRequest) ProtoMessage() {}
-
-func (x *CheckTextRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_base_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CheckTextRequest.ProtoReflect.Descriptor instead.
-func (*CheckTextRequest) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *CheckTextRequest) GetText() string {
-	if x != nil {
-		return x.Text
-	}
-	return ""
-}
-
-type CheckTextReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	IsPass bool `protobuf:"varint,1,opt,name=isPass,proto3" json:"isPass"` // 是否通过
-}
-
-func (x *CheckTextReply) Reset() {
-	*x = CheckTextReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CheckTextReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CheckTextReply) ProtoMessage() {}
-
-func (x *CheckTextReply) ProtoReflect() protoreflect.Message {
-	mi := &file_base_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use CheckTextReply.ProtoReflect.Descriptor instead.
-func (*CheckTextReply) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *CheckTextReply) GetIsPass() bool {
-	if x != nil {
-		return x.IsPass
-	}
-	return false
-}
-
-type MediaID struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	MediaId string `protobuf:"bytes,1,opt,name=mediaId,proto3" json:"mediaId"`
-}
-
-func (x *MediaID) Reset() {
-	*x = MediaID{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MediaID) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MediaID) ProtoMessage() {}
-
-func (x *MediaID) ProtoReflect() protoreflect.Message {
-	mi := &file_base_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MediaID.ProtoReflect.Descriptor instead.
-func (*MediaID) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *MediaID) GetMediaId() string {
-	if x != nil {
-		return x.MediaId
-	}
-	return ""
-}
-
-type MaterialLink struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Link string `protobuf:"bytes,1,opt,name=link,proto3" json:"link"`
-}
-
-func (x *MaterialLink) Reset() {
-	*x = MaterialLink{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MaterialLink) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MaterialLink) ProtoMessage() {}
-
-func (x *MaterialLink) ProtoReflect() protoreflect.Message {
-	mi := &file_base_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use MaterialLink.ProtoReflect.Descriptor instead.
-func (*MaterialLink) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *MaterialLink) GetLink() string {
-	if x != nil {
-		return x.Link
-	}
-	return ""
-}
-
-type RandomNicknameReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Nickname string `protobuf:"bytes,1,opt,name=nickname,proto3" json:"nickname"`
-}
-
-func (x *RandomNicknameReply) Reset() {
-	*x = RandomNicknameReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RandomNicknameReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RandomNicknameReply) ProtoMessage() {}
-
-func (x *RandomNicknameReply) ProtoReflect() protoreflect.Message {
-	mi := &file_base_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RandomNicknameReply.ProtoReflect.Descriptor instead.
-func (*RandomNicknameReply) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *RandomNicknameReply) GetNickname() string {
-	if x != nil {
-		return x.Nickname
-	}
-	return ""
-}
-
-type RandomAvatarReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	AvatarUrl string `protobuf:"bytes,1,opt,name=avatarUrl,proto3" json:"avatarUrl"`
-}
-
-func (x *RandomAvatarReply) Reset() {
-	*x = RandomAvatarReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RandomAvatarReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RandomAvatarReply) ProtoMessage() {}
-
-func (x *RandomAvatarReply) ProtoReflect() protoreflect.Message {
-	mi := &file_base_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RandomAvatarReply.ProtoReflect.Descriptor instead.
-func (*RandomAvatarReply) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *RandomAvatarReply) GetAvatarUrl() string {
-	if x != nil {
-		return x.AvatarUrl
-	}
-	return ""
-}
-
-type RandomAvatarListReply struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	List []string `protobuf:"bytes,1,rep,name=list,proto3" json:"list"`
-}
-
-func (x *RandomAvatarListReply) Reset() {
-	*x = RandomAvatarListReply{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *RandomAvatarListReply) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*RandomAvatarListReply) ProtoMessage() {}
-
-func (x *RandomAvatarListReply) ProtoReflect() protoreflect.Message {
-	mi := &file_base_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use RandomAvatarListReply.ProtoReflect.Descriptor instead.
-func (*RandomAvatarListReply) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *RandomAvatarListReply) GetList() []string {
-	if x != nil {
-		return x.List
-	}
-	return make([]string, 0)
-}
-
 var File_base_proto protoreflect.FileDescriptor
 
 var file_base_proto_rawDesc = []byte{
@@ -358,144 +28,21 @@ var file_base_proto_rawDesc = []byte{
 	0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61,
 	0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x26, 0x0a,
-	0x10, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x65, 0x78, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x74, 0x65, 0x78, 0x74, 0x22, 0x28, 0x0a, 0x0e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x65,
-	0x78, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x50, 0x61, 0x73,
-	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x50, 0x61, 0x73, 0x73, 0x22,
-	0x23, 0x0a, 0x07, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65,
-	0x64, 0x69, 0x61, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x64,
-	0x69, 0x61, 0x49, 0x64, 0x22, 0x22, 0x0a, 0x0c, 0x4d, 0x61, 0x74, 0x65, 0x72, 0x69, 0x61, 0x6c,
-	0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x22, 0x31, 0x0a, 0x13, 0x52, 0x61, 0x6e, 0x64,
-	0x6f, 0x6d, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12,
-	0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x31, 0x0a, 0x11, 0x52,
-	0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79,
-	0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x22, 0x2b,
-	0x0a, 0x15, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4c, 0x69,
-	0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x32, 0xbc, 0x06, 0x0a, 0x04,
-	0x42, 0x61, 0x73, 0x65, 0x12, 0x6b, 0x0a, 0x0e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x69,
-	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d,
-	0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x69, 0x63, 0x6b,
-	0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x20, 0x22, 0x1b, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x72,
-	0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x2f, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x3a, 0x01,
-	0x2a, 0x12, 0x65, 0x0a, 0x0c, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x41, 0x76, 0x61, 0x74, 0x61,
-	0x72, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53,
-	0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61, 0x73, 0x65,
-	0x2e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x22, 0x24, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x22, 0x19, 0x2f, 0x61, 0x70, 0x69,
-	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x2f, 0x61,
-	0x76, 0x61, 0x74, 0x61, 0x72, 0x3a, 0x01, 0x2a, 0x12, 0x70, 0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x64,
-	0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x12, 0x12, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x1a,
-	0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x6e,
-	0x64, 0x6f, 0x6d, 0x49, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x52, 0x65, 0x70, 0x6c,
-	0x79, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x2f, 0x69, 0x6e,
-	0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x3a, 0x01, 0x2a, 0x12, 0x49, 0x0a, 0x10, 0x52, 0x61,
-	0x6e, 0x64, 0x6f, 0x6d, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x12,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x78, 0x52,
-	0x65, 0x71, 0x1a, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x52, 0x61,
-	0x6e, 0x64, 0x6f, 0x6d, 0x41, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x10, 0x46, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x67,
-	0x4c, 0x69, 0x73, 0x74, 0x42, 0x79, 0x53, 0x65, 0x78, 0x12, 0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x53, 0x65, 0x78, 0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69,
-	0x73, 0x74, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3a, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x64, 0x54,
-	0x61, 0x67, 0x73, 0x42, 0x79, 0x49, 0x44, 0x73, 0x12, 0x0f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x49, 0x64, 0x73, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
-	0x70, 0x6c, 0x79, 0x12, 0x41, 0x0a, 0x0e, 0x46, 0x69, 0x6e, 0x64, 0x4d, 0x65, 0x6d, 0x65, 0x42,
-	0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x17, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
-	0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14,
-	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x6d, 0x65,
-	0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4e, 0x0a, 0x0d, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68,
-	0x61, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x20, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
-	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70,
-	0x69, 0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x6f, 0x70, 0x69, 0x63,
-	0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x0a, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
-	0x4d, 0x65, 0x6d, 0x65, 0x12, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
-	0x6e, 0x2e, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x1a, 0x1a, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x54,
-	0x65, 0x78, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x12, 0x52, 0x61, 0x6e,
-	0x64, 0x6f, 0x6d, 0x53, 0x77, 0x69, 0x66, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
-	0x1b, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x6e,
-	0x64, 0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x41, 0x6e, 0x64, 0x53, 0x65, 0x78, 0x1a, 0x1a, 0x2e, 0x61,
-	0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x54, 0x65, 0x78, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70,
-	0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b,
-	0x75, 0x62, 0x61, 0x6e, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f,
-	0x70, 0x77, 0x2d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x62, 0x61, 0x73, 0x65, 0x3b, 0x62, 0x61, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x06, 0x0a,
+	0x04, 0x42, 0x61, 0x73, 0x65, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61, 0x73,
+	0x65, 0x50, 0x01, 0x5a, 0x2f, 0x67, 0x69, 0x74, 0x2e, 0x69, 0x6b, 0x75, 0x62, 0x61, 0x6e, 0x2e,
+	0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2f, 0x70, 0x77, 0x2d, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x3b,
+	0x62, 0x61, 0x73, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-var (
-	file_base_proto_rawDescOnce sync.Once
-	file_base_proto_rawDescData = file_base_proto_rawDesc
-)
-
-func file_base_proto_rawDescGZIP() []byte {
-	file_base_proto_rawDescOnce.Do(func() {
-		file_base_proto_rawDescData = protoimpl.X.CompressGZIP(file_base_proto_rawDescData)
-	})
-	return file_base_proto_rawDescData
-}
-
-var file_base_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_base_proto_goTypes = []interface{}{
-	(*CheckTextRequest)(nil),            // 0: api.base.CheckTextRequest
-	(*CheckTextReply)(nil),              // 1: api.base.CheckTextReply
-	(*MediaID)(nil),                     // 2: api.base.MediaID
-	(*MaterialLink)(nil),                // 3: api.base.MaterialLink
-	(*RandomNicknameReply)(nil),         // 4: api.base.RandomNicknameReply
-	(*RandomAvatarReply)(nil),           // 5: api.base.RandomAvatarReply
-	(*RandomAvatarListReply)(nil),       // 6: api.base.RandomAvatarListReply
-	(*common.SexReq)(nil),               // 7: api.common.SexReq
-	(*common.Ids)(nil),                  // 8: api.common.Ids
-	(*common.MemeRequest)(nil),          // 9: api.common.MemeRequest
-	(*common.FindChatTopicRequest)(nil), // 10: api.common.FindChatTopicRequest
-	(*common.RandomNum)(nil),            // 11: api.common.RandomNum
-	(*common.RandomNumAndSex)(nil),      // 12: api.common.RandomNumAndSex
-	(*common.RandomIntroduceReply)(nil), // 13: api.common.RandomIntroduceReply
-	(*common.TagListReply)(nil),         // 14: api.common.TagListReply
-	(*common.MemeList)(nil),             // 15: api.common.MemeList
-	(*common.ChatTopicList)(nil),        // 16: api.common.ChatTopicList
-	(*common.CommonTextList)(nil),       // 17: api.common.CommonTextList
-}
+var file_base_proto_goTypes = []interface{}{}
 var file_base_proto_depIdxs = []int32{
-	7,  // 0: api.base.Base.RandomNickname:input_type -> api.common.SexReq
-	7,  // 1: api.base.Base.RandomAvatar:input_type -> api.common.SexReq
-	7,  // 2: api.base.Base.RandomIntroduce:input_type -> api.common.SexReq
-	7,  // 3: api.base.Base.RandomAvatarList:input_type -> api.common.SexReq
-	7,  // 4: api.base.Base.FindTagListBySex:input_type -> api.common.SexReq
-	8,  // 5: api.base.Base.FindTagsByIDs:input_type -> api.common.Ids
-	9,  // 6: api.base.Base.FindMemeByType:input_type -> api.common.MemeRequest
-	10, // 7: api.base.Base.FindChatTopic:input_type -> api.common.FindChatTopicRequest
-	11, // 8: api.base.Base.RandomMeme:input_type -> api.common.RandomNum
-	12, // 9: api.base.Base.RandomSwiftMessage:input_type -> api.common.RandomNumAndSex
-	4,  // 10: api.base.Base.RandomNickname:output_type -> api.base.RandomNicknameReply
-	5,  // 11: api.base.Base.RandomAvatar:output_type -> api.base.RandomAvatarReply
-	13, // 12: api.base.Base.RandomIntroduce:output_type -> api.common.RandomIntroduceReply
-	6,  // 13: api.base.Base.RandomAvatarList:output_type -> api.base.RandomAvatarListReply
-	14, // 14: api.base.Base.FindTagListBySex:output_type -> api.common.TagListReply
-	14, // 15: api.base.Base.FindTagsByIDs:output_type -> api.common.TagListReply
-	15, // 16: api.base.Base.FindMemeByType:output_type -> api.common.MemeList
-	16, // 17: api.base.Base.FindChatTopic:output_type -> api.common.ChatTopicList
-	17, // 18: api.base.Base.RandomMeme:output_type -> api.common.CommonTextList
-	17, // 19: api.base.Base.RandomSwiftMessage:output_type -> api.common.CommonTextList
-	10, // [10:20] is the sub-list for method output_type
-	0,  // [0:10] is the sub-list for method input_type
-	0,  // [0:0] is the sub-list for extension type_name
-	0,  // [0:0] is the sub-list for extension extendee
-	0,  // [0:0] is the sub-list for field type_name
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
 }
 
 func init() { file_base_proto_init() }
@@ -503,105 +50,18 @@ func file_base_proto_init() {
 	if File_base_proto != nil {
 		return
 	}
-	if !protoimpl.UnsafeEnabled {
-		file_base_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CheckTextRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_base_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CheckTextReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_base_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MediaID); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_base_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MaterialLink); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_base_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RandomNicknameReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_base_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RandomAvatarReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_base_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*RandomAvatarListReply); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_base_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   7,
+			NumMessages:   0,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
 		GoTypes:           file_base_proto_goTypes,
 		DependencyIndexes: file_base_proto_depIdxs,
-		MessageInfos:      file_base_proto_msgTypes,
 	}.Build()
 	File_base_proto = out.File
 	file_base_proto_rawDesc = nil

+ 61 - 61
api/base/base.proto

@@ -12,66 +12,66 @@ option java_multiple_files = true;
 option java_package = "api.base";
 
 service Base {
-
-  rpc RandomNickname (common.SexReq) returns (RandomNicknameReply){
-    option (google.api.http) = {
-      post: "/api/common/random/nickname",
-      body:"*"
-    };
-  };
-  rpc RandomAvatar (common.SexReq) returns (RandomAvatarReply){
-    option (google.api.http) = {
-      post: "/api/common/random/avatar",
-      body:"*"
-    };
-  };
-  // 随机介绍接口
-  rpc RandomIntroduce (common.SexReq) returns (common.RandomIntroduceReply){
-    option (google.api.http) = {
-      post: "/api/common/random/introduce",
-      body:"*"
-    };
-  };
-  // 随机头像列表
-  rpc RandomAvatarList (common.SexReq) returns (RandomAvatarListReply){};
-  // 通过分组名和性别查询标签
-  rpc FindTagListBySex (common.SexReq) returns (common.TagListReply);
-  // 通过标签IDs查询标签
-  rpc FindTagsByIDs (common.Ids) returns (common.TagListReply);
-  // 通过类型获取表情包列表
-  rpc FindMemeByType (common.MemeRequest) returns (common.MemeList){};
-  // 获取对方性别的聊天话题
-  rpc FindChatTopic (common.FindChatTopicRequest) returns (common.ChatTopicList){};
-  // 随机表情包
-  rpc RandomMeme (common.RandomNum) returns (common.CommonTextList){};
-  // 随机打招呼
-  rpc RandomSwiftMessage (common.RandomNumAndSex) returns (common.CommonTextList){};
-}
-
-message CheckTextRequest{
-  string text = 1;// 待审核的文本
-}
-
-message CheckTextReply{
-  bool isPass = 1;// 是否通过
-}
-
-message MediaID{
-  string mediaId = 1;
-}
-
-message MaterialLink {
-  string link = 1;
-}
-
-message RandomNicknameReply{
-  string nickname = 1;
-}
-
-message RandomAvatarReply{
-  string avatarUrl = 1;
+//
+//  rpc RandomNickname (common.SexReq) returns (RandomNicknameReply){
+//    option (google.api.http) = {
+//      post: "/api/common/random/nickname",
+//      body:"*"
+//    };
+//  };
+//  rpc RandomAvatar (common.SexReq) returns (RandomAvatarReply){
+//    option (google.api.http) = {
+//      post: "/api/common/random/avatar",
+//      body:"*"
+//    };
+//  };
+//  // 随机介绍接口
+//  rpc RandomIntroduce (common.SexReq) returns (common.RandomIntroduceReply){
+//    option (google.api.http) = {
+//      post: "/api/common/random/introduce",
+//      body:"*"
+//    };
+//  };
+//  // 随机头像列表
+//  rpc RandomAvatarList (common.SexReq) returns (RandomAvatarListReply){};
+//  // 通过分组名和性别查询标签
+//  rpc FindTagListBySex (common.SexReq) returns (common.TagListReply);
+//  // 通过标签IDs查询标签
+//  rpc FindTagsByIDs (common.Ids) returns (common.TagListReply);
+//  // 通过类型获取表情包列表
+//  rpc FindMemeByType (common.MemeRequest) returns (common.MemeList){};
+//  // 获取对方性别的聊天话题
+//  rpc FindChatTopic (common.FindChatTopicRequest) returns (common.ChatTopicList){};
+//  // 随机表情包
+//  rpc RandomMeme (common.RandomNum) returns (common.CommonTextList){};
+//  // 随机打招呼
+//  rpc RandomSwiftMessage (common.RandomNumAndSex) returns (common.CommonTextList){};
 }
 
-message RandomAvatarListReply{
-  repeated string list = 1;
-}
+//message CheckTextRequest{
+//  string text = 1;// 待审核的文本
+//}
+//
+//message CheckTextReply{
+//  bool isPass = 1;// 是否通过
+//}
+//
+//message MediaID{
+//  string mediaId = 1;
+//}
+//
+//message MaterialLink {
+//  string link = 1;
+//}
+//
+//message RandomNicknameReply{
+//  string nickname = 1;
+//}
+//
+//message RandomAvatarReply{
+//  string avatarUrl = 1;
+//}
+//
+//message RandomAvatarListReply{
+//  repeated string list = 1;
+//}

+ 3 - 384
api/base/base_grpc.pb.go

@@ -3,11 +3,7 @@
 package base
 
 import (
-	context "context"
-	common "git.ikuban.com/server/pw-protobuf/api/common"
 	grpc "google.golang.org/grpc"
-	codes "google.golang.org/grpc/codes"
-	status "google.golang.org/grpc/status"
 )
 
 // This is a compile-time assertion to ensure that this generated file
@@ -19,24 +15,6 @@ const _ = grpc.SupportPackageIsVersion7
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type BaseClient interface {
-	RandomNickname(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*RandomNicknameReply, error)
-	RandomAvatar(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*RandomAvatarReply, error)
-	// 随机介绍接口
-	RandomIntroduce(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.RandomIntroduceReply, error)
-	// 随机头像列表
-	RandomAvatarList(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*RandomAvatarListReply, error)
-	// 通过分组名和性别查询标签
-	FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error)
-	// 通过标签IDs查询标签
-	FindTagsByIDs(ctx context.Context, in *common.Ids, opts ...grpc.CallOption) (*common.TagListReply, error)
-	// 通过类型获取表情包列表
-	FindMemeByType(ctx context.Context, in *common.MemeRequest, opts ...grpc.CallOption) (*common.MemeList, error)
-	// 获取对方性别的聊天话题
-	FindChatTopic(ctx context.Context, in *common.FindChatTopicRequest, opts ...grpc.CallOption) (*common.ChatTopicList, error)
-	// 随机表情包
-	RandomMeme(ctx context.Context, in *common.RandomNum, opts ...grpc.CallOption) (*common.CommonTextList, error)
-	// 随机打招呼
-	RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...grpc.CallOption) (*common.CommonTextList, error)
 }
 
 type baseClient struct {
@@ -47,118 +25,10 @@ func NewBaseClient(cc grpc.ClientConnInterface) BaseClient {
 	return &baseClient{cc}
 }
 
-func (c *baseClient) RandomNickname(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*RandomNicknameReply, error) {
-	out := new(RandomNicknameReply)
-	err := c.cc.Invoke(ctx, "/api.base.Base/RandomNickname", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) RandomAvatar(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*RandomAvatarReply, error) {
-	out := new(RandomAvatarReply)
-	err := c.cc.Invoke(ctx, "/api.base.Base/RandomAvatar", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) RandomIntroduce(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.RandomIntroduceReply, error) {
-	out := new(common.RandomIntroduceReply)
-	err := c.cc.Invoke(ctx, "/api.base.Base/RandomIntroduce", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) RandomAvatarList(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*RandomAvatarListReply, error) {
-	out := new(RandomAvatarListReply)
-	err := c.cc.Invoke(ctx, "/api.base.Base/RandomAvatarList", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) FindTagListBySex(ctx context.Context, in *common.SexReq, opts ...grpc.CallOption) (*common.TagListReply, error) {
-	out := new(common.TagListReply)
-	err := c.cc.Invoke(ctx, "/api.base.Base/FindTagListBySex", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) FindTagsByIDs(ctx context.Context, in *common.Ids, opts ...grpc.CallOption) (*common.TagListReply, error) {
-	out := new(common.TagListReply)
-	err := c.cc.Invoke(ctx, "/api.base.Base/FindTagsByIDs", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) FindMemeByType(ctx context.Context, in *common.MemeRequest, opts ...grpc.CallOption) (*common.MemeList, error) {
-	out := new(common.MemeList)
-	err := c.cc.Invoke(ctx, "/api.base.Base/FindMemeByType", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) FindChatTopic(ctx context.Context, in *common.FindChatTopicRequest, opts ...grpc.CallOption) (*common.ChatTopicList, error) {
-	out := new(common.ChatTopicList)
-	err := c.cc.Invoke(ctx, "/api.base.Base/FindChatTopic", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) RandomMeme(ctx context.Context, in *common.RandomNum, opts ...grpc.CallOption) (*common.CommonTextList, error) {
-	out := new(common.CommonTextList)
-	err := c.cc.Invoke(ctx, "/api.base.Base/RandomMeme", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *baseClient) RandomSwiftMessage(ctx context.Context, in *common.RandomNumAndSex, opts ...grpc.CallOption) (*common.CommonTextList, error) {
-	out := new(common.CommonTextList)
-	err := c.cc.Invoke(ctx, "/api.base.Base/RandomSwiftMessage", in, out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 // BaseServer is the server API for Base service.
 // All implementations must embed UnimplementedBaseServer
 // for forward compatibility
 type BaseServer interface {
-	RandomNickname(context.Context, *common.SexReq) (*RandomNicknameReply, error)
-	RandomAvatar(context.Context, *common.SexReq) (*RandomAvatarReply, error)
-	// 随机介绍接口
-	RandomIntroduce(context.Context, *common.SexReq) (*common.RandomIntroduceReply, error)
-	// 随机头像列表
-	RandomAvatarList(context.Context, *common.SexReq) (*RandomAvatarListReply, error)
-	// 通过分组名和性别查询标签
-	FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error)
-	// 通过标签IDs查询标签
-	FindTagsByIDs(context.Context, *common.Ids) (*common.TagListReply, error)
-	// 通过类型获取表情包列表
-	FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error)
-	// 获取对方性别的聊天话题
-	FindChatTopic(context.Context, *common.FindChatTopicRequest) (*common.ChatTopicList, error)
-	// 随机表情包
-	RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error)
-	// 随机打招呼
-	RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error)
 	mustEmbedUnimplementedBaseServer()
 }
 
@@ -166,36 +36,6 @@ type BaseServer interface {
 type UnimplementedBaseServer struct {
 }
 
-func (UnimplementedBaseServer) RandomNickname(context.Context, *common.SexReq) (*RandomNicknameReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RandomNickname not implemented")
-}
-func (UnimplementedBaseServer) RandomAvatar(context.Context, *common.SexReq) (*RandomAvatarReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RandomAvatar not implemented")
-}
-func (UnimplementedBaseServer) RandomIntroduce(context.Context, *common.SexReq) (*common.RandomIntroduceReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RandomIntroduce not implemented")
-}
-func (UnimplementedBaseServer) RandomAvatarList(context.Context, *common.SexReq) (*RandomAvatarListReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RandomAvatarList not implemented")
-}
-func (UnimplementedBaseServer) FindTagListBySex(context.Context, *common.SexReq) (*common.TagListReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindTagListBySex not implemented")
-}
-func (UnimplementedBaseServer) FindTagsByIDs(context.Context, *common.Ids) (*common.TagListReply, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindTagsByIDs not implemented")
-}
-func (UnimplementedBaseServer) FindMemeByType(context.Context, *common.MemeRequest) (*common.MemeList, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindMemeByType not implemented")
-}
-func (UnimplementedBaseServer) FindChatTopic(context.Context, *common.FindChatTopicRequest) (*common.ChatTopicList, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method FindChatTopic not implemented")
-}
-func (UnimplementedBaseServer) RandomMeme(context.Context, *common.RandomNum) (*common.CommonTextList, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RandomMeme not implemented")
-}
-func (UnimplementedBaseServer) RandomSwiftMessage(context.Context, *common.RandomNumAndSex) (*common.CommonTextList, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method RandomSwiftMessage not implemented")
-}
 func (UnimplementedBaseServer) mustEmbedUnimplementedBaseServer() {}
 
 // UnsafeBaseServer may be embedded to opt out of forward compatibility for this service.
@@ -209,234 +49,13 @@ func RegisterBaseServer(s grpc.ServiceRegistrar, srv BaseServer) {
 	s.RegisterService(&Base_ServiceDesc, srv)
 }
 
-func _Base_RandomNickname_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.SexReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).RandomNickname(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/RandomNickname",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).RandomNickname(ctx, req.(*common.SexReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_RandomAvatar_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.SexReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).RandomAvatar(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/RandomAvatar",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).RandomAvatar(ctx, req.(*common.SexReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_RandomIntroduce_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.SexReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).RandomIntroduce(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/RandomIntroduce",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).RandomIntroduce(ctx, req.(*common.SexReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_RandomAvatarList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.SexReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).RandomAvatarList(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/RandomAvatarList",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).RandomAvatarList(ctx, req.(*common.SexReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_FindTagListBySex_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.SexReq)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).FindTagListBySex(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/FindTagListBySex",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).FindTagListBySex(ctx, req.(*common.SexReq))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_FindTagsByIDs_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.Ids)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).FindTagsByIDs(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/FindTagsByIDs",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).FindTagsByIDs(ctx, req.(*common.Ids))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_FindMemeByType_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.MemeRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).FindMemeByType(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/FindMemeByType",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).FindMemeByType(ctx, req.(*common.MemeRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_FindChatTopic_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.FindChatTopicRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).FindChatTopic(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/FindChatTopic",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).FindChatTopic(ctx, req.(*common.FindChatTopicRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_RandomMeme_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.RandomNum)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).RandomMeme(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/RandomMeme",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).RandomMeme(ctx, req.(*common.RandomNum))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _Base_RandomSwiftMessage_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(common.RandomNumAndSex)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(BaseServer).RandomSwiftMessage(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/api.base.Base/RandomSwiftMessage",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(BaseServer).RandomSwiftMessage(ctx, req.(*common.RandomNumAndSex))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 // Base_ServiceDesc is the grpc.ServiceDesc for Base service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
 var Base_ServiceDesc = grpc.ServiceDesc{
 	ServiceName: "api.base.Base",
 	HandlerType: (*BaseServer)(nil),
-	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "RandomNickname",
-			Handler:    _Base_RandomNickname_Handler,
-		},
-		{
-			MethodName: "RandomAvatar",
-			Handler:    _Base_RandomAvatar_Handler,
-		},
-		{
-			MethodName: "RandomIntroduce",
-			Handler:    _Base_RandomIntroduce_Handler,
-		},
-		{
-			MethodName: "RandomAvatarList",
-			Handler:    _Base_RandomAvatarList_Handler,
-		},
-		{
-			MethodName: "FindTagListBySex",
-			Handler:    _Base_FindTagListBySex_Handler,
-		},
-		{
-			MethodName: "FindTagsByIDs",
-			Handler:    _Base_FindTagsByIDs_Handler,
-		},
-		{
-			MethodName: "FindMemeByType",
-			Handler:    _Base_FindMemeByType_Handler,
-		},
-		{
-			MethodName: "FindChatTopic",
-			Handler:    _Base_FindChatTopic_Handler,
-		},
-		{
-			MethodName: "RandomMeme",
-			Handler:    _Base_RandomMeme_Handler,
-		},
-		{
-			MethodName: "RandomSwiftMessage",
-			Handler:    _Base_RandomSwiftMessage_Handler,
-		},
-	},
-	Streams:  []grpc.StreamDesc{},
-	Metadata: "base.proto",
+	Methods:     []grpc.MethodDesc{},
+	Streams:     []grpc.StreamDesc{},
+	Metadata:    "base.proto",
 }

+ 0 - 174
api/base/base_http.pb.go

@@ -1,174 +0,0 @@
-// Code generated by protoc-gen-go-http. DO NOT EDIT.
-// versions:
-// protoc-gen-go-http v2.0.0
-
-package base
-
-import (
-	context "context"
-	base "git.ikuban.com/server/base-protobuf/kuban/api/base"
-	reply "git.ikuban.com/server/kratos-utils/http/reply"
-	common "git.ikuban.com/server/pw-protobuf/api/common"
-	http "github.com/go-kratos/kratos/v2/transport/http"
-	binding "github.com/go-kratos/kratos/v2/transport/http/binding"
-	ioutil "io/ioutil"
-	time "time"
-)
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the kratos package it is being compiled against.
-var _ = new(context.Context)
-var _ = binding.EncodeURL
-var _ = ioutil.Discard
-var _ = new(time.Time)
-var _ = new(reply.SuccessReply)
-var _ = new(base.Html)
-
-const _ = http.SupportPackageIsVersion1
-
-type BaseHTTPServer interface {
-	RandomAvatar(context.Context, *common.SexReq) (*RandomAvatarReply, error)
-	RandomIntroduce(context.Context, *common.SexReq) (*common.RandomIntroduceReply, error)
-	RandomNickname(context.Context, *common.SexReq) (*RandomNicknameReply, error)
-}
-
-func RegisterBaseHTTPServer(s *http.Server, srv BaseHTTPServer) {
-	r := s.Route("/")
-	r.POST("/api/common/random/nickname", _Base_RandomNickname0_HTTP_Handler(srv))
-	r.POST("/api/common/random/avatar", _Base_RandomAvatar0_HTTP_Handler(srv))
-	r.POST("/api/common/random/introduce", _Base_RandomIntroduce0_HTTP_Handler(srv))
-}
-
-func _Base_RandomNickname0_HTTP_Handler(srv BaseHTTPServer) func(ctx http.Context) error {
-	return func(ctx http.Context) error {
-		var in common.SexReq
-		if err := ctx.Bind(&in); err != nil {
-			return err
-		}
-		if err := ctx.BindQuery(&in); err != nil {
-			return err
-		}
-		http.SetOperation(ctx, "/api.base.Base/RandomNickname")
-		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.RandomNickname(ctx, req.(*common.SexReq))
-		})
-		out, err := h(ctx, &in)
-		if err != nil {
-			return err
-		}
-		success := &reply.SuccessReply{
-			Code: 0,
-		}
-		if out != nil {
-			success.Data = out
-		}
-		return ctx.Result(200, success)
-	}
-}
-
-func _Base_RandomAvatar0_HTTP_Handler(srv BaseHTTPServer) func(ctx http.Context) error {
-	return func(ctx http.Context) error {
-		var in common.SexReq
-		if err := ctx.Bind(&in); err != nil {
-			return err
-		}
-		if err := ctx.BindQuery(&in); err != nil {
-			return err
-		}
-		http.SetOperation(ctx, "/api.base.Base/RandomAvatar")
-		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.RandomAvatar(ctx, req.(*common.SexReq))
-		})
-		out, err := h(ctx, &in)
-		if err != nil {
-			return err
-		}
-		success := &reply.SuccessReply{
-			Code: 0,
-		}
-		if out != nil {
-			success.Data = out
-		}
-		return ctx.Result(200, success)
-	}
-}
-
-func _Base_RandomIntroduce0_HTTP_Handler(srv BaseHTTPServer) func(ctx http.Context) error {
-	return func(ctx http.Context) error {
-		var in common.SexReq
-		if err := ctx.Bind(&in); err != nil {
-			return err
-		}
-		if err := ctx.BindQuery(&in); err != nil {
-			return err
-		}
-		http.SetOperation(ctx, "/api.base.Base/RandomIntroduce")
-		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.RandomIntroduce(ctx, req.(*common.SexReq))
-		})
-		out, err := h(ctx, &in)
-		if err != nil {
-			return err
-		}
-		success := &reply.SuccessReply{
-			Code: 0,
-		}
-		if out != nil {
-			success.Data = out
-		}
-		return ctx.Result(200, success)
-	}
-}
-
-type BaseHTTPClient interface {
-	RandomAvatar(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *RandomAvatarReply, err error)
-	RandomIntroduce(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *common.RandomIntroduceReply, err error)
-	RandomNickname(ctx context.Context, req *common.SexReq, opts ...http.CallOption) (rsp *RandomNicknameReply, err error)
-}
-
-type BaseHTTPClientImpl struct {
-	cc *http.Client
-}
-
-func NewBaseHTTPClient(client *http.Client) BaseHTTPClient {
-	return &BaseHTTPClientImpl{client}
-}
-
-func (c *BaseHTTPClientImpl) RandomAvatar(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*RandomAvatarReply, error) {
-	var out RandomAvatarReply
-	pattern := "/api/common/random/avatar"
-	path := binding.EncodeURL(pattern, in, false)
-	opts = append(opts, http.Operation("/api.base.Base/RandomAvatar"))
-	opts = append(opts, http.PathTemplate(pattern))
-	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return &out, err
-}
-
-func (c *BaseHTTPClientImpl) RandomIntroduce(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*common.RandomIntroduceReply, error) {
-	var out common.RandomIntroduceReply
-	pattern := "/api/common/random/introduce"
-	path := binding.EncodeURL(pattern, in, false)
-	opts = append(opts, http.Operation("/api.base.Base/RandomIntroduce"))
-	opts = append(opts, http.PathTemplate(pattern))
-	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return &out, err
-}
-
-func (c *BaseHTTPClientImpl) RandomNickname(ctx context.Context, in *common.SexReq, opts ...http.CallOption) (*RandomNicknameReply, error) {
-	var out RandomNicknameReply
-	pattern := "/api/common/random/nickname"
-	path := binding.EncodeURL(pattern, in, false)
-	opts = append(opts, http.Operation("/api.base.Base/RandomNickname"))
-	opts = append(opts, http.PathTemplate(pattern))
-	err := c.cc.Invoke(ctx, "POST", path, in, &out, opts...)
-	if err != nil {
-		return nil, err
-	}
-	return &out, err
-}

+ 11 - 12
client/base.go

@@ -2,7 +2,6 @@ package client
 
 import (
 	"git.ikuban.com/server/kratos-nacos/registry"
-	"git.ikuban.com/server/pw-protobuf/api/base"
 	"git.ikuban.com/server/pw-protobuf/api/statistics"
 	"github.com/go-kratos/kratos/v2/log"
 )
@@ -19,14 +18,14 @@ func NewStatisticsClient(r *registry.Registry, logger log.Logger) statistics.Sta
 	return client
 }
 
-func NewBaseClient(r *registry.Registry, logger log.Logger) base.BaseClient {
-	conn, err := getDialInsecure(r, logger, "discovery://pw/pw-base")
-	if err != nil {
-		panic(err)
-	}
-	if conn == nil {
-		return nil
-	}
-	client := base.NewBaseClient(conn)
-	return client
-}
+//func NewBaseClient(r *registry.Registry, logger log.Logger) base.BaseClient {
+//	conn, err := getDialInsecure(r, logger, "discovery://pw/pw-base")
+//	if err != nil {
+//		panic(err)
+//	}
+//	if conn == nil {
+//		return nil
+//	}
+//	client := base.NewBaseClient(conn)
+//	return client
+//}