|
|
@@ -23,14 +23,26 @@ func NewStructValuePBByBytes(v []byte) *structpb.Value {
|
|
|
return s
|
|
|
}
|
|
|
|
|
|
-//UnMarshalPBValue obj为指针对象
|
|
|
+func NewStructPB(v interface{}) *structpb.Struct {
|
|
|
+ s := new(structpb.Struct)
|
|
|
+ s.UnmarshalJSON(MarshalJSON(v))
|
|
|
+ return s
|
|
|
+}
|
|
|
+
|
|
|
+func NewStructPBByBytes(v []byte) *structpb.Struct {
|
|
|
+ s := new(structpb.Struct)
|
|
|
+ s.UnmarshalJSON(v)
|
|
|
+ return s
|
|
|
+}
|
|
|
+
|
|
|
+// UnMarshalPBValue obj为指针对象
|
|
|
func UnMarshalPBValue(v *structpb.Value, obj interface{}) error {
|
|
|
j, err := v.MarshalJSON()
|
|
|
err = json.Unmarshal(j, obj)
|
|
|
return err
|
|
|
}
|
|
|
|
|
|
-//UnMarshalPBStruct obj为指针对象
|
|
|
+// UnMarshalPBStruct obj为指针对象
|
|
|
func UnMarshalPBStruct(v *structpb.Struct, obj interface{}) error {
|
|
|
j, err := v.MarshalJSON()
|
|
|
err = json.Unmarshal(j, obj)
|