server_common/f8
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2022-03-31 14:05:16 +08:00
parent 28b0153ca7
commit 3390412e54
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpp/utils.cc
View File

@ -9,7 +9,10 @@
#include <a8/mutable_xobject.h> #include <a8/mutable_xobject.h>
#include <google/protobuf/message.h> #include <google/protobuf/message.h>
#include <google/protobuf/stubs/common.h>
#if GOOGLE_PROTOBUF_VERSION > 2005000
#include <google/protobuf/util/json_util.h> #include <google/protobuf/util/json_util.h>
#endif
#include "framework/cpp/utils.h" #include "framework/cpp/utils.h"
@ -535,11 +538,15 @@ namespace f8
std::string PbToJson(google::protobuf::Message* pbmsg) std::string PbToJson(google::protobuf::Message* pbmsg)
{ {
std::string json; std::string json;
#if GOOGLE_PROTOBUF_VERSION > 2005000
google::protobuf::util::JsonPrintOptions options; google::protobuf::util::JsonPrintOptions options;
options.add_whitespace = true; options.add_whitespace = true;
options.always_print_primitive_fields = true; options.always_print_primitive_fields = true;
options.preserve_proto_field_names = true; options.preserve_proto_field_names = true;
MessageToJsonString(*pbmsg, &json, options).ok(); MessageToJsonString(*pbmsg, &json, options).ok();
#else
json = "{}";
#endif
return json; return json;
} }