diff --git a/Proto.lock b/Proto.lock index e6ff1025f5a2047ce285bd46811ade4a8ac0c264..d425f7ac32a9e5988f6ceeb75d1f15a06875d71c 100644 --- a/Proto.lock +++ b/Proto.lock @@ -2,10 +2,10 @@ version = 1 [[packages]] name = "g-hq-orchestrator-hera" -digest = "sha256:c1b5bdee50369721d71f43d20f411e5ea082629a08cc3f07d75ebbd170e07fc6" +digest = "sha256:953753189430df426a8edbf6969caff717603738e9580702aa549ee262ff3a20" registry = "https://jfrog.downtown8.com/artifactory" repository = "protobuf" -version = "0.0.30" +version = "0.0.31" dependencies = [] dependants = 1 diff --git a/internal/handler/brand_store/brand_store_device.go b/internal/handler/brand_store/brand_store_device.go index f3a4e2160bf59c92956964055b3037cf34c83dc1..05eff00470842d169d13b38400738ce94ce9552d 100644 --- a/internal/handler/brand_store/brand_store_device.go +++ b/internal/handler/brand_store/brand_store_device.go @@ -15,7 +15,7 @@ func (b *BrandService) BindDevice(ctx context.Context, req *hqStoredevice.BindDe r, err := b.rpcClient.BrandStoreCenter.BindDevice(ctx, &storedevice.BindDeviceRequest{ DeviceNo: req.GetDeviceNo(), DeviceId: req.GetDeviceId(), - DeviceType: req.GetDeviceType(), + DeviceType: "hq-public", }) if err != nil { return &hqBrandStoreCenter.BindDeviceResponse{ diff --git a/kitex_gen/hqStoredevice/hq_store_device.pb.fast.go b/kitex_gen/hqStoredevice/hq_store_device.pb.fast.go index f010eacdf6df11b3577c6e506abbf660075178d1..366f1d878bd434d8930e1abf76fef8ba0836fe50 100644 --- a/kitex_gen/hqStoredevice/hq_store_device.pb.fast.go +++ b/kitex_gen/hqStoredevice/hq_store_device.pb.fast.go @@ -24,11 +24,6 @@ func (x *BindDeviceRequest) FastRead(buf []byte, _type int8, number int32) (offs if err != nil { goto ReadFieldError } - case 3: - offset, err = x.fastReadField3(buf, _type) - if err != nil { - goto ReadFieldError - } default: offset, err = fastpb.Skip(buf, _type, number) if err != nil { @@ -52,11 +47,6 @@ func (x *BindDeviceRequest) fastReadField2(buf []byte, _type int8) (offset int, return offset, err } -func (x *BindDeviceRequest) fastReadField3(buf []byte, _type int8) (offset int, err error) { - x.DeviceType, offset, err = fastpb.ReadString(buf, _type) - return offset, err -} - func (x *BindDeviceResponse) FastRead(buf []byte, _type int8, number int32) (offset int, err error) { switch number { case 1: @@ -2063,7 +2053,6 @@ func (x *BindDeviceRequest) FastWrite(buf []byte) (offset int) { } offset += x.fastWriteField1(buf[offset:]) offset += x.fastWriteField2(buf[offset:]) - offset += x.fastWriteField3(buf[offset:]) return offset } @@ -2083,14 +2072,6 @@ func (x *BindDeviceRequest) fastWriteField2(buf []byte) (offset int) { return offset } -func (x *BindDeviceRequest) fastWriteField3(buf []byte) (offset int) { - if x.DeviceType == "" { - return offset - } - offset += fastpb.WriteString(buf[offset:], 3, x.GetDeviceType()) - return offset -} - func (x *BindDeviceResponse) FastWrite(buf []byte) (offset int) { if x == nil { return offset @@ -3570,7 +3551,6 @@ func (x *BindDeviceRequest) Size() (n int) { } n += x.sizeField1() n += x.sizeField2() - n += x.sizeField3() return n } @@ -3590,14 +3570,6 @@ func (x *BindDeviceRequest) sizeField2() (n int) { return n } -func (x *BindDeviceRequest) sizeField3() (n int) { - if x.DeviceType == "" { - return n - } - n += fastpb.SizeString(3, x.GetDeviceType()) - return n -} - func (x *BindDeviceResponse) Size() (n int) { if x == nil { return n @@ -5074,7 +5046,6 @@ func (x *BindJPushIdResponse) sizeField2() (n int) { var fieldIDToName_BindDeviceRequest = map[int32]string{ 1: "DeviceNo", 2: "DeviceId", - 3: "DeviceType", } var fieldIDToName_BindDeviceResponse = map[int32]string{ diff --git a/kitex_gen/hqStoredevice/hq_store_device.pb.go b/kitex_gen/hqStoredevice/hq_store_device.pb.go index 9d282c8e3ebccb2bea6562d66feed91db1bc1c4c..238acece16b3b6789242fe396e7081d2ef64ef22 100644 --- a/kitex_gen/hqStoredevice/hq_store_device.pb.go +++ b/kitex_gen/hqStoredevice/hq_store_device.pb.go @@ -26,9 +26,8 @@ type BindDeviceRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - DeviceNo string `protobuf:"bytes,1,opt,name=deviceNo,proto3" json:"deviceNo,omitempty"` // 设备ç - DeviceId string `protobuf:"bytes,2,opt,name=deviceId,proto3" json:"deviceId,omitempty"` // 设备id - DeviceType string `protobuf:"bytes,3,opt,name=deviceType,proto3" json:"deviceType,omitempty"` // 设备类型 + DeviceNo string `protobuf:"bytes,1,opt,name=deviceNo,proto3" json:"deviceNo,omitempty"` // 设备ç + DeviceId string `protobuf:"bytes,2,opt,name=deviceId,proto3" json:"deviceId,omitempty"` // 设备id } func (x *BindDeviceRequest) Reset() { @@ -77,13 +76,6 @@ func (x *BindDeviceRequest) GetDeviceId() string { return "" } -func (x *BindDeviceRequest) GetDeviceType() string { - if x != nil { - return x.DeviceType - } - return "" -} - type BindDeviceResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2573,14 +2565,12 @@ var File_hq_store_device_proto protoreflect.FileDescriptor var file_hq_store_device_proto_rawDesc = []byte{ 0x0a, 0x15, 0x68, 0x71, 0x5f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x5f, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x68, 0x71, 0x53, 0x74, 0x6f, 0x72, 0x65, - 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x6b, 0x0a, 0x11, 0x42, 0x69, 0x6e, 0x64, 0x44, 0x65, + 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x22, 0x4b, 0x0a, 0x11, 0x42, 0x69, 0x6e, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x64, 0x65, 0x76, 0x69, 0x63, - 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x54, 0x79, 0x70, - 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x65, 0x76, 0x69, 0x63, 0x65, 0x54, - 0x79, 0x70, 0x65, 0x22, 0x75, 0x0a, 0x12, 0x42, 0x69, 0x6e, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, + 0x65, 0x49, 0x64, 0x22, 0x75, 0x0a, 0x12, 0x42, 0x69, 0x6e, 0x64, 0x44, 0x65, 0x76, 0x69, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, diff --git a/proto.toml b/proto.toml index 8699629d7a3e84359d4fdc60230d712b6a2b2c83..82e801d1d8108f1e7a9a14a5ac918b41a38b1e12 100644 --- a/proto.toml +++ b/proto.toml @@ -2,7 +2,7 @@ edition = "0.9" [dependencies.g-hq-orchestrator-hera] -version = "=0.0.30" +version = "=0.0.31" repository = "protobuf" registry = "https://jfrog.downtown8.com/artifactory"