From dccc1ca1304dc1fcb86c8e24edd491509269b3e7 Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期日, 29 一月 2023 14:44:52 +0800
Subject: [PATCH] 解决编译告警
---
util.cpp | 207 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 141 insertions(+), 66 deletions(-)
diff --git a/util.cpp b/util.cpp
index d823797..dcfa0eb 100644
--- a/util.cpp
+++ b/util.cpp
@@ -32,7 +32,7 @@
bool proto_to_json(const google::protobuf::Message &message, std::string &json) {
google::protobuf::util::JsonPrintOptions options;
- options.add_whitespace = true;
+ options.add_whitespace = false;
options.always_print_primitive_fields = true;
options.preserve_proto_field_names = true;
@@ -52,6 +52,103 @@
yyjson_mut_doc_free(doc);
return json;
+}
+
+char *make_get_request(const char *topic, std::map<string, string> &query_params) {
+ yyjson_mut_doc *doc = yyjson_mut_doc_new(NULL);
+ yyjson_mut_val *root = yyjson_mut_obj(doc);
+ yyjson_mut_obj_add_strn(doc, root, "path", topic, strlen(topic));
+ yyjson_mut_obj_add_strn(doc, root, "method", "GET", 3);
+
+ // 濉厖璇锋眰鍙傛暟
+ if (!query_params.empty()) {
+ yyjson_mut_val *query_map = yyjson_mut_obj(doc);
+
+ // std::map<string, string> t_map = *query_params;
+ std::map<string, string>::iterator iter;
+ for (iter = query_params.begin(); iter != query_params.end(); iter++) {
+ yyjson_mut_val *_key = yyjson_mut_str(doc, iter->first.c_str());
+
+ yyjson_mut_val *param = yyjson_mut_arr(doc);
+ yyjson_mut_val *_val = yyjson_mut_str(doc, iter->second.c_str());
+ yyjson_mut_arr_append(param, _val);
+
+ yyjson_mut_obj_add(query_map, _key, param);
+ }
+
+ yyjson_mut_val *query_map_key = yyjson_mut_str(doc, "queryMap");
+ yyjson_mut_obj_add(root, query_map_key, query_map);
+ }
+
+ yyjson_mut_doc_set_root(doc, root);
+
+ size_t jsonl = 0;
+ char *json = yyjson_mut_val_write(root, 0, &jsonl);
+
+ yyjson_mut_doc_free(doc);
+
+ return json;
+}
+
+extern "C" int bus_dbapi_get_json_data_by_key(const char *json, const char *flag_key, const char *data_key, char **pptr_data, yyjson_type *ptr_type) {
+ int ret = -1;
+ size_t data_len = 0;
+ const char *ptr_value = NULL;
+ const char *success_name = flag_key;
+ const char *data_name = data_key;
+ const char *msg_name = "msg";
+
+ if (NULL == *pptr_data) {
+ return -1;
+ }
+
+ // Read JSON and get root
+ yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
+ yyjson_val *root = yyjson_doc_get_root(doc);
+
+ if (NULL != success_name) {
+ // Get root["success"]
+ yyjson_val *success = yyjson_obj_get(root, success_name);
+
+ int success_val = yyjson_get_bool(success);
+ printf("success: %d\n", success_val);
+ if (!success_val) {
+ yyjson_doc_free(doc);
+ return -1;
+ }
+ }
+
+ // Get root["msg"]
+ //yyjson_val *msg = yyjson_obj_get(root, "msg");
+ yyjson_val *msg = yyjson_obj_get(root, "msg");
+ printf("msg: %s\n", yyjson_get_str(msg));
+
+ // Get root["data"]
+ //yyjson_val *msg = yyjson_obj_get(root, "data");
+ yyjson_val *data;
+ if ( NULL != data_name )
+ {
+ data = yyjson_obj_get(root, data_name);
+ }
+ else
+ {
+ data = root;
+ }
+
+
+ *ptr_type = yyjson_get_type(data);
+ ptr_value = yyjson_val_write(data, YYJSON_WRITE_NOFLAG, &data_len);
+ printf("%s: %s\n", data_name, ptr_value);
+ printf("len: %lu\n", data_len);
+
+ memcpy(*pptr_data, ptr_value, data_len);
+ ret = 0;
+
+ // Free the doc
+ yyjson_doc_free(doc);
+
+ // All functions accept NULL input, and return NULL on error.
+ return ret;
}
extern "C" int bus_dbapi_get_json_data(const char *json, char **pptr_data, yyjson_type *ptr_type) {
@@ -89,57 +186,38 @@
"msg": "",
"success": true
}*/
- int ret = -1;
- size_t data_len = 0;
- const char *ptr_value = NULL;
const char *success_name = "success";
- const char *msg_name = "msg";
+ const char *data_name = "data";
if (NULL == *pptr_data) {
return -1;
}
- // Read JSON and get root
- yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
- yyjson_val *root = yyjson_doc_get_root(doc);
-
- // Get root["success"]
- yyjson_val *success = yyjson_obj_get(root, success_name);
-
- int success_val = yyjson_get_bool(success);
- printf("success: %d\n", success_val);
- if (!success_val) {
- yyjson_doc_free(doc);
- return -1;
- }
-
- // Get root["msg"]
- // yyjson_val *msg = yyjson_obj_get(root, "msg");
- yyjson_val *msg = yyjson_obj_get(root, "msg");
- printf("msg: %s\n", yyjson_get_str(msg));
-
- // Get root["data"]
- // yyjson_val *msg = yyjson_obj_get(root, "data");
- yyjson_val *data = yyjson_obj_get(root, "data");
-
- *ptr_type = yyjson_get_type(data);
- ptr_value = yyjson_val_write(data, YYJSON_WRITE_NOFLAG, &data_len);
- printf("data: %s\n", ptr_value);
- printf("len: %lu\n", data_len);
-
- memcpy(*pptr_data, ptr_value, data_len);
- ret = 0;
-
- // Free the doc
- yyjson_doc_free(doc);
-
// All functions accept NULL input, and return NULL on error.
- return ret;
+ return bus_dbapi_get_json_data_by_key(json, success_name, data_name, pptr_data, ptr_type);
}
bool bus_dbapi_get_topic_data(void *handle, const char *topic, crepmsg **pptr_repmsg, size_t len) {
const auto topicl = strlen(topic);
auto reqData = make_get_request(topic);
+ auto reqmsg = make_req_msg(topic, topicl, reqData, strlen(reqData));
+
+ if (bus_client_request(handle, reqmsg, pptr_repmsg)) {
+ printf("======>> bus_client_reqest [%s] get [%s]\n", topic, (*pptr_repmsg)->data);
+ } else {
+ free(reqData);
+ return false;
+ }
+
+ len = strlen((*pptr_repmsg)->data) + 1;
+
+ free(reqData);
+ return true;
+}
+
+bool bus_dbapi_get_topic_data(void *handle, const char *topic, crepmsg **pptr_repmsg, size_t len, std::map<string, string> ¶ms) {
+ const auto topicl = strlen(topic);
+ auto reqData = make_get_request(topic, params);
auto reqmsg = make_req_msg(topic, topicl, reqData, strlen(reqData));
if (bus_client_request(handle, reqmsg, pptr_repmsg)) {
@@ -247,36 +325,33 @@
淇敼鍐呭 : 鏂扮敓鎴愬嚱鏁�
*****************************************************************************/
-int get_value_by_key(char *json, const char *key, char **pptr_data)
-{
+int get_value_by_key(char *json, const char *key, char **pptr_data) {
size_t data_len = 0;
-
+
// Read JSON and get root
- yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
- yyjson_val *root = yyjson_doc_get_root(doc);
-
- // Get root[key]
- yyjson_val *val = yyjson_obj_get(root, key);
-
- char * val_str = (char *)yyjson_get_str(val);
- printf("val: %s\n", val_str);
- if(NULL == val_str)
- {
- yyjson_doc_free(doc);
- return -1;
- }
+ yyjson_doc *doc = yyjson_read(json, strlen(json), 0);
+ yyjson_val *root = yyjson_doc_get_root(doc);
+ // Get root[key]
+ yyjson_val *val = yyjson_obj_get(root, key);
- char *ptr_value = yyjson_val_write(val, YYJSON_WRITE_NOFLAG, &data_len);
- printf("data: %s\n", ptr_value);
- printf("len: %lu\n", data_len);
+ char *val_str = (char *)yyjson_get_str(val);
+ printf("val: %s\n", val_str);
+ if (NULL == val_str) {
+ yyjson_doc_free(doc);
+ return -1;
+ }
- *pptr_data = (char *)malloc(data_len);
- memset(*pptr_data, 0, data_len);
- memcpy(*pptr_data, ptr_value, data_len);
-
- // Free the doc
- yyjson_doc_free(doc);
+ char *ptr_value = yyjson_val_write(val, YYJSON_WRITE_NOFLAG, &data_len);
+ printf("data: %s\n", ptr_value);
+ printf("len: %lu\n", data_len);
- return 0;
+ *pptr_data = (char *)malloc(data_len);
+ memset(*pptr_data, 0, data_len);
+ memcpy(*pptr_data, ptr_value, data_len);
+
+ // Free the doc
+ yyjson_doc_free(doc);
+
+ return 0;
}
--
Gitblit v1.8.0