diff --git a/modules/smithyv2/api.go b/modules/smithyv2/api.go index ac92b2ac9..3b3a5f157 100644 --- a/modules/smithyv2/api.go +++ b/modules/smithyv2/api.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "go_dreamfactory/lego/core" diff --git a/modules/smithyv2/api_createorder.go b/modules/smithyv2/api_createorder.go index 652e9ba70..dd6d5bcc0 100644 --- a/modules/smithyv2/api_createorder.go +++ b/modules/smithyv2/api_createorder.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "go_dreamfactory/comm" diff --git a/modules/smithyv2/api_deskskilllv.go b/modules/smithyv2/api_deskskilllv.go index 2942405f3..41034512d 100644 --- a/modules/smithyv2/api_deskskilllv.go +++ b/modules/smithyv2/api_deskskilllv.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "crypto/rand" diff --git a/modules/smithyv2/api_getReward.go b/modules/smithyv2/api_getReward.go index 8981ae4ed..4123200d9 100644 --- a/modules/smithyv2/api_getReward.go +++ b/modules/smithyv2/api_getReward.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "go_dreamfactory/comm" diff --git a/modules/smithyv2/api_getlist.go b/modules/smithyv2/api_getlist.go index 177223f8f..814f16995 100644 --- a/modules/smithyv2/api_getlist.go +++ b/modules/smithyv2/api_getlist.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "go_dreamfactory/comm" diff --git a/modules/smithyv2/api_getranduser.go b/modules/smithyv2/api_getranduser.go index 8389d55d7..668c39b9a 100644 --- a/modules/smithyv2/api_getranduser.go +++ b/modules/smithyv2/api_getranduser.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "context" diff --git a/modules/smithyv2/api_stoveskilllv.go b/modules/smithyv2/api_stoveskilllv.go index 285b3693d..b10801d2e 100644 --- a/modules/smithyv2/api_stoveskilllv.go +++ b/modules/smithyv2/api_stoveskilllv.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "crypto/rand" diff --git a/modules/smithyv2/api_trade.go b/modules/smithyv2/api_trade.go new file mode 100644 index 000000000..081b0728e --- /dev/null +++ b/modules/smithyv2/api_trade.go @@ -0,0 +1,12 @@ +package smithyv2 + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" +) + +// 贸易 + +func (this *apiComp) TradeCheck(session comm.IUserSession, req *pb.SmithyTradeReq) (code pb.ErrorCode) { + return +} diff --git a/modules/smithyv2/comp_configure.go b/modules/smithyv2/comp_configure.go index 3487bcfb7..16a30fb6e 100644 --- a/modules/smithyv2/comp_configure.go +++ b/modules/smithyv2/comp_configure.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "go_dreamfactory/lego/core" diff --git a/modules/smithyv2/model_smithy.go b/modules/smithyv2/model_smithy.go index 4328c3be4..5ca39f653 100644 --- a/modules/smithyv2/model_smithy.go +++ b/modules/smithyv2/model_smithy.go @@ -1,4 +1,4 @@ -package smithy +package smithyv2 import ( "go_dreamfactory/comm" diff --git a/modules/smithyv2/module.go b/modules/smithyv2/module.go index c6cc7c76b..cadf12620 100644 --- a/modules/smithyv2/module.go +++ b/modules/smithyv2/module.go @@ -3,7 +3,7 @@ 描述:铁匠铺模块 开发:梅雄风 */ -package smithy +package smithyv2 import ( "go_dreamfactory/comm" diff --git a/pb/smithy_msg.pb.go b/pb/smithy_msg.pb.go index 0fbe0ff3e..262330c1a 100644 --- a/pb/smithy_msg.pb.go +++ b/pb/smithy_msg.pb.go @@ -1368,6 +1368,101 @@ func (x *SmithyGetListResp) GetData() *DBSmithy { return nil } +// 贸易 +type SmithyTradeReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ItemId []string `protobuf:"bytes,1,rep,name=itemId,proto3" json:"itemId"` //物品ID +} + +func (x *SmithyTradeReq) Reset() { + *x = SmithyTradeReq{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_msg_proto_msgTypes[28] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SmithyTradeReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SmithyTradeReq) ProtoMessage() {} + +func (x *SmithyTradeReq) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_msg_proto_msgTypes[28] + 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 SmithyTradeReq.ProtoReflect.Descriptor instead. +func (*SmithyTradeReq) Descriptor() ([]byte, []int) { + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{28} +} + +func (x *SmithyTradeReq) GetItemId() []string { + if x != nil { + return x.ItemId + } + return nil +} + +type SmithyTradeResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + IsSucc bool `protobuf:"varint,1,opt,name=isSucc,proto3" json:"isSucc"` +} + +func (x *SmithyTradeResp) Reset() { + *x = SmithyTradeResp{} + if protoimpl.UnsafeEnabled { + mi := &file_smithy_smithy_msg_proto_msgTypes[29] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *SmithyTradeResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*SmithyTradeResp) ProtoMessage() {} + +func (x *SmithyTradeResp) ProtoReflect() protoreflect.Message { + mi := &file_smithy_smithy_msg_proto_msgTypes[29] + 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 SmithyTradeResp.ProtoReflect.Descriptor instead. +func (*SmithyTradeResp) Descriptor() ([]byte, []int) { + return file_smithy_smithy_msg_proto_rawDescGZIP(), []int{29} +} + +func (x *SmithyTradeResp) GetIsSucc() bool { + if x != nil { + return x.IsSucc + } + return false +} + var File_smithy_smithy_msg_proto protoreflect.FileDescriptor var file_smithy_smithy_msg_proto_rawDesc = []byte{ @@ -1467,8 +1562,13 @@ var file_smithy_smithy_msg_proto_rawDesc = []byte{ 0x74, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x11, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x53, 0x6d, 0x69, 0x74, - 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x68, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x28, 0x0a, 0x0e, 0x53, 0x6d, 0x69, 0x74, + 0x68, 0x79, 0x54, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, + 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, + 0x49, 0x64, 0x22, 0x29, 0x0a, 0x0f, 0x53, 0x6d, 0x69, 0x74, 0x68, 0x79, 0x54, 0x72, 0x61, 0x64, + 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1483,7 +1583,7 @@ func file_smithy_smithy_msg_proto_rawDescGZIP() []byte { return file_smithy_smithy_msg_proto_rawDescData } -var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 28) +var file_smithy_smithy_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 30) var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyGetStoveInfoReq)(nil), // 0: SmithyGetStoveInfoReq (*SmithyGetStoveInfoResp)(nil), // 1: SmithyGetStoveInfoResp @@ -1513,28 +1613,30 @@ var file_smithy_smithy_msg_proto_goTypes = []interface{}{ (*SmithyGetRandUserResp)(nil), // 25: SmithyGetRandUserResp (*SmithyGetListReq)(nil), // 26: SmithyGetListReq (*SmithyGetListResp)(nil), // 27: SmithyGetListResp - (*DBStove)(nil), // 28: DBStove - (*DBBusiness)(nil), // 29: DBBusiness - (*OrderClang)(nil), // 30: OrderClang - (*DBSmithy)(nil), // 31: DBSmithy - (*DBUser)(nil), // 32: DBUser + (*SmithyTradeReq)(nil), // 28: SmithyTradeReq + (*SmithyTradeResp)(nil), // 29: SmithyTradeResp + (*DBStove)(nil), // 30: DBStove + (*DBBusiness)(nil), // 31: DBBusiness + (*OrderClang)(nil), // 32: OrderClang + (*DBSmithy)(nil), // 33: DBSmithy + (*DBUser)(nil), // 34: DBUser } var file_smithy_smithy_msg_proto_depIdxs = []int32{ - 28, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove - 28, // 1: SmithyForgeEquipResp.data:type_name -> DBStove - 28, // 2: SmithyOrderEquipResp.data:type_name -> DBStove - 28, // 3: SmithyStoveUpResp.data:type_name -> DBStove - 28, // 4: SmithyRiseResp.data:type_name -> DBStove - 28, // 5: SmithyToolsUpResp.data:type_name -> DBStove - 29, // 6: SmithyRefreshShopResp.data:type_name -> DBBusiness - 29, // 7: SmithySellItemResp.data:type_name -> DBBusiness - 30, // 8: SmithyCreateOrderReq.order:type_name -> OrderClang - 31, // 9: SmithyCreateOrderResp.data:type_name -> DBSmithy - 31, // 10: SmithyGetRewardResp.data:type_name -> DBSmithy - 31, // 11: SmithyDeskSkillLvResp.data:type_name -> DBSmithy - 31, // 12: SmithyStoveSkillLvResp.data:type_name -> DBSmithy - 32, // 13: SmithyGetRandUserResp.user:type_name -> DBUser - 31, // 14: SmithyGetListResp.data:type_name -> DBSmithy + 30, // 0: SmithyGetStoveInfoResp.data:type_name -> DBStove + 30, // 1: SmithyForgeEquipResp.data:type_name -> DBStove + 30, // 2: SmithyOrderEquipResp.data:type_name -> DBStove + 30, // 3: SmithyStoveUpResp.data:type_name -> DBStove + 30, // 4: SmithyRiseResp.data:type_name -> DBStove + 30, // 5: SmithyToolsUpResp.data:type_name -> DBStove + 31, // 6: SmithyRefreshShopResp.data:type_name -> DBBusiness + 31, // 7: SmithySellItemResp.data:type_name -> DBBusiness + 32, // 8: SmithyCreateOrderReq.order:type_name -> OrderClang + 33, // 9: SmithyCreateOrderResp.data:type_name -> DBSmithy + 33, // 10: SmithyGetRewardResp.data:type_name -> DBSmithy + 33, // 11: SmithyDeskSkillLvResp.data:type_name -> DBSmithy + 33, // 12: SmithyStoveSkillLvResp.data:type_name -> DBSmithy + 34, // 13: SmithyGetRandUserResp.user:type_name -> DBUser + 33, // 14: SmithyGetListResp.data:type_name -> DBSmithy 15, // [15:15] is the sub-list for method output_type 15, // [15:15] is the sub-list for method input_type 15, // [15:15] is the sub-list for extension type_name @@ -1886,6 +1988,30 @@ func file_smithy_smithy_msg_proto_init() { return nil } } + file_smithy_smithy_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SmithyTradeReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_smithy_smithy_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SmithyTradeResp); 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{ @@ -1893,7 +2019,7 @@ func file_smithy_smithy_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_smithy_smithy_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 28, + NumMessages: 30, NumExtensions: 0, NumServices: 0, },