test/dgiot
1
0
Fork 0
mirror of https://gitee.com/dgiiot/dgiot.git synced 2024-11-29 18:57:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:dgiot/dgiot

Browse Source
This commit is contained in:
dawnwinterLiu 2024-09-03 10:52:15 +08:00
commit e48d1f812e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/dgiot/src/utils/dgiot_json.erl
View File

@ -55,7 +55,13 @@ encode(Term) ->
-spec(encode(json_term(), encode_options()) -> json_text()).
encode(Term, Opts) ->
to_binary(jiffy:encode(to_ejson(Term), Opts)).
case os:type() of
{win32,nt} ->
%% io:format("~s ~p ~p ~p ~n",[?FILE, ?LINE,Term,Opts]),
to_binary(jsx:encode(Term));
_ ->
to_binary(jiffy:encode(to_ejson(Term), Opts))
end.
-spec(safe_encode(json_term())
-> {ok, json_text()} | {error, Reason :: term()}).
@ -77,7 +83,13 @@ decode(Json) -> decode(Json, [return_maps]).
-spec(decode(json_text(), decode_options()) -> json_term()).
decode(Json, Opts) ->
from_ejson(jiffy:decode(Json, Opts)).
case os:type() of
{win32,nt} ->
%% io:format("~s ~p ~p ~p ~n",[?FILE, ?LINE,Json,Opts]),
from_ejson(jsx:decode(Json, Opts));
_ ->
from_ejson(jiffy:decode(Json, Opts))
end.
-spec(safe_decode(json_text())
-> {ok, json_term()} | {error, Reason :: term()}).

1
apps/dgiot_atomgit

@ -1 +0,0 @@
Subproject commit 6b224f6f77eab84e2dc7d0d912780b6d132f4f0b