Skip to content

P
plugin
Commit e7afa5bc authored by pengjun's avatar pengjun
Browse files
Options

#627 update query param

parent 020ed969
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 163 deletions
plugin/dapp/collateralize/commands/cmd.go
View file @ e7afa5bc
......@@ -391,23 +391,24 @@ func CollateralizeQuery(cmd *cobra.Command, args []string) {
}
if collateralizeID != "" {
if statusStr != "" {
params.FuncName = "CollateralizeRecordByStatus"
if address != "" {
params.FuncName = "CollateralizeRecordByAddr"
req := &pkt.ReqCollateralizeRecordByStatus{
req := &pkt.ReqCollateralizeRecordByAddr{
CollateralizeId: collateralizeID,
Status: int32(status),
Addr: address,
}
params.Payload = types.MustPBToJSON(req)
var res pkt.RepCollateralizeRecords
ctx := jsonrpc.NewRPCCtx(rpcLaddr, "Chain33.Query", params, &res)
ctx.Run()
} else if address != "" {
params.FuncName = "CollateralizeRecordByAddr"
} else if statusStr != "" {
params.FuncName = "CollateralizeRecordByStatus"
req := &pkt.ReqCollateralizeRecordByAddr{
req := &pkt.ReqCollateralizeRecordByStatus{
CollateralizeId: collateralizeID,
Addr: address,
Status: int32(status),
}
params.Payload = types.MustPBToJSON(req)
var res pkt.RepCollateralizeRecords
......
plugin/dapp/collateralize/executor/query.go
View file @ e7afa5bc
......@@ -100,7 +100,15 @@ func (c *Collateralize) Query_CollateralizeRecordByAddr(req *pty.ReqCollateraliz
return nil, err
}
ret.Records = records
if req.Status == 0 {
ret.Records = records
} else {
for _,record := range records {
if record.Status == req.Status {
ret.Records = append(ret.Records, record)
}
}
}
return ret, nil
}
......
plugin/dapp/collateralize/proto/collateralize.proto
View file @ e7afa5bc
......@@ -185,7 +185,8 @@ message RepCollateralizeIDs {
message ReqCollateralizeRecordByAddr {
string collateralizeId = 1;
string addr = 2;
int64 index = 3;
int32 status = 3;
int64 index = 4;
}
// 根据状态和借贷ID混合查询具体借贷记录
......
plugin/dapp/collateralize/types/collateralize.pb.go
View file @ e7afa5bc
......@@ -1530,7 +1530,8 @@ func (m *RepCollateralizeIDs) GetIDs() []string {
type ReqCollateralizeRecordByAddr struct {
CollateralizeId string `protobuf:"bytes,1,opt,name=collateralizeId,proto3" json:"collateralizeId,omitempty"`
Addr string `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
Index int64 `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"`
Status int32 `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -1575,6 +1576,13 @@ func (m *ReqCollateralizeRecordByAddr) GetAddr() string {
return ""
}
func (m *ReqCollateralizeRecordByAddr) GetStatus() int32 {
if m != nil {
return m.Status
}
return 0
}
func (m *ReqCollateralizeRecordByAddr) GetIndex() int64 {
if m != nil {
return m.Index
......@@ -1888,82 +1896,82 @@ func init() {
func init() { proto.RegisterFile("collateralize.proto", fileDescriptor_a988fb4a61381972) }
var fileDescriptor_a988fb4a61381972 = []byte{
// 1221 bytes of a gzipped FileDescriptorProto
// 1227 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x5b, 0x6b, 0xdc, 0x46,
0x14, 0x8e, 0xa4, 0xbd, 0x78, 0xcf, 0xda, 0x8e, 0x33, 0x76, 0x53, 0xd5, 0x35, 0x66, 0x11, 0x85,
0x14, 0x8e, 0xa4, 0xbd, 0x78, 0xcf, 0xda, 0x8e, 0x33, 0x76, 0x5d, 0xd5, 0x35, 0x66, 0x11, 0x85,
0x2e, 0xbd, 0x18, 0xea, 0x84, 0xd2, 0x50, 0x28, 0xb5, 0x37, 0x09, 0x5e, 0x48, 0x21, 0xa8, 0x69,
0x29, 0x85, 0x16, 0xb4, 0xd2, 0xd8, 0x15, 0xc8, 0x92, 0x2c, 0xcd, 0xba, 0xde, 0xbe, 0x37, 0xbf,
0x22, 0x3f, 0xae, 0xff, 0x21, 0x0f, 0x7d, 0x2d, 0x73, 0x66, 0x74, 0x99, 0x91, 0x64, 0xbc, 0x6d,
0x9f, 0xf2, 0x62, 0x34, 0x67, 0xbe, 0x33, 0x73, 0xe6, 0x9c, 0xef, 0x5c, 0xbc, 0xb0, 0xeb, 0x27,
0x51, 0xe4, 0x31, 0x9a, 0x79, 0x51, 0xf8, 0x07, 0x3d, 0x4a, 0xb3, 0x84, 0x25, 0xa4, 0xcf, 0x56,
0x29, 0xcd, 0x9d, 0xb7, 0x3d, 0xd8, 0x9a, 0xd5, 0xb7, 0xc9, 0x14, 0xee, 0x2b, 0xf8, 0x79, 0x60,
0x1b, 0x13, 0x63, 0x3a, 0x72, 0x75, 0x31, 0x71, 0x60, 0x93, 0x25, 0xcc, 0x8b, 0x4e, 0xbd, 0xc8,
0x8b, 0x7d, 0x6a, 0x9b, 0x13, 0x63, 0x6a, 0xb9, 0x8a, 0x8c, 0x4c, 0x60, 0x1c, 0xd0, 0x05, 0x9b,
0xd1, 0x30, 0x0a, 0xe3, 0x0b, 0xdb, 0x42, 0x48, 0x5d, 0x44, 0x3e, 0x81, 0x9d, 0x28, 0xbc, 0x5a,
0x86, 0x81, 0xc7, 0xc2, 0x24, 0x76, 0xf9, 0x5f, 0xbb, 0x37, 0x31, 0xa6, 0xa6, 0xdb, 0x90, 0x93,
0xcf, 0xe0, 0x41, 0xce, 0xbc, 0x45, 0x18, 0x85, 0x6c, 0xf5, 0x9c, 0x52, 0x01, 0xee, 0x23, 0xb8,
0xb9, 0x41, 0x0e, 0x01, 0xfc, 0x8c, 0x7a, 0x8c, 0x9e, 0x04, 0x41, 0x66, 0x0f, 0xf0, 0x11, 0x35,
0x09, 0xb1, 0x61, 0xb8, 0x90, 0xa6, 0x0f, 0xd1, 0xae, 0x62, 0x49, 0x9e, 0xc0, 0xd6, 0x22, 0xc9,
0xb2, 0xe4, 0x77, 0x97, 0xfa, 0x49, 0x16, 0xe4, 0xf6, 0xc6, 0xc4, 0x9a, 0x8e, 0x8f, 0x77, 0x8f,
0xd0, 0x69, 0x47, 0xa7, 0xb5, 0x3d, 0x57, 0x45, 0x92, 0xaf, 0x61, 0x7b, 0x1e, 0x5f, 0x7b, 0x51,
0x18, 0x14, 0xba, 0xa3, 0x6e, 0x5d, 0x0d, 0x4a, 0x1e, 0xc2, 0x20, 0x67, 0x1e, 0x5b, 0xe6, 0x36,
0x4c, 0x8c, 0x69, 0xdf, 0x95, 0x2b, 0xf2, 0x25, 0x3c, 0xe4, 0x9e, 0xcf, 0xd9, 0x8b, 0xca, 0x23,
0x2f, 0xb3, 0xd0, 0xa7, 0xf6, 0x18, 0x1f, 0xdf, 0xb1, 0xcb, 0xcf, 0x4b, 0x69, 0x16, 0x26, 0x81,
0xbd, 0x89, 0x0f, 0x94, 0x2b, 0xf4, 0x39, 0x6a, 0x3c, 0xbb, 0x49, 0xc3, 0x8c, 0xbe, 0x0a, 0x2f,
0xa9, 0xbd, 0x85, 0x88, 0x86, 0x9c, 0xec, 0x41, 0x3f, 0x8c, 0x03, 0x7a, 0x63, 0x6f, 0x23, 0x40,
0x2c, 0xc8, 0x3e, 0x6c, 0xa4, 0x19, 0x9d, 0xe3, 0xc6, 0x7d, 0xdc, 0x28, 0xd7, 0x3c, 0xe6, 0x9c,
0x2a, 0x05, 0x2d, 0x76, 0x44, 0xcc, 0x6b, 0x22, 0xe7, 0x2f, 0x0b, 0x36, 0xeb, 0x8e, 0xe0, 0x2a,
0x9e, 0xef, 0x27, 0xcb, 0x98, 0x61, 0xac, 0x04, 0xe1, 0xea, 0x22, 0x72, 0x00, 0xa3, 0x9c, 0x79,
0x19, 0x43, 0x5b, 0x05, 0xd3, 0x2a, 0x81, 0x4a, 0xda, 0x1f, 0xbd, 0x68, 0x49, 0x25, 0xd5, 0x74,
0xb1, 0x8a, 0x14, 0x3e, 0x14, 0x6c, 0xd3, 0xc5, 0xfc, 0x46, 0xce, 0x53, 0x71, 0x5a, 0x5f, 0xdc,
0x58, 0x0a, 0x34, 0xda, 0x8a, 0x83, 0x06, 0x0d, 0xda, 0x96, 0x61, 0x90, 0x61, 0x1d, 0x2a, 0x61,
0xfd, 0x08, 0xb6, 0x0a, 0xac, 0x88, 0xc1, 0x06, 0xde, 0xa2, 0x0a, 0x39, 0x8d, 0x69, 0x15, 0xa6,
0x11, 0x42, 0x6a, 0x12, 0x6e, 0x67, 0x9a, 0xd1, 0xef, 0xeb, 0xbc, 0xa9, 0x04, 0x3c, 0x50, 0x19,
0xfa, 0x78, 0x1e, 0x20, 0x59, 0x46, 0x6e, 0xb9, 0x6e, 0x4b, 0xf5, 0xcd, 0xf6, 0x54, 0x2f, 0x49,
0xb0, 0xd5, 0x45, 0x82, 0x6d, 0x95, 0x04, 0xce, 0x6b, 0x03, 0x76, 0x4e, 0xf2, 0x9c, 0x32, 0x74,
0x81, 0x0c, 0xf3, 0x21, 0x80, 0xb8, 0x1c, 0x9f, 0x62, 0x88, 0xa7, 0x54, 0x12, 0x7e, 0xe0, 0x82,
0xad, 0x84, 0x33, 0x4d, 0x74, 0x66, 0xb9, 0x16, 0x7b, 0xbe, 0xd8, 0xb3, 0x8a, 0x3d, 0xbf, 0xdc,
0xa3, 0xec, 0xb7, 0x7a, 0x34, 0xcb, 0xb5, 0xf3, 0xc6, 0x82, 0x5d, 0xa5, 0xc2, 0x9d, 0xf8, 0x3c,
0x32, 0xe4, 0x31, 0x0c, 0x44, 0x2d, 0x40, 0x3b, 0xc6, 0xc7, 0xfb, 0x32, 0x41, 0x15, 0xec, 0x0c,
0x11, 0x67, 0xf7, 0x5c, 0x89, 0xe5, 0x5a, 0x22, 0xdf, 0xd1, 0xbe, 0x0e, 0x2d, 0x41, 0x6d, 0xae,
0x25, 0xb0, 0xe4, 0x0b, 0xe8, 0x67, 0x34, 0xf5, 0x56, 0x68, 0xf8, 0xf8, 0xf8, 0x83, 0x36, 0x25,
0x97, 0x03, 0xce, 0xee, 0xb9, 0x02, 0xc9, 0x2f, 0xf2, 0xd2, 0x94, 0xc6, 0x01, 0x3e, 0xa8, 0xe3,
0xa2, 0x13, 0x44, 0xf0, 0x8b, 0x04, 0x96, 0x1c, 0x41, 0xef, 0x9c, 0xd2, 0x00, 0xe9, 0x3a, 0x3e,
0xb6, 0xdb, 0x74, 0x9e, 0x53, 0xca, 0x35, 0x10, 0xc7, 0x0d, 0xf3, 0xa3, 0x24, 0x17, 0xd4, 0xed,
0x30, 0x6c, 0xc6, 0x01, 0xdc, 0x30, 0x44, 0x72, 0xc3, 0x2e, 0xbd, 0xd8, 0xbb, 0x10, 0x45, 0xb3,
0xc3, 0xb0, 0xef, 0x10, 0xc1, 0x0d, 0x13, 0x58, 0xb2, 0x0d, 0x26, 0x5b, 0x49, 0x76, 0x9a, 0x6c,
0x75, 0x3a, 0x84, 0xfe, 0x35, 0xcf, 0x23, 0xe7, 0x6f, 0x43, 0x0b, 0x8f, 0x50, 0xd5, 0x1b, 0x87,
0x71, 0xb7, 0xc6, 0x61, 0xae, 0xd3, 0x38, 0xac, 0xae, 0xc6, 0x51, 0x95, 0xcd, 0x9e, 0x5e, 0x36,
0x79, 0x62, 0xbc, 0xaa, 0x37, 0x3d, 0x51, 0x18, 0x1a, 0x72, 0x2c, 0x82, 0xcb, 0x2c, 0xa3, 0xb1,
0xa8, 0x58, 0x03, 0x59, 0x04, 0x2b, 0x91, 0xf3, 0x08, 0x1e, 0xa8, 0xc1, 0xe4, 0x65, 0xee, 0x10,
0x20, 0x5f, 0xa6, 0x34, 0xe3, 0x8b, 0xdc, 0x36, 0x26, 0x16, 0xef, 0x59, 0x95, 0xc4, 0x79, 0xa2,
0x79, 0x4b, 0x10, 0xb4, 0xd1, 0x8a, 0x8d, 0x66, 0x2b, 0x76, 0x7e, 0xd0, 0x54, 0x05, 0x4b, 0xd7,
0xe8, 0xf7, 0x7b, 0x32, 0x66, 0xb2, 0xfc, 0xca, 0x00, 0xfe, 0x0c, 0xa4, 0xc9, 0xe3, 0x35, 0x4e,
0xad, 0x17, 0x28, 0x53, 0x2d, 0x50, 0xce, 0x9f, 0x3a, 0x39, 0x04, 0xe1, 0xff, 0x9f, 0xd3, 0xef,
0xde, 0x34, 0x9c, 0x5f, 0xb4, 0x50, 0xf1, 0x1c, 0xe2, 0x47, 0x63, 0xd4, 0x57, 0xa9, 0xf0, 0x77,
0xdf, 0x2d, 0xd7, 0xdc, 0x55, 0xa9, 0xac, 0x62, 0xd6, 0xd4, 0x74, 0xc5, 0x82, 0xf3, 0xea, 0x3a,
0x89, 0x96, 0x97, 0xfc, 0x1e, 0x8b, 0xf3, 0x4a, 0xac, 0x9c, 0x6f, 0x34, 0x17, 0x62, 0xc6, 0xdd,
0xfd, 0x91, 0xce, 0x6b, 0x13, 0xf6, 0x5c, 0xea, 0xd3, 0x30, 0x65, 0xff, 0x76, 0x96, 0x53, 0x67,
0x25, 0xb3, 0x31, 0x2b, 0x69, 0x0d, 0xda, 0x6a, 0x36, 0xe8, 0xba, 0xa7, 0x7b, 0x9a, 0xa7, 0xab,
0x06, 0xd8, 0x57, 0x1a, 0xe0, 0x01, 0x8c, 0x5e, 0x96, 0xad, 0x6b, 0x20, 0x5a, 0x57, 0x29, 0xa8,
0x9a, 0xce, 0xb0, 0xab, 0xe9, 0x6c, 0x68, 0x4d, 0xa7, 0xc1, 0x17, 0xd9, 0x77, 0xee, 0xee, 0x07,
0x02, 0x3d, 0xaf, 0xf2, 0x00, 0x7e, 0x2b, 0x2f, 0xb3, 0xb4, 0x97, 0x95, 0x36, 0xf6, 0x6a, 0x36,
0x3a, 0x2f, 0x60, 0xaf, 0xc5, 0x8c, 0x9c, 0x3c, 0x86, 0x61, 0x26, 0xa7, 0x42, 0x03, 0xa7, 0xc2,
0xfd, 0xf6, 0x4e, 0x80, 0xc3, 0x61, 0x01, 0x75, 0xbe, 0xe5, 0xd1, 0xbd, 0x52, 0x20, 0xf3, 0xf8,
0x3c, 0x59, 0x83, 0x20, 0x6f, 0x4d, 0xf8, 0xd0, 0xa5, 0xa9, 0x4a, 0x32, 0x51, 0x8a, 0xf0, 0xa4,
0x2a, 0x3e, 0x86, 0x12, 0x9f, 0x77, 0x77, 0xc2, 0xaf, 0x4a, 0xfc, 0x86, 0x52, 0xe2, 0x5b, 0x7c,
0x3a, 0x6a, 0x67, 0x8a, 0x36, 0xe5, 0x42, 0x73, 0xca, 0x9d, 0xc1, 0x7b, 0x6d, 0x71, 0xcb, 0x8b,
0x3e, 0x52, 0x3b, 0xad, 0x28, 0xf5, 0x0d, 0xb9, 0xf3, 0x13, 0x1c, 0xdc, 0x12, 0xb9, 0x9c, 0x7c,
0xc5, 0x09, 0x78, 0x9e, 0x14, 0x84, 0x72, 0x24, 0xa1, 0x6e, 0xd1, 0x71, 0x85, 0x82, 0x73, 0x06,
0xb6, 0x6e, 0xde, 0xe9, 0x4a, 0xa6, 0x5e, 0x17, 0x21, 0x4a, 0xba, 0x9b, 0x75, 0xba, 0x9f, 0xc2,
0xc3, 0xe6, 0x49, 0x18, 0x80, 0x22, 0x9d, 0x8c, 0x5a, 0x3a, 0xb5, 0x9f, 0xf1, 0x31, 0xec, 0xea,
0x36, 0xcf, 0x9f, 0xe6, 0x64, 0x07, 0xac, 0xf9, 0xd3, 0xc2, 0x3b, 0xfc, 0xd3, 0xc9, 0xb8, 0x43,
0xae, 0x5a, 0x12, 0x46, 0x5e, 0xf9, 0xdf, 0x72, 0xbd, 0x34, 0xce, 0xaa, 0x1b, 0x77, 0x03, 0x87,
0x5d, 0x77, 0x4a, 0x87, 0xdd, 0xfd, 0xd6, 0xca, 0xb5, 0x66, 0xbb, 0x6b, 0x95, 0x9b, 0xcf, 0xe0,
0x7d, 0xdd, 0x2d, 0x45, 0x31, 0xf9, 0x5c, 0x2f, 0x26, 0xad, 0xff, 0x62, 0x96, 0x55, 0xe4, 0xd7,
0x66, 0x90, 0xd6, 0xae, 0x8e, 0xb7, 0xf5, 0xea, 0x67, 0xfc, 0xfc, 0x36, 0x4b, 0xc9, 0xa7, 0x30,
0x10, 0x28, 0x39, 0x69, 0xb7, 0xda, 0x29, 0x21, 0xce, 0x1b, 0xb3, 0x79, 0xce, 0x2c, 0x89, 0xcf,
0xc3, 0x8b, 0x77, 0x62, 0x24, 0xac, 0x55, 0x8c, 0x41, 0xa3, 0x62, 0xe8, 0x43, 0xe3, 0xb0, 0x31,
0x34, 0x2e, 0x06, 0xf8, 0xeb, 0xcd, 0xa3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x50, 0x87,
0x0f, 0xd4, 0x11, 0x00, 0x00,
0x29, 0x85, 0x16, 0xb4, 0xd2, 0xd8, 0x15, 0xc8, 0x92, 0x2c, 0xcd, 0xba, 0xde, 0xbe, 0x37, 0x0f,
0xfd, 0x0d, 0xf9, 0x71, 0xfd, 0x0f, 0x79, 0xe8, 0x6b, 0x99, 0x33, 0xa3, 0xcb, 0x8c, 0x24, 0x63,
0xb7, 0x79, 0xca, 0x8b, 0xd1, 0x9c, 0xf9, 0xce, 0xcc, 0x99, 0x73, 0xbe, 0x73, 0xf1, 0xc2, 0xb6,
0x9f, 0x44, 0x91, 0xc7, 0x68, 0xe6, 0x45, 0xe1, 0x1f, 0xf4, 0x30, 0xcd, 0x12, 0x96, 0x90, 0x3e,
0x5b, 0xa5, 0x34, 0x77, 0xde, 0xf4, 0x60, 0x63, 0x56, 0xdf, 0x26, 0x53, 0xb8, 0xaf, 0xe0, 0xe7,
0x81, 0x6d, 0x4c, 0x8c, 0xe9, 0xc8, 0xd5, 0xc5, 0xc4, 0x81, 0x75, 0x96, 0x30, 0x2f, 0x3a, 0xf1,
0x22, 0x2f, 0xf6, 0xa9, 0x6d, 0x4e, 0x8c, 0xa9, 0xe5, 0x2a, 0x32, 0x32, 0x81, 0x71, 0x40, 0x17,
0x6c, 0x46, 0xc3, 0x28, 0x8c, 0xcf, 0x6d, 0x0b, 0x21, 0x75, 0x11, 0xf9, 0x04, 0xb6, 0xa2, 0xf0,
0x72, 0x19, 0x06, 0x1e, 0x0b, 0x93, 0xd8, 0xe5, 0x7f, 0xed, 0xde, 0xc4, 0x98, 0x9a, 0x6e, 0x43,
0x4e, 0x3e, 0x83, 0x07, 0x39, 0xf3, 0x16, 0x61, 0x14, 0xb2, 0xd5, 0x33, 0x4a, 0x05, 0xb8, 0x8f,
0xe0, 0xe6, 0x06, 0x39, 0x00, 0xf0, 0x33, 0xea, 0x31, 0x7a, 0x1c, 0x04, 0x99, 0x3d, 0xc0, 0x47,
0xd4, 0x24, 0xc4, 0x86, 0xe1, 0x42, 0x9a, 0x3e, 0x44, 0xbb, 0x8a, 0x25, 0x79, 0x0c, 0x1b, 0x8b,
0x24, 0xcb, 0x92, 0xdf, 0x5d, 0xea, 0x27, 0x59, 0x90, 0xdb, 0x6b, 0x13, 0x6b, 0x3a, 0x3e, 0xda,
0x3e, 0x44, 0xa7, 0x1d, 0x9e, 0xd4, 0xf6, 0x5c, 0x15, 0x49, 0xbe, 0x86, 0xcd, 0x79, 0x7c, 0xe5,
0x45, 0x61, 0x50, 0xe8, 0x8e, 0xba, 0x75, 0x35, 0x28, 0xd9, 0x85, 0x41, 0xce, 0x3c, 0xb6, 0xcc,
0x6d, 0x98, 0x18, 0xd3, 0xbe, 0x2b, 0x57, 0xe4, 0x4b, 0xd8, 0xe5, 0x9e, 0xcf, 0xd9, 0xf3, 0xca,
0x23, 0x2f, 0xb2, 0xd0, 0xa7, 0xf6, 0x18, 0x1f, 0xdf, 0xb1, 0xcb, 0xcf, 0x4b, 0x69, 0x16, 0x26,
0x81, 0xbd, 0x8e, 0x0f, 0x94, 0x2b, 0xf4, 0x39, 0x6a, 0x3c, 0xbd, 0x4e, 0xc3, 0x8c, 0xbe, 0x0c,
0x2f, 0xa8, 0xbd, 0x81, 0x88, 0x86, 0x9c, 0xec, 0x40, 0x3f, 0x8c, 0x03, 0x7a, 0x6d, 0x6f, 0x22,
0x40, 0x2c, 0xc8, 0x1e, 0xac, 0xa5, 0x19, 0x9d, 0xe3, 0xc6, 0x7d, 0xdc, 0x28, 0xd7, 0x3c, 0xe6,
0x9c, 0x2a, 0x05, 0x2d, 0xb6, 0x44, 0xcc, 0x6b, 0x22, 0xe7, 0x6f, 0x0b, 0xd6, 0xeb, 0x8e, 0xe0,
0x2a, 0x9e, 0xef, 0x27, 0xcb, 0x98, 0x61, 0xac, 0x04, 0xe1, 0xea, 0x22, 0xb2, 0x0f, 0xa3, 0x9c,
0x79, 0x19, 0x43, 0x5b, 0x05, 0xd3, 0x2a, 0x81, 0x4a, 0xda, 0x1f, 0xbd, 0x68, 0x49, 0x25, 0xd5,
0x74, 0xb1, 0x8a, 0x14, 0x3e, 0x14, 0x6c, 0xd3, 0xc5, 0xfc, 0x46, 0xce, 0x53, 0x71, 0x5a, 0x5f,
0xdc, 0x58, 0x0a, 0x34, 0xda, 0x8a, 0x83, 0x06, 0x0d, 0xda, 0x96, 0x61, 0x90, 0x61, 0x1d, 0x2a,
0x61, 0xfd, 0x08, 0x36, 0x0a, 0xac, 0x88, 0xc1, 0x1a, 0xde, 0xa2, 0x0a, 0x39, 0x8d, 0x69, 0x15,
0xa6, 0x11, 0x42, 0x6a, 0x12, 0x6e, 0x67, 0x9a, 0xd1, 0xef, 0xeb, 0xbc, 0xa9, 0x04, 0x3c, 0x50,
0x19, 0xfa, 0x78, 0x1e, 0x20, 0x59, 0x46, 0x6e, 0xb9, 0x6e, 0x4b, 0xf5, 0xf5, 0xf6, 0x54, 0x2f,
0x49, 0xb0, 0xd1, 0x45, 0x82, 0x4d, 0x95, 0x04, 0xce, 0x2b, 0x03, 0xb6, 0x8e, 0xf3, 0x9c, 0x32,
0x74, 0x81, 0x0c, 0xf3, 0x01, 0x80, 0xb8, 0x1c, 0x9f, 0x62, 0x88, 0xa7, 0x54, 0x12, 0x7e, 0xe0,
0x82, 0xad, 0x84, 0x33, 0x4d, 0x74, 0x66, 0xb9, 0x16, 0x7b, 0xbe, 0xd8, 0xb3, 0x8a, 0x3d, 0xbf,
0xdc, 0xa3, 0xec, 0xb7, 0x7a, 0x34, 0xcb, 0xb5, 0xf3, 0xda, 0x82, 0x6d, 0xa5, 0xc2, 0x1d, 0xfb,
0x3c, 0x32, 0xe4, 0x11, 0x0c, 0x44, 0x2d, 0x40, 0x3b, 0xc6, 0x47, 0x7b, 0x32, 0x41, 0x15, 0xec,
0x0c, 0x11, 0xa7, 0xf7, 0x5c, 0x89, 0xe5, 0x5a, 0x22, 0xdf, 0xd1, 0xbe, 0x0e, 0x2d, 0x41, 0x6d,
0xae, 0x25, 0xb0, 0xe4, 0x0b, 0xe8, 0x67, 0x34, 0xf5, 0x56, 0x68, 0xf8, 0xf8, 0xe8, 0x83, 0x36,
0x25, 0x97, 0x03, 0x4e, 0xef, 0xb9, 0x02, 0xc9, 0x2f, 0xf2, 0xd2, 0x94, 0xc6, 0x01, 0x3e, 0xa8,
0xe3, 0xa2, 0x63, 0x44, 0xf0, 0x8b, 0x04, 0x96, 0x1c, 0x42, 0xef, 0x8c, 0xd2, 0x00, 0xe9, 0x3a,
0x3e, 0xb2, 0xdb, 0x74, 0x9e, 0x51, 0xca, 0x35, 0x10, 0xc7, 0x0d, 0xf3, 0xa3, 0x24, 0x17, 0xd4,
0xed, 0x30, 0x6c, 0xc6, 0x01, 0xdc, 0x30, 0x44, 0x72, 0xc3, 0x2e, 0xbc, 0xd8, 0x3b, 0x17, 0x45,
0xb3, 0xc3, 0xb0, 0xef, 0x10, 0xc1, 0x0d, 0x13, 0x58, 0xb2, 0x09, 0x26, 0x5b, 0x49, 0x76, 0x9a,
0x6c, 0x75, 0x32, 0x84, 0xfe, 0x15, 0xcf, 0x23, 0xe7, 0x1f, 0x43, 0x0b, 0x8f, 0x50, 0xd5, 0x1b,
0x87, 0x71, 0xbb, 0xc6, 0x61, 0xde, 0xa5, 0x71, 0x58, 0x5d, 0x8d, 0xa3, 0x2a, 0x9b, 0x3d, 0xbd,
0x6c, 0xf2, 0xc4, 0x78, 0x59, 0x6f, 0x7a, 0xa2, 0x30, 0x34, 0xe4, 0x58, 0x04, 0x97, 0x59, 0x46,
0x63, 0x51, 0xb1, 0x06, 0xb2, 0x08, 0x56, 0x22, 0xe7, 0x21, 0x3c, 0x50, 0x83, 0xc9, 0xcb, 0xdc,
0x01, 0x40, 0xbe, 0x4c, 0x69, 0xc6, 0x17, 0xb9, 0x6d, 0x4c, 0x2c, 0xde, 0xb3, 0x2a, 0x89, 0xf3,
0x58, 0xf3, 0x96, 0x20, 0x68, 0xa3, 0x15, 0x1b, 0xcd, 0x56, 0xec, 0xfc, 0xa0, 0xa9, 0x0a, 0x96,
0xde, 0xa1, 0xdf, 0xef, 0xc8, 0x98, 0xc9, 0xf2, 0x2b, 0x03, 0xf8, 0x33, 0x90, 0x26, 0x8f, 0xef,
0x70, 0x6a, 0xbd, 0x40, 0x99, 0x6a, 0x81, 0x72, 0xfe, 0xd4, 0xc9, 0x21, 0x08, 0xff, 0x76, 0x4e,
0xbf, 0x7d, 0xd3, 0x70, 0x7e, 0xd1, 0x42, 0xc5, 0x73, 0x88, 0x1f, 0x8d, 0x51, 0x5f, 0xa5, 0xc2,
0xdf, 0x7d, 0xb7, 0x5c, 0x73, 0x57, 0xa5, 0xb2, 0x8a, 0x59, 0x53, 0xd3, 0x15, 0x0b, 0xce, 0xab,
0xab, 0x24, 0x5a, 0x5e, 0xf0, 0x7b, 0x2c, 0xce, 0x2b, 0xb1, 0x72, 0xbe, 0xd1, 0x5c, 0x88, 0x19,
0x77, 0xfb, 0x47, 0x3a, 0xaf, 0x4c, 0xd8, 0x71, 0xa9, 0x4f, 0xc3, 0x94, 0xfd, 0xd7, 0x59, 0x4e,
0x9d, 0x95, 0xcc, 0xc6, 0xac, 0xa4, 0x35, 0x68, 0xab, 0xd9, 0xa0, 0xeb, 0x9e, 0xee, 0x69, 0x9e,
0xae, 0x1a, 0x60, 0x5f, 0x69, 0x80, 0xfb, 0x30, 0x7a, 0x51, 0xb6, 0xae, 0x81, 0x68, 0x5d, 0xa5,
0xa0, 0x6a, 0x3a, 0xc3, 0xae, 0xa6, 0xb3, 0xa6, 0x35, 0x9d, 0x06, 0x5f, 0x64, 0xdf, 0xb9, 0xbd,
0x1f, 0x08, 0xf4, 0xbc, 0xca, 0x03, 0xf8, 0xad, 0xbc, 0xcc, 0xd2, 0x5e, 0x56, 0xda, 0xd8, 0xab,
0xd9, 0xe8, 0x3c, 0x87, 0x9d, 0x16, 0x33, 0x72, 0xf2, 0x08, 0x86, 0x99, 0x9c, 0x0a, 0x0d, 0x9c,
0x0a, 0xf7, 0xda, 0x3b, 0x01, 0x0e, 0x87, 0x05, 0xd4, 0xf9, 0x96, 0x47, 0xf7, 0x52, 0x81, 0xcc,
0xe3, 0xb3, 0xe4, 0x0e, 0x04, 0x79, 0x63, 0xc2, 0x87, 0x2e, 0x4d, 0x55, 0x92, 0x89, 0x52, 0x84,
0x27, 0x55, 0xf1, 0x31, 0x94, 0xf8, 0xbc, 0xbb, 0x13, 0x7e, 0x55, 0xe2, 0xd7, 0x94, 0x12, 0xdf,
0xe2, 0xd3, 0x51, 0x3b, 0x53, 0xb4, 0x29, 0x17, 0x9a, 0x53, 0xee, 0x0c, 0xde, 0x6b, 0x8b, 0x5b,
0x5e, 0xf4, 0x91, 0xda, 0x69, 0x45, 0xa9, 0x6f, 0xc8, 0x9d, 0x9f, 0x60, 0xff, 0x86, 0xc8, 0xe5,
0xe4, 0x2b, 0x4e, 0xc0, 0xb3, 0xa4, 0x20, 0x94, 0x23, 0x09, 0x75, 0x83, 0x8e, 0x2b, 0x14, 0x9c,
0x53, 0xb0, 0x75, 0xf3, 0x4e, 0x56, 0x32, 0xf5, 0xba, 0x08, 0x51, 0xd2, 0xdd, 0xac, 0xd3, 0xfd,
0x04, 0x76, 0x9b, 0x27, 0x61, 0x00, 0x8a, 0x74, 0x32, 0x6a, 0xe9, 0xd4, 0x7e, 0xc6, 0xc7, 0xb0,
0xad, 0xdb, 0x3c, 0x7f, 0x92, 0x93, 0x2d, 0xb0, 0xe6, 0x4f, 0x0a, 0xef, 0xf0, 0x4f, 0xe7, 0x2f,
0x83, 0x7b, 0xe4, 0xb2, 0x25, 0x63, 0xe4, 0x9d, 0xff, 0x2f, 0xd9, 0xab, 0x97, 0x5b, 0xed, 0x2f,
0x57, 0x12, 0xfd, 0x1a, 0x0e, 0xba, 0x6c, 0x91, 0x9e, 0xbc, 0xbd, 0x35, 0xd5, 0xcd, 0x66, 0xfb,
0xcd, 0x56, 0xfd, 0xe6, 0x53, 0x78, 0x5f, 0xf7, 0x57, 0x51, 0x65, 0x3e, 0xd7, 0xab, 0x4c, 0xeb,
0xff, 0x9e, 0x65, 0x79, 0xf9, 0xb5, 0x19, 0xbd, 0x3b, 0x97, 0xcd, 0x9b, 0x9a, 0xf8, 0x53, 0x7e,
0x7e, 0x9b, 0xa5, 0xe4, 0x53, 0x18, 0x08, 0x94, 0x1c, 0xc1, 0x5b, 0xed, 0x94, 0x10, 0xe7, 0xb5,
0xd9, 0x3c, 0x67, 0x96, 0xc4, 0x67, 0xe1, 0xf9, 0x3b, 0x31, 0x2b, 0xd6, 0x4a, 0xc9, 0xa0, 0x51,
0x4a, 0xf4, 0x69, 0x72, 0xd8, 0x98, 0x26, 0x17, 0x03, 0xfc, 0x59, 0xe7, 0xe1, 0xbf, 0x01, 0x00,
0x00, 0xff, 0xff, 0x5c, 0x29, 0x62, 0x99, 0xed, 0x11, 0x00, 0x00,
}
plugin/dapp/issuance/commands/cmd.go
View file @ e7afa5bc
......@@ -322,23 +322,24 @@ func IssuanceQuery(cmd *cobra.Command, args []string) {
}
if issuanceID != "" {
if statusStr != "" {
params.FuncName = "IssuanceRecordsByStatus"
if address != "" {
params.FuncName = "IssuanceRecordsByAddr"
req := &pkt.ReqIssuanceRecordsByStatus{
req := &pkt.ReqIssuanceRecordsByAddr{
IssuanceId: issuanceID,
Status: int32(status),
Addr: address,
}
params.Payload = types.MustPBToJSON(req)
var res pkt.RepIssuanceRecords
ctx := jsonrpc.NewRPCCtx(rpcLaddr, "Chain33.Query", params, &res)
ctx.Run()
} else if address != "" {
params.FuncName = "IssuanceRecordsByAddr"
} else if statusStr != "" {
params.FuncName = "IssuanceRecordsByStatus"
req := &pkt.ReqIssuanceRecordsByAddr{
req := &pkt.ReqIssuanceRecordsByStatus{
IssuanceId: issuanceID,
Addr: address,
Status: int32(status),
}
params.Payload = types.MustPBToJSON(req)
var res pkt.RepIssuanceRecords
......
plugin/dapp/issuance/executor/query.go
View file @ e7afa5bc
......@@ -88,7 +88,16 @@ func (c *Issuance) Query_IssuanceRecordsByAddr(req *pty.ReqIssuanceRecordsByAddr
return nil, err
}
ret.Records = records
if req.Status == 0 {
ret.Records = records
} else {
for _,record := range records {
if record.Status == req.Status {
ret.Records = append(ret.Records, record)
}
}
}
return ret, nil
}
......
plugin/dapp/issuance/proto/issuance.proto
View file @ e7afa5bc
......@@ -166,7 +166,8 @@ message RepIssuanceIDs {
message ReqIssuanceRecordsByAddr {
string issuanceId = 1;
string addr = 2;
int64 index = 3;
int32 status = 3;
int64 index = 4;
}
// 根据状态查询抵押记录
......
plugin/dapp/issuance/types/issuance.pb.go
View file @ e7afa5bc
......@@ -1356,7 +1356,8 @@ func (m *RepIssuanceIDs) GetIDs() []string {
type ReqIssuanceRecordsByAddr struct {
IssuanceId string `protobuf:"bytes,1,opt,name=issuanceId,proto3" json:"issuanceId,omitempty"`
Addr string `protobuf:"bytes,2,opt,name=addr,proto3" json:"addr,omitempty"`
Index int64 `protobuf:"varint,3,opt,name=index,proto3" json:"index,omitempty"`
Status int32 `protobuf:"varint,3,opt,name=status,proto3" json:"status,omitempty"`
Index int64 `protobuf:"varint,4,opt,name=index,proto3" json:"index,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
......@@ -1401,6 +1402,13 @@ func (m *ReqIssuanceRecordsByAddr) GetAddr() string {
return ""
}
func (m *ReqIssuanceRecordsByAddr) GetStatus() int32 {
if m != nil {
return m.Status
}
return 0
}
func (m *ReqIssuanceRecordsByAddr) GetIndex() int64 {
if m != nil {
return m.Index
......@@ -1622,74 +1630,74 @@ func init() {
func init() { proto.RegisterFile("issuance.proto", fileDescriptor_7110f4228953d675) }
var fileDescriptor_7110f4228953d675 = []byte{
// 1099 bytes of a gzipped FileDescriptorProto
// 1103 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xdd, 0x6e, 0xe3, 0x44,
0x14, 0xae, 0xed, 0x38, 0x3f, 0x27, 0x6d, 0xda, 0x9d, 0xed, 0x16, 0x6b, 0x05, 0xab, 0xc8, 0xe2,
0x22, 0x0b, 0xa8, 0x85, 0x16, 0x21, 0x71, 0x47, 0xd3, 0x02, 0x8d, 0xc4, 0x22, 0x64, 0x56, 0x2b,
0x6e, 0x5d, 0x7b, 0xba, 0x32, 0x72, 0x63, 0xaf, 0x3d, 0xa9, 0x36, 0x4f, 0xc1, 0x3d, 0xef, 0xc2,
0x3d, 0x0f, 0xc0, 0xa3, 0xf0, 0x00, 0xe8, 0x9c, 0x19, 0x7b, 0xfc, 0x97, 0x26, 0xe2, 0x62, 0x6f,
0xaa, 0xcc, 0x99, 0xcf, 0x67, 0xce, 0xcf, 0x37, 0xdf, 0x9c, 0xc2, 0x24, 0xca, 0xf3, 0x95, 0xbf,
0x0c, 0xf8, 0x69, 0x9a, 0x25, 0x22, 0x61, 0xb6, 0x58, 0xa7, 0x3c, 0x77, 0xff, 0xed, 0xc1, 0x70,
0xa1, 0x76, 0xd8, 0x0b, 0x80, 0x02, 0xb5, 0x08, 0x1d, 0x63, 0x6a, 0xcc, 0x46, 0x5e, 0xc5, 0xc2,
0x5c, 0xd8, 0x17, 0x89, 0xf0, 0xe3, 0xb9, 0x1f, 0xa3, 0xc5, 0x31, 0xa7, 0xc6, 0xcc, 0xf2, 0x6a,
0x36, 0x36, 0x85, 0x71, 0xc8, 0x6f, 0xc5, 0x15, 0x8f, 0xe2, 0x68, 0xf9, 0xd6, 0xb1, 0x08, 0x52,
0x35, 0xb1, 0xcf, 0xe0, 0x28, 0x8e, 0xde, 0xad, 0xa2, 0xd0, 0x17, 0x51, 0xb2, 0xf4, 0xf0, 0xaf,
0xd3, 0x9b, 0x1a, 0x33, 0xd3, 0x6b, 0xd9, 0xd9, 0x0c, 0x0e, 0x83, 0x24, 0x8e, 0x7d, 0xc1, 0x33,
0x3f, 0x7e, 0xe3, 0xc7, 0x2b, 0xee, 0xd8, 0xe4, 0xb1, 0x69, 0x66, 0x1f, 0xc3, 0x08, 0x0f, 0x91,
0x98, 0x3e, 0x61, 0xb4, 0x81, 0x5d, 0xc8, 0xa8, 0x3c, 0x1e, 0x24, 0x59, 0x98, 0x3b, 0x83, 0xa9,
0x35, 0x1b, 0x9f, 0x3f, 0x39, 0xa5, 0x1a, 0x9c, 0x5e, 0x97, 0x3b, 0x5e, 0x15, 0xc5, 0xbe, 0x85,
0x49, 0xb4, 0x7c, 0xf0, 0xe3, 0x28, 0x2c, 0xbe, 0x1b, 0x6e, 0xfa, 0xae, 0x01, 0x64, 0x27, 0xd0,
0xcf, 0x85, 0x2f, 0x56, 0xb9, 0x33, 0x9a, 0x1a, 0x33, 0xdb, 0x53, 0x2b, 0xf6, 0x0d, 0x9c, 0x60,
0xd4, 0xb9, 0xf8, 0x49, 0x67, 0xfa, 0x4b, 0x16, 0x05, 0xdc, 0x01, 0xaa, 0xc0, 0x86, 0x5d, 0xf4,
0x97, 0xf2, 0x2c, 0x4a, 0x42, 0x67, 0x4c, 0xa9, 0xa9, 0x15, 0xd5, 0x92, 0xbe, 0xf8, 0xfe, 0x7d,
0x1a, 0x65, 0xfc, 0x75, 0x74, 0xcf, 0x9d, 0x7d, 0x42, 0xb4, 0xec, 0xd8, 0xdd, 0x20, 0xe3, 0xbe,
0x90, 0xa8, 0x03, 0x42, 0x55, 0x2c, 0xcc, 0x81, 0xc1, 0xad, 0x6a, 0xec, 0x84, 0x36, 0x8b, 0x65,
0xc1, 0x0b, 0x9e, 0x5d, 0x86, 0x61, 0xe6, 0x1c, 0x6a, 0x5e, 0x48, 0x0b, 0x3b, 0x06, 0x3b, 0x5a,
0x86, 0xfc, 0xbd, 0x73, 0x44, 0xdf, 0xc9, 0x05, 0x7b, 0x0e, 0xc3, 0x34, 0xe3, 0x0b, 0xda, 0x78,
0x42, 0x1b, 0xe5, 0xda, 0xfd, 0xdb, 0x02, 0xd0, 0xe5, 0x43, 0xd2, 0xf8, 0x41, 0x90, 0xac, 0x96,
0x82, 0x4e, 0x90, 0xcc, 0xab, 0x9a, 0xb0, 0xbd, 0xb9, 0xf0, 0x33, 0x41, 0xb1, 0x4b, 0xde, 0x69,
0x43, 0x17, 0x4d, 0xac, 0x6e, 0x9a, 0xd4, 0x90, 0xb2, 0xf2, 0x92, 0x7b, 0x4d, 0x73, 0x9d, 0x50,
0x76, 0x93, 0x50, 0x75, 0x12, 0x4b, 0x47, 0xfd, 0x16, 0x89, 0xcb, 0xe6, 0x29, 0x32, 0x0c, 0x6a,
0x64, 0xf8, 0x14, 0x0e, 0x0a, 0xac, 0xec, 0xc9, 0x90, 0x4e, 0xa9, 0x1b, 0xb1, 0xf8, 0x5c, 0x37,
0x77, 0x24, 0xdb, 0xa6, 0x2d, 0x18, 0x67, 0x9a, 0xf1, 0x5f, 0xe5, 0x01, 0x40, 0x07, 0x68, 0x03,
0x9e, 0x8d, 0x41, 0x2f, 0x24, 0x71, 0x46, 0x9e, 0x5a, 0xa1, 0x1d, 0x1b, 0xb8, 0x08, 0x89, 0x2e,
0x23, 0x4f, 0xad, 0x74, 0x2b, 0x0f, 0x36, 0xb5, 0x72, 0xd2, 0x68, 0xe5, 0x1b, 0x70, 0x0a, 0x01,
0xb9, 0xcc, 0x73, 0x2e, 0x28, 0x67, 0xd5, 0xd7, 0x17, 0x00, 0x19, 0xfd, 0xa2, 0xd8, 0x0d, 0x19,
0xbb, 0xb6, 0xa0, 0xdf, 0x5b, 0xb1, 0x96, 0xd5, 0x33, 0xa9, 0x7a, 0xe5, 0xda, 0xfd, 0xcb, 0x84,
0x49, 0xe9, 0x38, 0xc0, 0x6a, 0xb2, 0x33, 0xe8, 0x4b, 0xbe, 0x92, 0xab, 0xf1, 0xf9, 0x33, 0x75,
0x11, 0x0b, 0xd8, 0x15, 0x6d, 0xde, 0xec, 0x79, 0x0a, 0xc6, 0x5e, 0x42, 0x0f, 0xf3, 0x25, 0xdf,
0xe3, 0xf3, 0xa7, 0x0d, 0x38, 0x12, 0xf0, 0x66, 0xcf, 0x23, 0x08, 0xfb, 0x02, 0xec, 0x8c, 0xa7,
0xfe, 0x9a, 0x88, 0x33, 0x3e, 0x3f, 0x6e, 0x60, 0x3d, 0xdc, 0xbb, 0xd9, 0xf3, 0x24, 0x08, 0x1d,
0xdf, 0x71, 0x1e, 0x12, 0x77, 0xda, 0x8e, 0x7f, 0xe0, 0x3c, 0x44, 0xc7, 0x08, 0x41, 0xc7, 0x41,
0x9c, 0xe4, 0x92, 0x43, 0x6d, 0xc7, 0x57, 0xb8, 0x87, 0x8e, 0x09, 0x84, 0x29, 0xde, 0xfb, 0x4b,
0xff, 0xad, 0x64, 0x53, 0x3b, 0xc5, 0x57, 0xb4, 0x89, 0x29, 0x4a, 0x18, 0x9b, 0x80, 0x29, 0xd6,
0xaa, 0xef, 0xa6, 0x58, 0xcf, 0x07, 0x60, 0x3f, 0x20, 0x43, 0xdd, 0x2f, 0x75, 0xf9, 0xe4, 0x47,
0xd8, 0x8d, 0x7c, 0x95, 0xca, 0x3b, 0x9b, 0x3b, 0xc6, 0xd4, 0xc2, 0x6b, 0xac, 0x2d, 0xee, 0x9f,
0x86, 0xfe, 0x44, 0x96, 0xb2, 0xa5, 0xf8, 0xc6, 0x76, 0xc5, 0x37, 0x77, 0x53, 0x7c, 0x6b, 0x83,
0xe2, 0x6b, 0xa5, 0xeb, 0x55, 0x95, 0xce, 0xbd, 0x86, 0xfd, 0x6a, 0xdf, 0xb6, 0xbe, 0x55, 0xc7,
0xaa, 0x0e, 0x2a, 0x1e, 0x55, 0x94, 0x1f, 0xe1, 0xa0, 0xd6, 0xd1, 0xad, 0x6e, 0xf4, 0xfd, 0x31,
0xab, 0xf7, 0xc7, 0xfd, 0x4d, 0x87, 0x83, 0xdd, 0x46, 0x26, 0xa3, 0x80, 0xbc, 0x5e, 0xa7, 0xb2,
0x48, 0xb6, 0x57, 0xae, 0x31, 0x94, 0x54, 0x51, 0xdc, 0x9a, 0x99, 0x9e, 0x5c, 0xa0, 0xe7, 0x87,
0x24, 0x5e, 0xdd, 0xa3, 0x54, 0x59, 0x98, 0xa8, 0x5c, 0xb9, 0x67, 0x3a, 0x44, 0xe2, 0xc6, 0xb6,
0x10, 0xdd, 0x3f, 0x4c, 0x38, 0xf4, 0x78, 0xc0, 0xa3, 0x54, 0xec, 0xfc, 0x92, 0x37, 0x04, 0xd7,
0x6c, 0x0b, 0xae, 0x4e, 0xdc, 0x6a, 0x0a, 0x87, 0x12, 0xb3, 0x5e, 0x4d, 0xcc, 0x6a, 0x32, 0x64,
0x37, 0x65, 0xa8, 0x94, 0x95, 0xfe, 0x26, 0x59, 0x19, 0xd4, 0x65, 0xa5, 0x21, 0x1d, 0xc3, 0x47,
0xa5, 0x63, 0xd4, 0x90, 0x8e, 0x4c, 0xf3, 0x58, 0x0b, 0xd1, 0xa3, 0xf5, 0x60, 0xd0, 0xf3, 0x75,
0x21, 0xe8, 0xf7, 0xc6, 0x0a, 0x94, 0xb9, 0xf4, 0x2a, 0xb9, 0xb8, 0x73, 0x38, 0xac, 0x9f, 0x99,
0xb3, 0x33, 0x18, 0x64, 0x6a, 0x70, 0x30, 0x68, 0x70, 0x78, 0xd6, 0x12, 0x15, 0x1a, 0x1e, 0x0a,
0x94, 0xfb, 0x15, 0x36, 0xf2, 0x5d, 0xb1, 0xbb, 0x58, 0xde, 0x25, 0x5b, 0x9b, 0xff, 0x8f, 0x09,
0x27, 0x1e, 0x4f, 0x4b, 0xc6, 0xac, 0xb2, 0x8c, 0x2f, 0x05, 0x7d, 0xaa, 0x3b, 0x65, 0xd4, 0x3a,
0xf5, 0xe1, 0xa7, 0xb8, 0xca, 0x64, 0x61, 0xd7, 0x27, 0x8b, 0x8e, 0x87, 0xbb, 0xbf, 0xc3, 0x7c,
0x37, 0x68, 0x3e, 0xc7, 0x5a, 0x35, 0x86, 0xb5, 0xf9, 0x48, 0x3f, 0x73, 0xa3, 0xda, 0x33, 0x57,
0x9f, 0x85, 0xa0, 0x39, 0x0b, 0xb9, 0x5f, 0xc3, 0x51, 0xa3, 0x13, 0x39, 0xd6, 0x44, 0x17, 0xbe,
0xd0, 0xcf, 0xaa, 0xc9, 0xfd, 0x19, 0x3e, 0xea, 0xee, 0x45, 0xce, 0x2e, 0x90, 0x34, 0x77, 0x49,
0xc1, 0x84, 0x4f, 0x14, 0x13, 0xba, 0xe1, 0x9e, 0xc4, 0xba, 0x57, 0xf0, 0xb4, 0x12, 0xc5, 0x7c,
0xad, 0xdf, 0xf4, 0xce, 0xc6, 0x96, 0xc4, 0x34, 0xab, 0xc4, 0x74, 0x61, 0x52, 0x39, 0x65, 0x71,
0x9d, 0xb3, 0x23, 0xb0, 0x16, 0xd7, 0x45, 0x02, 0xf8, 0xd3, 0x0d, 0xc1, 0xa9, 0x1c, 0xa4, 0xf8,
0x3b, 0x5f, 0x93, 0x10, 0xfc, 0x9f, 0xab, 0x53, 0x46, 0x62, 0x55, 0x23, 0xf9, 0x1d, 0x9e, 0x77,
0x9d, 0xa2, 0xb2, 0xda, 0x41, 0x89, 0x55, 0xd6, 0x66, 0x77, 0xd6, 0xb5, 0xb3, 0x2e, 0x81, 0x55,
0xb2, 0x2e, 0x6e, 0xe4, 0xe7, 0xcd, 0x1b, 0xd9, 0x31, 0xca, 0x97, 0xb7, 0xf1, 0x55, 0xad, 0xfa,
0x88, 0xd8, 0xe5, 0x46, 0x6e, 0x7c, 0x31, 0xbe, 0x43, 0x77, 0x69, 0xcb, 0xdd, 0x4b, 0xe8, 0xcb,
0x03, 0xd5, 0x4c, 0xd3, 0x11, 0x91, 0x02, 0xdc, 0xf6, 0xe9, 0x3f, 0xb7, 0x8b, 0xff, 0x02, 0x00,
0x00, 0xff, 0xff, 0x1f, 0x71, 0xc5, 0x0e, 0xcb, 0x0d, 0x00, 0x00,
0x6e, 0x5d, 0x7b, 0xba, 0x32, 0x72, 0x63, 0xaf, 0x3d, 0xa9, 0x36, 0x12, 0xef, 0xc0, 0x3d, 0xef,
0xc2, 0x3d, 0x0f, 0xc0, 0xa3, 0xf0, 0x00, 0xe8, 0x9c, 0x19, 0x7b, 0xfc, 0x97, 0x26, 0xe2, 0x82,
0x9b, 0x2a, 0x73, 0xe6, 0xf8, 0xfc, 0x7d, 0xdf, 0x7c, 0x33, 0x85, 0x49, 0x94, 0xe7, 0x2b, 0x7f,
0x19, 0xf0, 0xd3, 0x34, 0x4b, 0x44, 0xc2, 0x6c, 0xb1, 0x4e, 0x79, 0xee, 0xfe, 0xd3, 0x83, 0xe1,
0x42, 0xed, 0xb0, 0x17, 0x00, 0x85, 0xd7, 0x22, 0x74, 0x8c, 0xa9, 0x31, 0x1b, 0x79, 0x15, 0x0b,
0x73, 0x61, 0x5f, 0x24, 0xc2, 0x8f, 0xe7, 0x7e, 0x8c, 0x16, 0xc7, 0x9c, 0x1a, 0x33, 0xcb, 0xab,
0xd9, 0xd8, 0x14, 0xc6, 0x21, 0xbf, 0x15, 0x57, 0x3c, 0x8a, 0xa3, 0xe5, 0x5b, 0xc7, 0x22, 0x97,
0xaa, 0x89, 0x7d, 0x02, 0x47, 0x71, 0xf4, 0x6e, 0x15, 0x85, 0xbe, 0x88, 0x92, 0xa5, 0x87, 0x7f,
0x9d, 0xde, 0xd4, 0x98, 0x99, 0x5e, 0xcb, 0xce, 0x66, 0x70, 0x18, 0x24, 0x71, 0xec, 0x0b, 0x9e,
0xf9, 0xf1, 0x1b, 0x3f, 0x5e, 0x71, 0xc7, 0xa6, 0x88, 0x4d, 0x33, 0xfb, 0x10, 0x46, 0x98, 0x44,
0xfa, 0xf4, 0xc9, 0x47, 0x1b, 0xd8, 0x85, 0xac, 0xca, 0xe3, 0x41, 0x92, 0x85, 0xb9, 0x33, 0x98,
0x5a, 0xb3, 0xf1, 0xf9, 0x93, 0x53, 0x9a, 0xc1, 0xe9, 0x75, 0xb9, 0xe3, 0x55, 0xbd, 0xd8, 0xd7,
0x30, 0x89, 0x96, 0x0f, 0x7e, 0x1c, 0x85, 0xc5, 0x77, 0xc3, 0x4d, 0xdf, 0x35, 0x1c, 0xd9, 0x09,
0xf4, 0x73, 0xe1, 0x8b, 0x55, 0xee, 0x8c, 0xa6, 0xc6, 0xcc, 0xf6, 0xd4, 0x8a, 0x7d, 0x05, 0x27,
0x58, 0x75, 0x2e, 0x7e, 0xd0, 0x9d, 0xfe, 0x94, 0x45, 0x01, 0x77, 0x80, 0x26, 0xb0, 0x61, 0x17,
0xe3, 0xa5, 0x3c, 0x8b, 0x92, 0xd0, 0x19, 0x53, 0x6b, 0x6a, 0x45, 0xb3, 0xa4, 0x2f, 0xbe, 0x7d,
0x9f, 0x46, 0x19, 0x7f, 0x1d, 0xdd, 0x73, 0x67, 0x9f, 0x3c, 0x5a, 0x76, 0x44, 0x37, 0xc8, 0xb8,
0x2f, 0xa4, 0xd7, 0x01, 0x79, 0x55, 0x2c, 0xcc, 0x81, 0xc1, 0xad, 0x02, 0x76, 0x42, 0x9b, 0xc5,
0xb2, 0xe0, 0x05, 0xcf, 0x2e, 0xc3, 0x30, 0x73, 0x0e, 0x35, 0x2f, 0xa4, 0x85, 0x1d, 0x83, 0x1d,
0x2d, 0x43, 0xfe, 0xde, 0x39, 0xa2, 0xef, 0xe4, 0x82, 0x3d, 0x87, 0x61, 0x9a, 0xf1, 0x05, 0x6d,
0x3c, 0xa1, 0x8d, 0x72, 0xed, 0xfe, 0x65, 0x01, 0xe8, 0xf1, 0x21, 0x69, 0xfc, 0x20, 0x48, 0x56,
0x4b, 0x41, 0x19, 0x24, 0xf3, 0xaa, 0x26, 0x84, 0x37, 0x17, 0x7e, 0x26, 0xa8, 0x76, 0xc9, 0x3b,
0x6d, 0xe8, 0xa2, 0x89, 0xd5, 0x4d, 0x93, 0x9a, 0xa7, 0x9c, 0xbc, 0xe4, 0x5e, 0xd3, 0x5c, 0x27,
0x94, 0xdd, 0x24, 0x54, 0x9d, 0xc4, 0x32, 0x50, 0xbf, 0x45, 0xe2, 0x12, 0x3c, 0x45, 0x86, 0x41,
0x8d, 0x0c, 0x1f, 0xc3, 0x41, 0xe1, 0x2b, 0x31, 0x19, 0x52, 0x96, 0xba, 0x11, 0x87, 0xcf, 0x35,
0xb8, 0x23, 0x09, 0x9b, 0xb6, 0x60, 0x9d, 0x69, 0xc6, 0x7f, 0x96, 0x09, 0x80, 0x12, 0x68, 0x03,
0xe6, 0xc6, 0xa2, 0x17, 0x92, 0x38, 0x23, 0x4f, 0xad, 0xd0, 0x8e, 0x00, 0x2e, 0x42, 0xa2, 0xcb,
0xc8, 0x53, 0x2b, 0x0d, 0xe5, 0xc1, 0x26, 0x28, 0x27, 0x0d, 0x28, 0xdf, 0x80, 0x53, 0x08, 0xc8,
0x65, 0x9e, 0x73, 0x41, 0x3d, 0x2b, 0x5c, 0x5f, 0x00, 0x64, 0xf4, 0x8b, 0x6a, 0x37, 0x64, 0xed,
0xda, 0x82, 0x71, 0x6f, 0xc5, 0x5a, 0x4e, 0xcf, 0xa4, 0xe9, 0x95, 0x6b, 0xf7, 0x4f, 0x13, 0x26,
0x65, 0xe0, 0x00, 0xa7, 0xc9, 0xce, 0xa0, 0x2f, 0xf9, 0x4a, 0xa1, 0xc6, 0xe7, 0xcf, 0xd4, 0x41,
0x2c, 0xdc, 0xae, 0x68, 0xf3, 0x66, 0xcf, 0x53, 0x6e, 0xec, 0x25, 0xf4, 0xb0, 0x5f, 0x8a, 0x3d,
0x3e, 0x7f, 0xda, 0x70, 0x47, 0x02, 0xde, 0xec, 0x79, 0xe4, 0xc2, 0x3e, 0x03, 0x3b, 0xe3, 0xa9,
0xbf, 0x26, 0xe2, 0x8c, 0xcf, 0x8f, 0x1b, 0xbe, 0x1e, 0xee, 0xdd, 0xec, 0x79, 0xd2, 0x09, 0x03,
0xdf, 0x71, 0x1e, 0x12, 0x77, 0xda, 0x81, 0xbf, 0xe3, 0x3c, 0xc4, 0xc0, 0xe8, 0x82, 0x81, 0x83,
0x38, 0xc9, 0x25, 0x87, 0xda, 0x81, 0xaf, 0x70, 0x0f, 0x03, 0x93, 0x13, 0xb6, 0x78, 0xef, 0x2f,
0xfd, 0xb7, 0x92, 0x4d, 0xed, 0x16, 0x5f, 0xd1, 0x26, 0xb6, 0x28, 0xdd, 0xd8, 0x04, 0x4c, 0xb1,
0x56, 0xb8, 0x9b, 0x62, 0x3d, 0x1f, 0x80, 0xfd, 0x80, 0x0c, 0x75, 0x3f, 0xd7, 0xe3, 0x93, 0x1f,
0x21, 0x1a, 0xf9, 0x2a, 0x95, 0x67, 0x36, 0x77, 0x8c, 0xa9, 0x85, 0xc7, 0x58, 0x5b, 0xdc, 0x3f,
0x0c, 0xfd, 0x89, 0x1c, 0x65, 0x4b, 0xf1, 0x8d, 0xed, 0x8a, 0x6f, 0xee, 0xa6, 0xf8, 0xd6, 0x06,
0xc5, 0xd7, 0x4a, 0xd7, 0xab, 0x2a, 0x9d, 0x7b, 0x0d, 0xfb, 0x55, 0xdc, 0xb6, 0xde, 0x55, 0xc7,
0x6a, 0x0e, 0xaa, 0x1e, 0x35, 0x94, 0xef, 0xe1, 0xa0, 0x86, 0xe8, 0xd6, 0x30, 0xfa, 0xfc, 0x98,
0xd5, 0xf3, 0xe3, 0xfe, 0xa2, 0xcb, 0x41, 0xb4, 0x91, 0xc9, 0x28, 0x20, 0xaf, 0xd7, 0xa9, 0x1c,
0x92, 0xed, 0x95, 0x6b, 0x2c, 0x25, 0x55, 0x14, 0xb7, 0x66, 0xa6, 0x27, 0x17, 0x18, 0xf9, 0x21,
0x89, 0x57, 0xf7, 0x28, 0x55, 0x16, 0x36, 0x2a, 0x57, 0xee, 0x99, 0x2e, 0x91, 0xb8, 0xb1, 0xad,
0x44, 0xf7, 0x77, 0x13, 0x0e, 0x3d, 0x1e, 0xf0, 0x28, 0x15, 0x3b, 0xdf, 0xe4, 0x0d, 0xc1, 0x35,
0xdb, 0x82, 0xab, 0x1b, 0xb7, 0x9a, 0xc2, 0xa1, 0xc4, 0xac, 0x57, 0x13, 0xb3, 0x9a, 0x0c, 0xd9,
0x4d, 0x19, 0x2a, 0x65, 0xa5, 0xbf, 0x49, 0x56, 0x06, 0x75, 0x59, 0x69, 0x48, 0xc7, 0xf0, 0x51,
0xe9, 0x18, 0x35, 0xa4, 0x23, 0xd3, 0x3c, 0xd6, 0x42, 0xf4, 0xe8, 0x3c, 0x18, 0xf4, 0x7c, 0x3d,
0x08, 0xfa, 0xbd, 0x71, 0x02, 0x65, 0x2f, 0xbd, 0x4a, 0x2f, 0xee, 0x1c, 0x0e, 0xeb, 0x39, 0x73,
0x76, 0x06, 0x83, 0x4c, 0x3d, 0x1c, 0x0c, 0x7a, 0x38, 0x3c, 0x6b, 0x89, 0x0a, 0x3d, 0x1e, 0x0a,
0x2f, 0xf7, 0x0b, 0x04, 0xf2, 0x5d, 0xb1, 0xbb, 0x58, 0xde, 0x25, 0x5b, 0xc1, 0xff, 0xdb, 0x84,
0x13, 0x8f, 0xa7, 0x25, 0x63, 0x56, 0x59, 0xc6, 0x97, 0x82, 0x3e, 0xd5, 0x48, 0x19, 0x35, 0xa4,
0xfe, 0xff, 0x57, 0x5c, 0xe5, 0x65, 0x61, 0xd7, 0x5f, 0x16, 0x1d, 0x17, 0x77, 0x7f, 0x87, 0xf7,
0xdd, 0xa0, 0x79, 0x1d, 0x6b, 0xd5, 0x18, 0xd6, 0xde, 0x47, 0xfa, 0x9a, 0x1b, 0xd5, 0xae, 0xb9,
0xfa, 0x5b, 0x08, 0x9a, 0x6f, 0x21, 0xf7, 0x4b, 0x38, 0x6a, 0x20, 0x91, 0xe3, 0x4c, 0xf4, 0xe0,
0x0b, 0xfd, 0xac, 0x9a, 0xdc, 0x1f, 0xe1, 0x83, 0x6e, 0x2c, 0x72, 0x76, 0x81, 0xa4, 0xb9, 0x4b,
0x0a, 0x26, 0x7c, 0xa4, 0x98, 0xd0, 0xed, 0xee, 0x49, 0x5f, 0xf7, 0x0a, 0x9e, 0x56, 0xaa, 0x98,
0xaf, 0xf5, 0x9d, 0xde, 0x09, 0x6c, 0x49, 0x4c, 0xb3, 0x4a, 0x4c, 0x17, 0x26, 0x95, 0x2c, 0x8b,
0xeb, 0x9c, 0x1d, 0x81, 0xb5, 0xb8, 0x2e, 0x1a, 0xc0, 0x9f, 0xee, 0x6f, 0xe0, 0x54, 0x12, 0x29,
0xfe, 0xce, 0xd7, 0x24, 0x04, 0xff, 0xf1, 0xe8, 0xa8, 0x0a, 0xad, 0xee, 0x0a, 0x6b, 0x47, 0xe7,
0x57, 0x78, 0xde, 0x95, 0x5d, 0x75, 0xbb, 0x83, 0x42, 0xab, 0x5c, 0x66, 0x77, 0x2e, 0xab, 0x9a,
0xeb, 0x12, 0x58, 0x65, 0x1a, 0xc5, 0x49, 0xfd, 0xb4, 0x79, 0x52, 0x3b, 0x9e, 0xf8, 0xe5, 0x29,
0x7d, 0x55, 0x43, 0x05, 0x3d, 0x76, 0x39, 0xa9, 0x1b, 0x6f, 0x92, 0x6f, 0x30, 0x5c, 0xda, 0x0a,
0xf7, 0x12, 0xfa, 0x32, 0xa1, 0x7a, 0xeb, 0x74, 0x54, 0xa4, 0x1c, 0x6e, 0xfb, 0xf4, 0x1f, 0xdd,
0xc5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4d, 0xdb, 0xe0, 0x88, 0xe3, 0x0d, 0x00, 0x00,
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment