common

api/base/base.pb.go

@@ -1,353 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.26.0-devel
-// 	protoc        v3.15.8
-// source: base.proto
-
-package base
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type UserAndPartnerIdParam struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PartnerId string `protobuf:"bytes,1,opt,name=partnerId,proto3" json:"partnerId"`
-	UserId    string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"`
-}
-
-func (x *UserAndPartnerIdParam) Reset() {
-	*x = UserAndPartnerIdParam{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UserAndPartnerIdParam) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UserAndPartnerIdParam) ProtoMessage() {}
-
-func (x *UserAndPartnerIdParam) 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 UserAndPartnerIdParam.ProtoReflect.Descriptor instead.
-func (*UserAndPartnerIdParam) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *UserAndPartnerIdParam) GetPartnerId() string {
-	if x != nil {
-		return x.PartnerId
-	}
-	return ""
-}
-
-func (x *UserAndPartnerIdParam) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-type User1AndUser2IdParam struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	User1 string `protobuf:"bytes,1,opt,name=user1,proto3" json:"user1"`
-	User2 string `protobuf:"bytes,2,opt,name=user2,proto3" json:"user2"`
-}
-
-func (x *User1AndUser2IdParam) Reset() {
-	*x = User1AndUser2IdParam{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *User1AndUser2IdParam) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*User1AndUser2IdParam) ProtoMessage() {}
-
-func (x *User1AndUser2IdParam) 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 User1AndUser2IdParam.ProtoReflect.Descriptor instead.
-func (*User1AndUser2IdParam) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *User1AndUser2IdParam) GetUser1() string {
-	if x != nil {
-		return x.User1
-	}
-	return ""
-}
-
-func (x *User1AndUser2IdParam) GetUser2() string {
-	if x != nil {
-		return x.User2
-	}
-	return ""
-}
-
-type PartnerIDParam struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	PartnerID string `protobuf:"bytes,1,opt,name=partnerID,proto3" json:"partnerID"`
-}
-
-func (x *PartnerIDParam) Reset() {
-	*x = PartnerIDParam{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PartnerIDParam) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PartnerIDParam) ProtoMessage() {}
-
-func (x *PartnerIDParam) 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 PartnerIDParam.ProtoReflect.Descriptor instead.
-func (*PartnerIDParam) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *PartnerIDParam) GetPartnerID() string {
-	if x != nil {
-		return x.PartnerID
-	}
-	return ""
-}
-
-type UserIDParam struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId"`
-}
-
-func (x *UserIDParam) Reset() {
-	*x = UserIDParam{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_base_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *UserIDParam) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*UserIDParam) ProtoMessage() {}
-
-func (x *UserIDParam) 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 UserIDParam.ProtoReflect.Descriptor instead.
-func (*UserIDParam) Descriptor() ([]byte, []int) {
-	return file_base_proto_rawDescGZIP(), []int{3}
-}
-
-func (x *UserIDParam) GetUserId() string {
-	if x != nil {
-		return x.UserId
-	}
-	return ""
-}
-
-var File_base_proto protoreflect.FileDescriptor
-
-var file_base_proto_rawDesc = []byte{
-	0x0a, 0x0a, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x70,
-	0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x22, 0x4d, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e,
-	0x64, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12,
-	0x1c, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x12, 0x16, 0x0a,
-	0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75,
-	0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x31, 0x41, 0x6e,
-	0x64, 0x55, 0x73, 0x65, 0x72, 0x32, 0x49, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x14, 0x0a,
-	0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75, 0x73,
-	0x65, 0x72, 0x31, 0x12, 0x14, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x2e, 0x0a, 0x0e, 0x50, 0x61, 0x72,
-	0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x70,
-	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x22, 0x25, 0x0a, 0x0b, 0x55, 0x73, 0x65,
-	0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
-	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
-	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, 4)
-var file_base_proto_goTypes = []interface{}{
-	(*UserAndPartnerIdParam)(nil), // 0: api.base.UserAndPartnerIdParam
-	(*User1AndUser2IdParam)(nil),  // 1: api.base.User1AndUser2IdParam
-	(*PartnerIDParam)(nil),        // 2: api.base.PartnerIDParam
-	(*UserIDParam)(nil),           // 3: api.base.UserIDParam
-}
-var file_base_proto_depIdxs = []int32{
-	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() }
-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.(*UserAndPartnerIdParam); 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.(*User1AndUser2IdParam); 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.(*PartnerIDParam); 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.(*UserIDParam); 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:   4,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		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
-	file_base_proto_goTypes = nil
-	file_base_proto_depIdxs = nil
-}

api/base/base.proto

@@ -1,29 +0,0 @@
-syntax = "proto3";
-
-package api.base;
-
-//import "google/api/annotations.proto";
-//import "google/protobuf/struct.proto";
-//import "google/protobuf/empty.proto";
-
-option go_package = "git.ikuban.com/server/pw-protobuf/api/base;base";
-option java_multiple_files = true;
-option java_package = "api.base";
-
-message UserAndPartnerIdParam {
-  string partnerId = 1;
-  string userId = 2;
-}
-
-message User1AndUser2IdParam {
-  string user1 = 1;
-  string user2 = 2;
-}
-
-message PartnerIDParam {
-  string partnerID = 1;
-}
-
-message UserIDParam {
-  string userId = 1;
-}

api/chat/chat.pb.go

