go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-01-14 02:33:03 +02:00
Code Issues Releases Activity

Added ability to configure protojson (#1993)

Browse Source
This commit is contained in:
JinChang 2022-05-20 09:10:13 +08:00 committed by GitHub
parent c9f95dc2e8
commit 912abb4848
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/value.go
View File

@ -1,15 +1,16 @@
package config
import (
"encoding/json"
stdjson "encoding/json"
"fmt"
"reflect"
"strconv"
"sync/atomic"
"time"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
"github.com/go-kratos/kratos/v2/encoding/json"
)
var (
@ -128,14 +129,14 @@ func (v *atomicValue) Duration() (time.Duration, error) {
}
func (v *atomicValue) Scan(obj interface{}) error {
data, err := json.Marshal(v.Load())
data, err := stdjson.Marshal(v.Load())
if err != nil {
return err
}
if pb, ok := obj.(proto.Message); ok {
return protojson.Unmarshal(data, pb)
return json.UnmarshalOptions.Unmarshal(data, pb)
}
return json.Unmarshal(data, obj)
return stdjson.Unmarshal(data, obj)
}
type errValue struct {