@@ -7,7 +7,7 @@
 package chat
 
 import (
-	base "git.ikuban.com/server/pw-protobuf/api/base"
+	common "git.ikuban.com/server/pw-protobuf/api/common"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
@@ -127,39 +127,39 @@ var File_chat_proto protoreflect.FileDescriptor
 
 var file_chat_proto_rawDesc = []byte{
 	0x0a, 0x0a, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x70,
-	0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x1a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x62, 0x61, 0x73, 0x65,
-	0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6f, 0x0a, 0x23, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49,
-	0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70,
-	0x6c, 0x79, 0x12, 0x30, 0x0a, 0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x6c,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x68, 0x69, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x22, 0x3e, 0x0a, 0x24,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65,
-	0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52,
-	0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x32, 0xec, 0x01, 0x0a,
-	0x04, 0x43, 0x68, 0x61, 0x74, 0x12, 0x70, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73,
-	0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61,
-	0x73, 0x65, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e, 0x64, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65,
-	0x72, 0x49, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63,
-	0x68, 0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72,
-	0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68,
-	0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x72, 0x0a, 0x1f, 0x43, 0x72, 0x65, 0x61, 0x74,
-	0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65,
-	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1f, 0x2e, 0x61, 0x70, 0x69,
-	0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e, 0x64, 0x50, 0x61, 0x72,
-	0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2e, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65,
-	0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x42, 0x3d, 0x0a, 0x08, 0x61,
-	0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 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, 0x63, 0x68, 0x61, 0x74, 0x3b, 0x63, 0x68, 0x61, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 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,
+	0x6f, 0x0a, 0x23, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74,
+	0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69,
+	0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x30, 0x0a, 0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c,
+	0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x13, 0x69, 0x73, 0x42, 0x75, 0x69, 0x6c, 0x64, 0x52, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
+	0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64,
+	0x22, 0x3e, 0x0a, 0x24, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
+	0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x49, 0x64,
+	0x32, 0xf0, 0x01, 0x0a, 0x04, 0x43, 0x68, 0x61, 0x74, 0x12, 0x72, 0x0a, 0x1e, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52,
+	0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x21, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x6e, 0x64,
+	0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2d,
+	0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55,
+	0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x74, 0x0a,
+	0x1f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e,
+	0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70,
+	0x12, 0x21, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73,
+	0x65, 0x72, 0x41, 0x6e, 0x64, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x64, 0x50, 0x61,
+	0x72, 0x61, 0x6d, 0x1a, 0x2e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65,
+	0x70, 0x6c, 0x79, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 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, 0x63, 0x68, 0x61, 0x74, 0x3b, 0x63, 0x68,
+	0x61, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -178,11 +178,11 @@ var file_chat_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
 var file_chat_proto_goTypes = []interface{}{
 	(*CheckUserPartnerIsRelationshipReply)(nil),  // 0: api.chat.CheckUserPartnerIsRelationshipReply
 	(*CreateUserPartnerIsRelationshipReply)(nil), // 1: api.chat.CreateUserPartnerIsRelationshipReply
-	(*base.UserAndPartnerIdParam)(nil),           // 2: api.base.UserAndPartnerIdParam
+	(*common.UserAndPartnerIdParam)(nil),         // 2: api.common.UserAndPartnerIdParam
 }
 var file_chat_proto_depIdxs = []int32{
-	2, // 0: api.chat.Chat.CheckUserPartnerIsRelationship:input_type -> api.base.UserAndPartnerIdParam
-	2, // 1: api.chat.Chat.CreateUserPartnerIsRelationship:input_type -> api.base.UserAndPartnerIdParam
+	2, // 0: api.chat.Chat.CheckUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
+	2, // 1: api.chat.Chat.CreateUserPartnerIsRelationship:input_type -> api.common.UserAndPartnerIdParam
 	0, // 2: api.chat.Chat.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply
 	1, // 3: api.chat.Chat.CreateUserPartnerIsRelationship:output_type -> api.chat.CreateUserPartnerIsRelationshipReply
 	2, // [2:4] is the sub-list for method output_type

api/chat/chat.proto

@@ -5,15 +5,15 @@ package api.chat;
 //import "google/api/annotations.proto";
 //import "google/protobuf/struct.proto";
 //import "google/protobuf/empty.proto";
-import "api/base/base.proto";
+import "api/common/common.proto";
 
 option go_package = "git.ikuban.com/server/pw-protobuf/api/chat;chat";
 option java_multiple_files = true;
 option java_package = "api.chat";
 
 service Chat {
-  rpc CheckUserPartnerIsRelationship (base.UserAndPartnerIdParam) returns (CheckUserPartnerIsRelationshipReply);
-  rpc CreateUserPartnerIsRelationship (base.UserAndPartnerIdParam) returns (CreateUserPartnerIsRelationshipReply);
+  rpc CheckUserPartnerIsRelationship (common.UserAndPartnerIdParam) returns (CheckUserPartnerIsRelationshipReply);
+  rpc CreateUserPartnerIsRelationship (common.UserAndPartnerIdParam) returns (CreateUserPartnerIsRelationshipReply);
 }
 
 message CheckUserPartnerIsRelationshipReply{

api/chat/chat_grpc.pb.go

@@ -4,7 +4,7 @@ package chat
 
 import (
 	context "context"
-	base "git.ikuban.com/server/pw-protobuf/api/base"
+	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"
@@ -19,8 +19,8 @@ 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 ChatClient interface {
-	CheckUserPartnerIsRelationship(ctx context.Context, in *base.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error)
-	CreateUserPartnerIsRelationship(ctx context.Context, in *base.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CreateUserPartnerIsRelationshipReply, error)
+	CheckUserPartnerIsRelationship(ctx context.Context, in *common.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error)
+	CreateUserPartnerIsRelationship(ctx context.Context, in *common.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CreateUserPartnerIsRelationshipReply, error)
 }
 
 type chatClient struct {
@@ -31,7 +31,7 @@ func NewChatClient(cc grpc.ClientConnInterface) ChatClient {
 	return &chatClient{cc}
 }
 
-func (c *chatClient) CheckUserPartnerIsRelationship(ctx context.Context, in *base.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error) {
+func (c *chatClient) CheckUserPartnerIsRelationship(ctx context.Context, in *common.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CheckUserPartnerIsRelationshipReply, error) {
 	out := new(CheckUserPartnerIsRelationshipReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/CheckUserPartnerIsRelationship", in, out, opts...)
 	if err != nil {
@@ -40,7 +40,7 @@ func (c *chatClient) CheckUserPartnerIsRelationship(ctx context.Context, in *bas
 	return out, nil
 }
 
-func (c *chatClient) CreateUserPartnerIsRelationship(ctx context.Context, in *base.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CreateUserPartnerIsRelationshipReply, error) {
+func (c *chatClient) CreateUserPartnerIsRelationship(ctx context.Context, in *common.UserAndPartnerIdParam, opts ...grpc.CallOption) (*CreateUserPartnerIsRelationshipReply, error) {
 	out := new(CreateUserPartnerIsRelationshipReply)
 	err := c.cc.Invoke(ctx, "/api.chat.Chat/CreateUserPartnerIsRelationship", in, out, opts...)
 	if err != nil {
@@ -53,8 +53,8 @@ func (c *chatClient) CreateUserPartnerIsRelationship(ctx context.Context, in *ba
 // All implementations must embed UnimplementedChatServer
 // for forward compatibility
 type ChatServer interface {
-	CheckUserPartnerIsRelationship(context.Context, *base.UserAndPartnerIdParam) (*CheckUserPartnerIsRelationshipReply, error)
-	CreateUserPartnerIsRelationship(context.Context, *base.UserAndPartnerIdParam) (*CreateUserPartnerIsRelationshipReply, error)
+	CheckUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdParam) (*CheckUserPartnerIsRelationshipReply, error)
+	CreateUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdParam) (*CreateUserPartnerIsRelationshipReply, error)
 	mustEmbedUnimplementedChatServer()
 }
 
@@ -62,10 +62,10 @@ type ChatServer interface {
 type UnimplementedChatServer struct {
 }
 
-func (UnimplementedChatServer) CheckUserPartnerIsRelationship(context.Context, *base.UserAndPartnerIdParam) (*CheckUserPartnerIsRelationshipReply, error) {
+func (UnimplementedChatServer) CheckUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdParam) (*CheckUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckUserPartnerIsRelationship not implemented")
 }
-func (UnimplementedChatServer) CreateUserPartnerIsRelationship(context.Context, *base.UserAndPartnerIdParam) (*CreateUserPartnerIsRelationshipReply, error) {
+func (UnimplementedChatServer) CreateUserPartnerIsRelationship(context.Context, *common.UserAndPartnerIdParam) (*CreateUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateUserPartnerIsRelationship not implemented")
 }
 func (UnimplementedChatServer) mustEmbedUnimplementedChatServer() {}
@@ -82,7 +82,7 @@ func RegisterChatServer(s grpc.ServiceRegistrar, srv ChatServer) {
 }
 
 func _Chat_CheckUserPartnerIsRelationship_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(base.UserAndPartnerIdParam)
+	in := new(common.UserAndPartnerIdParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -94,13 +94,13 @@ func _Chat_CheckUserPartnerIsRelationship_Handler(srv interface{}, ctx context.C
 		FullMethod: "/api.chat.Chat/CheckUserPartnerIsRelationship",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).CheckUserPartnerIsRelationship(ctx, req.(*base.UserAndPartnerIdParam))
+		return srv.(ChatServer).CheckUserPartnerIsRelationship(ctx, req.(*common.UserAndPartnerIdParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _Chat_CreateUserPartnerIsRelationship_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(base.UserAndPartnerIdParam)
+	in := new(common.UserAndPartnerIdParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -112,7 +112,7 @@ func _Chat_CreateUserPartnerIsRelationship_Handler(srv interface{}, ctx context.
 		FullMethod: "/api.chat.Chat/CreateUserPartnerIsRelationship",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ChatServer).CreateUserPartnerIsRelationship(ctx, req.(*base.UserAndPartnerIdParam))
+		return srv.(ChatServer).CreateUserPartnerIsRelationship(ctx, req.(*common.UserAndPartnerIdParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }

api/partner/partner.pb.go

@@ -7,7 +7,7 @@
 package partner
 
 import (
-	base "git.ikuban.com/server/pw-protobuf/api/base"
+	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"
@@ -252,61 +252,61 @@ var file_partner_proto_rawDesc = []byte{
 	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, 0x1b, 0x67, 0x6f, 0x6f, 0x67,
 	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74,
-	0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x62, 0x61, 0x73,
-	0x65, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x6d, 0x0a, 0x1f,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66,
-	0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61,
-	0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22, 0x8b, 0x01, 0x0a, 0x11,
-	0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
-	0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a,
-	0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73,
-	0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a,
-	0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x85, 0x01, 0x0a, 0x0b, 0x50, 0x61,
-	0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63,
-	0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63,
-	0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55,
-	0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
-	0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65,
-	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65,
-	0x73, 0x32, 0xee, 0x02, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x12, 0x60, 0x0a,
-	0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
-	0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61,
-	0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66,
-	0x6f, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12,
-	0x75, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72,
-	0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61,
-	0x73, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e,
-	0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66,
-	0x6f, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f,
-	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x2f, 0x69,
-	0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x89, 0x01, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65,
-	0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49,
-	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a,
-	0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65,
-	0x72, 0x50, 0x01, 0x5a, 0x35, 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, 0x70, 0x61, 0x72, 0x74, 0x6e,
-	0x65, 0x72, 0x3b, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x79, 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, 0x6d, 0x0a, 0x1f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65,
+	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a,
+	0x03, 0x73, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x22,
+	0x8b, 0x01, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c,
+	0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d,
+	0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12,
+	0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65,
+	0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x22, 0x85, 0x01,
+	0x0a, 0x0b, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a,
+	0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a,
+	0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61,
+	0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76,
+	0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63,
+	0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63,
+	0x74, 0x75, 0x72, 0x65, 0x73, 0x32, 0xf0, 0x02, 0x0a, 0x07, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65,
+	0x72, 0x12, 0x60, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49,
+	0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x18, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65,
+	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x1c, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x22, 0x11, 0x2f,
+	0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f,
+	0x3a, 0x01, 0x2a, 0x12, 0x77, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65,
+	0x72, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72,
+	0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22,
+	0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x63, 0x69,
+	0x72, 0x63, 0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x89, 0x01, 0x0a,
+	0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2c, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61,
+	0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22,
+	0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73,
+	0x65, 0x72, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x01, 0x2a, 0x42, 0x46, 0x0a, 0x0b, 0x61, 0x70, 0x69, 0x2e,
+	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x50, 0x01, 0x5a, 0x35, 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, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x3b, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -327,11 +327,11 @@ var file_partner_proto_goTypes = []interface{}{
 	(*PartnerCircleInfo)(nil),               // 1: api.partner.PartnerCircleInfo
 	(*PartnerInfo)(nil),                     // 2: api.partner.PartnerInfo
 	(*emptypb.Empty)(nil),                   // 3: google.protobuf.Empty
-	(*base.PartnerIDParam)(nil),             // 4: api.base.PartnerIDParam
+	(*common.PartnerIDParam)(nil),           // 4: api.common.PartnerIDParam
 }
 var file_partner_proto_depIdxs = []int32{
 	3, // 0: api.partner.Partner.GetPartnerInfo:input_type -> google.protobuf.Empty
-	4, // 1: api.partner.Partner.GetPartnerCircleInfo:input_type -> api.base.PartnerIDParam
+	4, // 1: api.partner.Partner.GetPartnerCircleInfo:input_type -> api.common.PartnerIDParam
 	0, // 2: api.partner.Partner.UpdatePartnerInformation:input_type -> api.partner.UpdatePartnerInformationRequest
 	2, // 3: api.partner.Partner.GetPartnerInfo:output_type -> api.partner.PartnerInfo
 	1, // 4: api.partner.Partner.GetPartnerCircleInfo:output_type -> api.partner.PartnerCircleInfo

api/partner/partner.proto

@@ -5,7 +5,7 @@ package api.partner;
 import "google/api/annotations.proto";
 //import "google/protobuf/struct.proto";
 import "google/protobuf/empty.proto";
-import "api/base/base.proto";
+import "api/common/common.proto";
 
 option go_package = "git.ikuban.com/server/pw-protobuf/api/partner;partner";
 option java_multiple_files = true;
@@ -18,7 +18,7 @@ service Partner {
       body:"*"
     };
   };
-  rpc GetPartnerCircleInfo (base.PartnerIDParam) returns (PartnerCircleInfo){
+  rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (PartnerCircleInfo){
     option (google.api.http) = {
       post: "/api/partner/circle/info",
       body:"*"

api/partner/partner_grpc.pb.go

@@ -4,7 +4,7 @@ package partner
 
 import (
 	context "context"
-	base "git.ikuban.com/server/pw-protobuf/api/base"
+	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"
@@ -21,7 +21,7 @@ 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 PartnerClient interface {
 	GetPartnerInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*PartnerInfo, error)
-	GetPartnerCircleInfo(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*PartnerCircleInfo, error)
+	GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*PartnerCircleInfo, error)
 	UpdatePartnerInformation(ctx context.Context, in *UpdatePartnerInformationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
 }
 
@@ -42,7 +42,7 @@ func (c *partnerClient) GetPartnerInfo(ctx context.Context, in *emptypb.Empty, o
 	return out, nil
 }
 
-func (c *partnerClient) GetPartnerCircleInfo(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*PartnerCircleInfo, error) {
+func (c *partnerClient) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*PartnerCircleInfo, error) {
 	out := new(PartnerCircleInfo)
 	err := c.cc.Invoke(ctx, "/api.partner.Partner/GetPartnerCircleInfo", in, out, opts...)
 	if err != nil {
@@ -65,7 +65,7 @@ func (c *partnerClient) UpdatePartnerInformation(ctx context.Context, in *Update
 // for forward compatibility
 type PartnerServer interface {
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
-	GetPartnerCircleInfo(context.Context, *base.PartnerIDParam) (*PartnerCircleInfo, error)
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*PartnerCircleInfo, error)
 	UpdatePartnerInformation(context.Context, *UpdatePartnerInformationRequest) (*emptypb.Empty, error)
 	mustEmbedUnimplementedPartnerServer()
 }
@@ -77,7 +77,7 @@ type UnimplementedPartnerServer struct {
 func (UnimplementedPartnerServer) GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerInfo not implemented")
 }
-func (UnimplementedPartnerServer) GetPartnerCircleInfo(context.Context, *base.PartnerIDParam) (*PartnerCircleInfo, error) {
+func (UnimplementedPartnerServer) GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*PartnerCircleInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerCircleInfo not implemented")
 }
 func (UnimplementedPartnerServer) UpdatePartnerInformation(context.Context, *UpdatePartnerInformationRequest) (*emptypb.Empty, error) {
@@ -115,7 +115,7 @@ func _Partner_GetPartnerInfo_Handler(srv interface{}, ctx context.Context, dec f
 }
 
 func _Partner_GetPartnerCircleInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(base.PartnerIDParam)
+	in := new(common.PartnerIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -127,7 +127,7 @@ func _Partner_GetPartnerCircleInfo_Handler(srv interface{}, ctx context.Context,
 		FullMethod: "/api.partner.Partner/GetPartnerCircleInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(PartnerServer).GetPartnerCircleInfo(ctx, req.(*base.PartnerIDParam))
+		return srv.(PartnerServer).GetPartnerCircleInfo(ctx, req.(*common.PartnerIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }

api/partner/partner_http.pb.go

@@ -8,7 +8,7 @@ import (
 	context "context"
 	base "git.ikuban.com/server/base-protobuf/kuban/api/base"
 	reply "git.ikuban.com/server/kratos-utils/http/reply"
-	base1 "git.ikuban.com/server/pw-protobuf/api/base"
+	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"
 	emptypb "google.golang.org/protobuf/types/known/emptypb"
@@ -28,7 +28,7 @@ var _ = new(base.Html)
 const _ = http.SupportPackageIsVersion1
 
 type PartnerHTTPServer interface {
-	GetPartnerCircleInfo(context.Context, *base1.PartnerIDParam) (*PartnerCircleInfo, error)
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*PartnerCircleInfo, error)
 	GetPartnerInfo(context.Context, *emptypb.Empty) (*PartnerInfo, error)
 	UpdatePartnerInformation(context.Context, *UpdatePartnerInformationRequest) (*emptypb.Empty, error)
 }
@@ -69,7 +69,7 @@ func _Partner_GetPartnerInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.
 
 func _Partner_GetPartnerCircleInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in base1.PartnerIDParam
+		var in common.PartnerIDParam
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -78,7 +78,7 @@ func _Partner_GetPartnerCircleInfo0_HTTP_Handler(srv PartnerHTTPServer) func(ctx
 		}
 		http.SetOperation(ctx, "/api.partner.Partner/GetPartnerCircleInfo")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.GetPartnerCircleInfo(ctx, req.(*base1.PartnerIDParam))
+			return srv.GetPartnerCircleInfo(ctx, req.(*common.PartnerIDParam))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -122,7 +122,7 @@ func _Partner_UpdatePartnerInformation0_HTTP_Handler(srv PartnerHTTPServer) func
 }
 
 type PartnerHTTPClient interface {
-	GetPartnerCircleInfo(ctx context.Context, req *base1.PartnerIDParam, opts ...http.CallOption) (rsp *PartnerCircleInfo, err error)
+	GetPartnerCircleInfo(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *PartnerCircleInfo, err error)
 	GetPartnerInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *PartnerInfo, err error)
 	UpdatePartnerInformation(ctx context.Context, req *UpdatePartnerInformationRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 }
@@ -135,7 +135,7 @@ func NewPartnerHTTPClient(client *http.Client) PartnerHTTPClient {
 	return &PartnerHTTPClientImpl{client}
 }
 
-func (c *PartnerHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *base1.PartnerIDParam, opts ...http.CallOption) (*PartnerCircleInfo, error) {
+func (c *PartnerHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*PartnerCircleInfo, error) {
 	var out PartnerCircleInfo
 	pattern := "/api/partner/circle/info"
 	path := binding.EncodeURL(pattern, in, false)

api/user/user.pb.go

@@ -7,8 +7,8 @@
 package user
 
 import (
-	base "git.ikuban.com/server/pw-protobuf/api/base"
 	chat "git.ikuban.com/server/pw-protobuf/api/chat"
+	common "git.ikuban.com/server/pw-protobuf/api/common"
 	partner "git.ikuban.com/server/pw-protobuf/api/partner"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
@@ -353,102 +353,103 @@ var file_user_proto_rawDesc = []byte{
 	0x6f, 0x1a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x68, 0x61, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x74,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74,
 	0x6e, 0x65, 0x72, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x1a, 0x13, 0x61, 0x70, 0x69, 0x2f, 0x62, 0x61, 0x73, 0x65, 0x2f, 0x62, 0x61, 0x73, 0x65,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe0, 0x02, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x48,
-	0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e,
-	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72,
-	0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03,
-	0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18,
-	0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12,
-	0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x61, 0x67,
-	0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x65,
-	0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x74,
-	0x61, 0x67, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x1c, 0x0a,
-	0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x69,
-	0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f,
-	0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x18,
-	0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x12,
-	0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x22, 0xe0, 0x01, 0x0a, 0x08, 0x55, 0x73,
-	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61,
-	0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c,
-	0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x61,
-	0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
-	0x03, 0x73, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x18, 0x06,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74, 0x12, 0x18, 0x0a, 0x07,
-	0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c,
-	0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e,
-	0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64, 0x4e,
-	0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x22, 0x6a, 0x0a, 0x1c,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08,
-	0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
-	0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74,
-	0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61,
-	0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xe7, 0x05, 0x0a, 0x04, 0x55, 0x73, 0x65,
-	0x72, 0x12, 0x80, 0x01, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72,
-	0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x26, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65,
-	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x27, 0x82, 0xd3, 0xe4,
-	0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x54, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49,
-	0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x12, 0x2e, 0x61, 0x70,
-	0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x22,
-	0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x0e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73,
-	0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x92, 0x01, 0x0a, 0x1e, 0x43,
-	0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49,
-	0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x18, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72,
-	0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2d, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68,
-	0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 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, 0xe0, 0x02, 0x0a, 0x0c, 0x55,
+	0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e,
+	0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e,
+	0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61,
+	0x72, 0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74,
+	0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75,
+	0x72, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x70, 0x69, 0x63, 0x74, 0x75,
+	0x72, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x6c,
+	0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f,
+	0x6e, 0x73, 0x74, 0x65, 0x6c, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x61,
+	0x72, 0x65, 0x61, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12,
+	0x10, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x74, 0x61,
+	0x67, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x0a,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x12,
+	0x26, 0x0a, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x65, 0x56, 0x6f, 0x69, 0x63,
+	0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x69, 0x6e, 0x74, 0x72, 0x6f, 0x64, 0x75,
+	0x63, 0x65, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64,
+	0x4e, 0x75, 0x6d, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69, 0x6b, 0x65, 0x64,
+	0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x18, 0x0d,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d, 0x22, 0xe0, 0x01,
+	0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69,
+	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69,
+	0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72,
+	0x55, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x76, 0x61, 0x74, 0x61,
+	0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x03, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x64,
+	0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x64, 0x69, 0x74,
+	0x12, 0x18, 0x0a, 0x07, 0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x07, 0x6c, 0x69, 0x6b, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x69,
+	0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x69,
+	0x6b, 0x65, 0x64, 0x4e, 0x75, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75,
+	0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x6f, 0x6f, 0x6b, 0x4e, 0x75, 0x6d,
+	0x22, 0x6a, 0x0a, 0x1c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09,
+	0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x55, 0x72, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65,
+	0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x73, 0x65, 0x78, 0x32, 0xef, 0x05, 0x0a,
+	0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x80, 0x01, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x26, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22,
+	0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73,
+	0x65, 0x72, 0x2f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x01, 0x2a, 0x12, 0x54, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55,
+	0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a,
+	0x12, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49,
+	0x6e, 0x66, 0x6f, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x22, 0x0e, 0x2f, 0x61, 0x70,
+	0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x94,
+	0x01, 0x0a, 0x1e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74,
 	0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69,
-	0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x27, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2f,
+	0x70, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50,
+	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2d, 0x2e,
+	0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x55, 0x73,
+	0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x27, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x21, 0x22, 0x1c, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f,
+	0x63, 0x68, 0x65, 0x63, 0x6b, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68,
+	0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12, 0x97, 0x01, 0x0a, 0x1f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e,
+	0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74,
+	0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e,
+	0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70,
+	0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x22, 0x1d, 0x2f,
+	0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x2f,
 	0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12,
-	0x95, 0x01, 0x0a, 0x1f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61,
-	0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x68, 0x69, 0x70, 0x12, 0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x50,
-	0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x2e, 0x2e,
-	0x61, 0x70, 0x69, 0x2e, 0x63, 0x68, 0x61, 0x74, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55,
-	0x73, 0x65, 0x72, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x73, 0x52, 0x65, 0x6c, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x28, 0x82,
-	0xd3, 0xe4, 0x93, 0x02, 0x22, 0x22, 0x1d, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72,
-	0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x68, 0x69, 0x70, 0x3a, 0x01, 0x2a, 0x12, 0x75, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61,
-	0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
-	0x18, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e,
-	0x65, 0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e,
-	0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43,
-	0x69, 0x72, 0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02,
-	0x1d, 0x22, 0x18, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f,
-	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x62,
-	0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66,
-	0x6f, 0x12, 0x15, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x55, 0x73, 0x65,
-	0x72, 0x49, 0x44, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75,
-	0x73, 0x65, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f,
-	0x22, 0x20, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75,
-	0x73, 0x65, 0x72, 0x2f, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a,
-	0x01, 0x2a, 0x42, 0x3d, 0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 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, 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65,
-	0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x77, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72,
+	0x63, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f,
+	0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x50, 0x61,
+	0x72, 0x61, 0x6d, 0x1a, 0x1e, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65,
+	0x72, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x43, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x49,
+	0x6e, 0x66, 0x6f, 0x22, 0x23, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x22, 0x18, 0x2f, 0x61, 0x70,
+	0x69, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x2f, 0x63, 0x69, 0x72, 0x63, 0x6c, 0x65,
+	0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x12, 0x64, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x55,
+	0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x17, 0x2e, 0x61, 0x70,
+	0x69, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x44, 0x50,
+	0x61, 0x72, 0x61, 0x6d, 0x1a, 0x16, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e,
+	0x55, 0x73, 0x65, 0x72, 0x48, 0x6f, 0x6d, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x20, 0x82, 0xd3,
+	0xe4, 0x93, 0x02, 0x1a, 0x22, 0x15, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f,
+	0x63, 0x69, 0x72, 0x63, 0x6c, 0x65, 0x2f, 0x69, 0x6e, 0x66, 0x6f, 0x3a, 0x01, 0x2a, 0x42, 0x3d,
+	0x0a, 0x08, 0x61, 0x70, 0x69, 0x2e, 0x75, 0x73, 0x65, 0x72, 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, 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -469,8 +470,8 @@ var file_user_proto_goTypes = []interface{}{
 	(*UserInfo)(nil),                                  // 1: api.user.UserInfo
 	(*UpdateUserInformationRequest)(nil),              // 2: api.user.UpdateUserInformationRequest
 	(*emptypb.Empty)(nil),                             // 3: google.protobuf.Empty
-	(*base.PartnerIDParam)(nil),                       // 4: api.base.PartnerIDParam
-	(*base.UserIDParam)(nil),                          // 5: api.base.UserIDParam
+	(*common.PartnerIDParam)(nil),                     // 4: api.common.PartnerIDParam
+	(*common.UserIDParam)(nil),                        // 5: api.common.UserIDParam
 	(*chat.CheckUserPartnerIsRelationshipReply)(nil),  // 6: api.chat.CheckUserPartnerIsRelationshipReply
 	(*chat.CreateUserPartnerIsRelationshipReply)(nil), // 7: api.chat.CreateUserPartnerIsRelationshipReply
 	(*partner.PartnerCircleInfo)(nil),                 // 8: api.partner.PartnerCircleInfo
@@ -478,10 +479,10 @@ var file_user_proto_goTypes = []interface{}{
 var file_user_proto_depIdxs = []int32{
 	2, // 0: api.user.User.UpdateUserInformation:input_type -> api.user.UpdateUserInformationRequest
 	3, // 1: api.user.User.GetUserInfo:input_type -> google.protobuf.Empty
-	4, // 2: api.user.User.CheckUserPartnerIsRelationship:input_type -> api.base.PartnerIDParam
-	4, // 3: api.user.User.CreateUserPartnerIsRelationship:input_type -> api.base.PartnerIDParam
-	4, // 4: api.user.User.GetPartnerCircleInfo:input_type -> api.base.PartnerIDParam
-	5, // 5: api.user.User.GetUserHomeInfo:input_type -> api.base.UserIDParam
+	4, // 2: api.user.User.CheckUserPartnerIsRelationship:input_type -> api.common.PartnerIDParam
+	4, // 3: api.user.User.CreateUserPartnerIsRelationship:input_type -> api.common.PartnerIDParam
+	4, // 4: api.user.User.GetPartnerCircleInfo:input_type -> api.common.PartnerIDParam
+	5, // 5: api.user.User.GetUserHomeInfo:input_type -> api.common.UserIDParam
 	3, // 6: api.user.User.UpdateUserInformation:output_type -> google.protobuf.Empty
 	1, // 7: api.user.User.GetUserInfo:output_type -> api.user.UserInfo
 	6, // 8: api.user.User.CheckUserPartnerIsRelationship:output_type -> api.chat.CheckUserPartnerIsRelationshipReply

api/user/user.proto

@@ -7,44 +7,48 @@ import "google/api/annotations.proto";
 import "google/protobuf/empty.proto";
 import "api/chat/chat.proto";
 import "api/partner/partner.proto";
-import "api/base/base.proto";
+import "api/common/common.proto";
 
 option go_package = "git.ikuban.com/server/pw-protobuf/api/user;user";
 option java_multiple_files = true;
 option java_package = "api.user";
 
 service User {
+  // 更新用户信息
   rpc UpdateUserInformation (UpdateUserInformationRequest) returns (google.protobuf.Empty){
     option (google.api.http) = {
       post: "/api/user/update/information",
       body:"*"
     };
   };
+  // 获取用户详情
   rpc GetUserInfo (google.protobuf.Empty) returns (UserInfo){
     option (google.api.http) = {
       post: "/api/user/info",
       body:"*"
     };
   };
-  rpc CheckUserPartnerIsRelationship (base.PartnerIDParam) returns (chat.CheckUserPartnerIsRelationshipReply){
+  // 检查用户是否与陪聊关联
+  rpc CheckUserPartnerIsRelationship (common.PartnerIDParam) returns (chat.CheckUserPartnerIsRelationshipReply){
     option (google.api.http) = {
       post: "/api/user/check/relationship",
       body:"*"
     };
   };
-  rpc CreateUserPartnerIsRelationship (base.PartnerIDParam) returns (chat.CreateUserPartnerIsRelationshipReply){
+  // 创建用户与陪聊的关联
+  rpc CreateUserPartnerIsRelationship (common.PartnerIDParam) returns (chat.CreateUserPartnerIsRelationshipReply){
     option (google.api.http) = {
       post: "/api/user/create/relationship",
       body:"*"
     };
   };
-  rpc GetPartnerCircleInfo (base.PartnerIDParam) returns (partner.PartnerCircleInfo){
+  rpc GetPartnerCircleInfo (common.PartnerIDParam) returns (partner.PartnerCircleInfo){
     option (google.api.http) = {
       post: "/api/partner/circle/info",
       body:"*"
     };
   };
-  rpc GetUserHomeInfo (base.UserIDParam) returns (UserHomeInfo){
+  rpc GetUserHomeInfo (common.UserIDParam) returns (UserHomeInfo){
     option (google.api.http) = {
       post: "/api/user/circle/info",
       body:"*"

api/user/user_grpc.pb.go

@@ -4,8 +4,8 @@ package user
 
 import (
 	context "context"
-	base "git.ikuban.com/server/pw-protobuf/api/base"
 	chat "git.ikuban.com/server/pw-protobuf/api/chat"
+	common "git.ikuban.com/server/pw-protobuf/api/common"
 	partner "git.ikuban.com/server/pw-protobuf/api/partner"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -22,12 +22,16 @@ 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 UserClient interface {
+	// 更新用户信息
 	UpdateUserInformation(ctx context.Context, in *UpdateUserInformationRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	// 获取用户详情
 	GetUserInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*UserInfo, error)
-	CheckUserPartnerIsRelationship(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error)
-	CreateUserPartnerIsRelationship(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*chat.CreateUserPartnerIsRelationshipReply, error)
-	GetPartnerCircleInfo(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*partner.PartnerCircleInfo, error)
-	GetUserHomeInfo(ctx context.Context, in *base.UserIDParam, opts ...grpc.CallOption) (*UserHomeInfo, error)
+	// 检查用户是否与陪聊关联
+	CheckUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error)
+	// 创建用户与陪聊的关联
+	CreateUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CreateUserPartnerIsRelationshipReply, error)
+	GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*partner.PartnerCircleInfo, error)
+	GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...grpc.CallOption) (*UserHomeInfo, error)
 }
 
 type userClient struct {
@@ -56,7 +60,7 @@ func (c *userClient) GetUserInfo(ctx context.Context, in *emptypb.Empty, opts ..
 	return out, nil
 }
 
-func (c *userClient) CheckUserPartnerIsRelationship(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error) {
+func (c *userClient) CheckUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error) {
 	out := new(chat.CheckUserPartnerIsRelationshipReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/CheckUserPartnerIsRelationship", in, out, opts...)
 	if err != nil {
@@ -65,7 +69,7 @@ func (c *userClient) CheckUserPartnerIsRelationship(ctx context.Context, in *bas
 	return out, nil
 }
 
-func (c *userClient) CreateUserPartnerIsRelationship(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*chat.CreateUserPartnerIsRelationshipReply, error) {
+func (c *userClient) CreateUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*chat.CreateUserPartnerIsRelationshipReply, error) {
 	out := new(chat.CreateUserPartnerIsRelationshipReply)
 	err := c.cc.Invoke(ctx, "/api.user.User/CreateUserPartnerIsRelationship", in, out, opts...)
 	if err != nil {
@@ -74,7 +78,7 @@ func (c *userClient) CreateUserPartnerIsRelationship(ctx context.Context, in *ba
 	return out, nil
 }
 
-func (c *userClient) GetPartnerCircleInfo(ctx context.Context, in *base.PartnerIDParam, opts ...grpc.CallOption) (*partner.PartnerCircleInfo, error) {
+func (c *userClient) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...grpc.CallOption) (*partner.PartnerCircleInfo, error) {
 	out := new(partner.PartnerCircleInfo)
 	err := c.cc.Invoke(ctx, "/api.user.User/GetPartnerCircleInfo", in, out, opts...)
 	if err != nil {
@@ -83,7 +87,7 @@ func (c *userClient) GetPartnerCircleInfo(ctx context.Context, in *base.PartnerI
 	return out, nil
 }
 
-func (c *userClient) GetUserHomeInfo(ctx context.Context, in *base.UserIDParam, opts ...grpc.CallOption) (*UserHomeInfo, error) {
+func (c *userClient) GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...grpc.CallOption) (*UserHomeInfo, error) {
 	out := new(UserHomeInfo)
 	err := c.cc.Invoke(ctx, "/api.user.User/GetUserHomeInfo", in, out, opts...)
 	if err != nil {
@@ -96,12 +100,16 @@ func (c *userClient) GetUserHomeInfo(ctx context.Context, in *base.UserIDParam,
 // All implementations must embed UnimplementedUserServer
 // for forward compatibility
 type UserServer interface {
+	// 更新用户信息
 	UpdateUserInformation(context.Context, *UpdateUserInformationRequest) (*emptypb.Empty, error)
+	// 获取用户详情
 	GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error)
-	CheckUserPartnerIsRelationship(context.Context, *base.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
-	CreateUserPartnerIsRelationship(context.Context, *base.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error)
-	GetPartnerCircleInfo(context.Context, *base.PartnerIDParam) (*partner.PartnerCircleInfo, error)
-	GetUserHomeInfo(context.Context, *base.UserIDParam) (*UserHomeInfo, error)
+	// 检查用户是否与陪聊关联
+	CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
+	// 创建用户与陪聊的关联
+	CreateUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error)
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*partner.PartnerCircleInfo, error)
+	GetUserHomeInfo(context.Context, *common.UserIDParam) (*UserHomeInfo, error)
 	mustEmbedUnimplementedUserServer()
 }
 
@@ -115,16 +123,16 @@ func (UnimplementedUserServer) UpdateUserInformation(context.Context, *UpdateUse
 func (UnimplementedUserServer) GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserInfo not implemented")
 }
-func (UnimplementedUserServer) CheckUserPartnerIsRelationship(context.Context, *base.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error) {
+func (UnimplementedUserServer) CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckUserPartnerIsRelationship not implemented")
 }
-func (UnimplementedUserServer) CreateUserPartnerIsRelationship(context.Context, *base.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error) {
+func (UnimplementedUserServer) CreateUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CreateUserPartnerIsRelationship not implemented")
 }
-func (UnimplementedUserServer) GetPartnerCircleInfo(context.Context, *base.PartnerIDParam) (*partner.PartnerCircleInfo, error) {
+func (UnimplementedUserServer) GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*partner.PartnerCircleInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPartnerCircleInfo not implemented")
 }
-func (UnimplementedUserServer) GetUserHomeInfo(context.Context, *base.UserIDParam) (*UserHomeInfo, error) {
+func (UnimplementedUserServer) GetUserHomeInfo(context.Context, *common.UserIDParam) (*UserHomeInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetUserHomeInfo not implemented")
 }
 func (UnimplementedUserServer) mustEmbedUnimplementedUserServer() {}
@@ -177,7 +185,7 @@ func _User_GetUserInfo_Handler(srv interface{}, ctx context.Context, dec func(in
 }
 
 func _User_CheckUserPartnerIsRelationship_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(base.PartnerIDParam)
+	in := new(common.PartnerIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -189,13 +197,13 @@ func _User_CheckUserPartnerIsRelationship_Handler(srv interface{}, ctx context.C
 		FullMethod: "/api.user.User/CheckUserPartnerIsRelationship",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).CheckUserPartnerIsRelationship(ctx, req.(*base.PartnerIDParam))
+		return srv.(UserServer).CheckUserPartnerIsRelationship(ctx, req.(*common.PartnerIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _User_CreateUserPartnerIsRelationship_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(base.PartnerIDParam)
+	in := new(common.PartnerIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -207,13 +215,13 @@ func _User_CreateUserPartnerIsRelationship_Handler(srv interface{}, ctx context.
 		FullMethod: "/api.user.User/CreateUserPartnerIsRelationship",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).CreateUserPartnerIsRelationship(ctx, req.(*base.PartnerIDParam))
+		return srv.(UserServer).CreateUserPartnerIsRelationship(ctx, req.(*common.PartnerIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _User_GetPartnerCircleInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(base.PartnerIDParam)
+	in := new(common.PartnerIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -225,13 +233,13 @@ func _User_GetPartnerCircleInfo_Handler(srv interface{}, ctx context.Context, de
 		FullMethod: "/api.user.User/GetPartnerCircleInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).GetPartnerCircleInfo(ctx, req.(*base.PartnerIDParam))
+		return srv.(UserServer).GetPartnerCircleInfo(ctx, req.(*common.PartnerIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }
 
 func _User_GetUserHomeInfo_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(base.UserIDParam)
+	in := new(common.UserIDParam)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
@@ -243,7 +251,7 @@ func _User_GetUserHomeInfo_Handler(srv interface{}, ctx context.Context, dec fun
 		FullMethod: "/api.user.User/GetUserHomeInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(UserServer).GetUserHomeInfo(ctx, req.(*base.UserIDParam))
+		return srv.(UserServer).GetUserHomeInfo(ctx, req.(*common.UserIDParam))
 	}
 	return interceptor(ctx, in, info, handler)
 }

api/user/user_http.pb.go

@@ -8,8 +8,8 @@ import (
 	context "context"
 	base "git.ikuban.com/server/base-protobuf/kuban/api/base"
 	reply "git.ikuban.com/server/kratos-utils/http/reply"
-	base1 "git.ikuban.com/server/pw-protobuf/api/base"
 	chat "git.ikuban.com/server/pw-protobuf/api/chat"
+	common "git.ikuban.com/server/pw-protobuf/api/common"
 	partner "git.ikuban.com/server/pw-protobuf/api/partner"
 	http "github.com/go-kratos/kratos/v2/transport/http"
 	binding "github.com/go-kratos/kratos/v2/transport/http/binding"
@@ -30,10 +30,10 @@ var _ = new(base.Html)
 const _ = http.SupportPackageIsVersion1
 
 type UserHTTPServer interface {
-	CheckUserPartnerIsRelationship(context.Context, *base1.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
-	CreateUserPartnerIsRelationship(context.Context, *base1.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error)
-	GetPartnerCircleInfo(context.Context, *base1.PartnerIDParam) (*partner.PartnerCircleInfo, error)
-	GetUserHomeInfo(context.Context, *base1.UserIDParam) (*UserHomeInfo, error)
+	CheckUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CheckUserPartnerIsRelationshipReply, error)
+	CreateUserPartnerIsRelationship(context.Context, *common.PartnerIDParam) (*chat.CreateUserPartnerIsRelationshipReply, error)
+	GetPartnerCircleInfo(context.Context, *common.PartnerIDParam) (*partner.PartnerCircleInfo, error)
+	GetUserHomeInfo(context.Context, *common.UserIDParam) (*UserHomeInfo, error)
 	GetUserInfo(context.Context, *emptypb.Empty) (*UserInfo, error)
 	UpdateUserInformation(context.Context, *UpdateUserInformationRequest) (*emptypb.Empty, error)
 }
@@ -104,7 +104,7 @@ func _User_GetUserInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context)
 
 func _User_CheckUserPartnerIsRelationship0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in base1.PartnerIDParam
+		var in common.PartnerIDParam
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -113,7 +113,7 @@ func _User_CheckUserPartnerIsRelationship0_HTTP_Handler(srv UserHTTPServer) func
 		}
 		http.SetOperation(ctx, "/api.user.User/CheckUserPartnerIsRelationship")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.CheckUserPartnerIsRelationship(ctx, req.(*base1.PartnerIDParam))
+			return srv.CheckUserPartnerIsRelationship(ctx, req.(*common.PartnerIDParam))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -131,7 +131,7 @@ func _User_CheckUserPartnerIsRelationship0_HTTP_Handler(srv UserHTTPServer) func
 
 func _User_CreateUserPartnerIsRelationship0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in base1.PartnerIDParam
+		var in common.PartnerIDParam
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -140,7 +140,7 @@ func _User_CreateUserPartnerIsRelationship0_HTTP_Handler(srv UserHTTPServer) fun
 		}
 		http.SetOperation(ctx, "/api.user.User/CreateUserPartnerIsRelationship")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.CreateUserPartnerIsRelationship(ctx, req.(*base1.PartnerIDParam))
+			return srv.CreateUserPartnerIsRelationship(ctx, req.(*common.PartnerIDParam))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -158,7 +158,7 @@ func _User_CreateUserPartnerIsRelationship0_HTTP_Handler(srv UserHTTPServer) fun
 
 func _User_GetPartnerCircleInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in base1.PartnerIDParam
+		var in common.PartnerIDParam
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -167,7 +167,7 @@ func _User_GetPartnerCircleInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.
 		}
 		http.SetOperation(ctx, "/api.user.User/GetPartnerCircleInfo")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.GetPartnerCircleInfo(ctx, req.(*base1.PartnerIDParam))
+			return srv.GetPartnerCircleInfo(ctx, req.(*common.PartnerIDParam))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -185,7 +185,7 @@ func _User_GetPartnerCircleInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.
 
 func _User_GetUserHomeInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Context) error {
 	return func(ctx http.Context) error {
-		var in base1.UserIDParam
+		var in common.UserIDParam
 		if err := ctx.Bind(&in); err != nil {
 			return err
 		}
@@ -194,7 +194,7 @@ func _User_GetUserHomeInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Conte
 		}
 		http.SetOperation(ctx, "/api.user.User/GetUserHomeInfo")
 		h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) {
-			return srv.GetUserHomeInfo(ctx, req.(*base1.UserIDParam))
+			return srv.GetUserHomeInfo(ctx, req.(*common.UserIDParam))
 		})
 		out, err := h(ctx, &in)
 		if err != nil {
@@ -211,10 +211,10 @@ func _User_GetUserHomeInfo0_HTTP_Handler(srv UserHTTPServer) func(ctx http.Conte
 }
 
 type UserHTTPClient interface {
-	CheckUserPartnerIsRelationship(ctx context.Context, req *base1.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CheckUserPartnerIsRelationshipReply, err error)
-	CreateUserPartnerIsRelationship(ctx context.Context, req *base1.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CreateUserPartnerIsRelationshipReply, err error)
-	GetPartnerCircleInfo(ctx context.Context, req *base1.PartnerIDParam, opts ...http.CallOption) (rsp *partner.PartnerCircleInfo, err error)
-	GetUserHomeInfo(ctx context.Context, req *base1.UserIDParam, opts ...http.CallOption) (rsp *UserHomeInfo, err error)
+	CheckUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CheckUserPartnerIsRelationshipReply, err error)
+	CreateUserPartnerIsRelationship(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *chat.CreateUserPartnerIsRelationshipReply, err error)
+	GetPartnerCircleInfo(ctx context.Context, req *common.PartnerIDParam, opts ...http.CallOption) (rsp *partner.PartnerCircleInfo, err error)
+	GetUserHomeInfo(ctx context.Context, req *common.UserIDParam, opts ...http.CallOption) (rsp *UserHomeInfo, err error)
 	GetUserInfo(ctx context.Context, req *emptypb.Empty, opts ...http.CallOption) (rsp *UserInfo, err error)
 	UpdateUserInformation(ctx context.Context, req *UpdateUserInformationRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error)
 }
@@ -227,7 +227,7 @@ func NewUserHTTPClient(client *http.Client) UserHTTPClient {
 	return &UserHTTPClientImpl{client}
 }
 
-func (c *UserHTTPClientImpl) CheckUserPartnerIsRelationship(ctx context.Context, in *base1.PartnerIDParam, opts ...http.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error) {
+func (c *UserHTTPClientImpl) CheckUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*chat.CheckUserPartnerIsRelationshipReply, error) {
 	var out chat.CheckUserPartnerIsRelationshipReply
 	pattern := "/api/user/check/relationship"
 	path := binding.EncodeURL(pattern, in, false)
@@ -240,7 +240,7 @@ func (c *UserHTTPClientImpl) CheckUserPartnerIsRelationship(ctx context.Context,
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) CreateUserPartnerIsRelationship(ctx context.Context, in *base1.PartnerIDParam, opts ...http.CallOption) (*chat.CreateUserPartnerIsRelationshipReply, error) {
+func (c *UserHTTPClientImpl) CreateUserPartnerIsRelationship(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*chat.CreateUserPartnerIsRelationshipReply, error) {
 	var out chat.CreateUserPartnerIsRelationshipReply
 	pattern := "/api/user/create/relationship"
 	path := binding.EncodeURL(pattern, in, false)
@@ -253,7 +253,7 @@ func (c *UserHTTPClientImpl) CreateUserPartnerIsRelationship(ctx context.Context
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *base1.PartnerIDParam, opts ...http.CallOption) (*partner.PartnerCircleInfo, error) {
+func (c *UserHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *common.PartnerIDParam, opts ...http.CallOption) (*partner.PartnerCircleInfo, error) {
 	var out partner.PartnerCircleInfo
 	pattern := "/api/partner/circle/info"
 	path := binding.EncodeURL(pattern, in, false)
@@ -266,7 +266,7 @@ func (c *UserHTTPClientImpl) GetPartnerCircleInfo(ctx context.Context, in *base1
 	return &out, err
 }
 
-func (c *UserHTTPClientImpl) GetUserHomeInfo(ctx context.Context, in *base1.UserIDParam, opts ...http.CallOption) (*UserHomeInfo, error) {
+func (c *UserHTTPClientImpl) GetUserHomeInfo(ctx context.Context, in *common.UserIDParam, opts ...http.CallOption) (*UserHomeInfo, error) {
 	var out UserHomeInfo
 	pattern := "/api/user/circle/info"
 	path := binding.EncodeURL(pattern, in, false)

js/api/partner/partner_http_pb.ts

@@ -1,7 +1,7 @@
 // @ts-ignore
 import { request } from 'ice';
 import {PartnerInfo,PartnerCircleInfo,UpdatePartnerInformationRequest} from "./partner_pb";
-import {PartnerIDParam} from "../base/base_pb";
+import {PartnerIDParam} from "../common/common_pb";
 
 const PartnerService = {
   GetPartnerInfo: async (req?: undefined) => {

js/api/user/user_http_pb.ts

@@ -1,23 +1,27 @@
 // @ts-ignore
 import { request } from 'ice';
 import {UpdateUserInformationRequest,UserInfo,UserHomeInfo} from "./user_pb";
-import {PartnerIDParam,UserIDParam} from "../base/base_pb";
+import {PartnerIDParam,UserIDParam} from "../common/common_pb";
 import {CheckUserPartnerIsRelationshipReply,CreateUserPartnerIsRelationshipReply} from "../chat/chat_pb";
 import {PartnerCircleInfo} from "../partner/partner_pb";
 
 const UserService = {
+  /**  更新用户信息 */
   UpdateUserInformation: async (req?: UpdateUserInformationRequest) => {
 	const res = await request.post('/api/user/update/information', req);
     return res.data;
   },
+  /**  获取用户详情 */
   GetUserInfo: async (req?: undefined) => {
 	const res = await request.post<{ data: UserInfo, code: string, message: string }>('/api/user/info', req);
     return res.data;
   },
+  /**  检查用户是否与陪聊关联 */
   CheckUserPartnerIsRelationship: async (req?: PartnerIDParam) => {
 	const res = await request.post<{ data: CheckUserPartnerIsRelationshipReply, code: string, message: string }>('/api/user/check/relationship', req);
     return res.data;
   },
+  /**  创建用户与陪聊的关联 */
   CreateUserPartnerIsRelationship: async (req?: PartnerIDParam) => {
 	const res = await request.post<{ data: CreateUserPartnerIsRelationshipReply, code: string, message: string }>('/api/user/create/relationship', req);
     return res.data;