!2 add test logs to all upload logs

Framework/RvcLogSdk/baseFun.cpp

@@ -98,6 +98,7 @@ int RvcLogSdkManager::SendTestLog_loki(const char* app, const char* env, const c
     auto send_loki = [](std::string jsonReq)
     {
         HttpClientRequestConfig sendErr(HttpRequestMethod::POST, "http://99.12.23.49:3100/loki/api/v1/push");
+        sendErr.setWithToken(false);
         HttpClientResponseResult curResult;
 
         sendErr.SetJsonBody(jsonReq.c_str());

Framework/RvcLogSdk/log_api.cpp

@@ -9,6 +9,7 @@
 #include "sds.h"
 #include "inner_log.h"
 #include "baseFun.h"
+#include <log_producer_client.h>
 
 
 //#define GBK_COMPACT
@@ -441,6 +442,12 @@ post_log_result* post_logs(const char* endpoint, const char* accesskeyId, const
         if(buffer->data != NULL && buffer->length != 0)
 			res = LOG_OS_HttpPost(url, header_array, header_count, (const void *) buffer->data, buffer->length, channelId, token, terminalno, reserve1);
 
+		for (auto i = 0; i < buffer->n_logs; i++)
+		{
+			std::string dstLog = std::string(buffer->uuid[i]) + " post_logs";
+			log_producer_sendTestLog_loki("RVCLogSDK", buffer->uuid[i], dstLog.c_str());
+		}
+		
         result->statusCode = res;
 
         cur_slist_free_all(headers); /* free the list again */

Framework/RvcLogSdk/log_builder.cpp

@@ -254,7 +254,7 @@ int add_log(log_group_builder* bder, long start_time, uint32_t pack_index, log_i
     
     memset(bder->grp->logs[bder->grp->n_logs].uuid, 0, MAX_UUID_LEN);
     get_format_uuid(bder->grp->logs[bder->grp->n_logs].uuid, MAX_UUID_LEN);
-    std::string dstLog = std::to_string(pack_index) + " add_log";
+    std::string dstLog = std::to_string(pack_index) + " add_log " + std::string(bder->grp->logs[bder->grp->n_logs].uuid);
     log_producer_sendTestLog_loki("RVCLogSDK", bder->grp->logs[bder->grp->n_logs].uuid, dstLog.c_str());
     now = record_time;
 
@@ -1007,4 +1007,6 @@ void serialize_to_buf(build_item* log, serialize_buf* buf) {
     memcpy(buf->uuid, log->uuid, MAX_UUID_LEN);
     buf->buffer_len = log->buffer_len;
     memcpy(buf->buffer, log->buffer, log->buffer_len > sizeof(buf->buffer) - 1 ? sizeof(buf->buffer) - 1 : log->buffer_len);
+    std::string dstLog = std::string(buf->uuid) + " flush_log serialize_to_buf";
+    log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
 }

Framework/RvcLogSdk/log_db.cpp

@@ -22,6 +22,7 @@
 #include "base64_openssl.h"
 #include <chrono>
 #include "baseFun.h"
+#include <log_producer_client.h>
 
 #ifndef _WIN32
 
@@ -294,6 +295,7 @@ int db_insert_group(log_db_manager* manager, log_group_builder* builder) {
 		memset(&buf, 0, sizeof(serialize_buf));
 		serialize_to_buf(&builder->grp->logs[i], &buf);
 		ret = db_insert_one(manager, &buf);
+		
 	}
 	return ret;
 }
@@ -390,6 +392,8 @@ int db_insert_one(log_db_manager* manager, serialize_buf* buf) {
 			append(strLevel).append(",").append(strType).append(",'").
 			append((char*)output_str_data).append("',").append(strEncrypt).append(",0)");
 
+		std::string dstLog = std::string(buf->uuid) + " db_insert_one encrypt2";
+		log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
 		if(compress_str_data)
 			free(compress_str_data);
 		if(output_data)
@@ -430,7 +434,9 @@ int db_insert_one(log_db_manager* manager, serialize_buf* buf) {
 		if(decoded_bytes)
 			free(decoded_bytes);
 		*/
-			
+		
+		std::string dstLog = std::string(buf->uuid) + " db_insert_one encrypt3";
+		log_producer_sendTestLog_loki("RVCLogSDK", buf->uuid, dstLog.c_str());
 
 		strSql.append(manager->table_name).append("(" + COLUMN_DateTime +
 			"," + COLUMN_Uuid + "," + COLUMN_Level + "," + COLUMN_Type + "," + COLUMN_Content + "," + COLUMN_Encrypt + "," + COLUMN_Status +

Framework/RvcRestfulSdk/RestfulFunc.h

@@ -156,6 +156,10 @@ struct HttpClientRequestConfig
     uint32_t GetTimeout() const { return mTimeoutSecs; }
     bool getToken(std::string& t_channelId, std::string& t_token, std::string& terminalNo, std::string& reserve1) const;
 
+    void setWithToken(bool t_withToken) {
+        m_withToken = t_withToken;
+    }
+
     virtual void PreDo() {}
     virtual void PostDo() {}
 

Framework/RvcRestfulSdk/RestfulFuncImpl.cpp

@@ -11,7 +11,7 @@ using namespace web;                        // Common features like URIs.
 using namespace web::http;                  // Common HTTP functionality
 using namespace web::http::client;          // HTTP client features
 
-GetRestfulTokenCallBack g_tokenCall = NULL;
+volatile GetRestfulTokenCallBack g_tokenCall = nullptr;
 RVCRESTFULSDK_API void SetRestfulTokenCallBack(GetRestfulTokenCallBack t_callBack)
 {
     g_tokenCall = t_callBack;
@@ -35,7 +35,10 @@ RestfulClient::~RestfulClient()
 
 
 bool HttpClientRequestConfig::getToken(std::string& t_channelId, std::string& t_token, std::string& terminalNo, std::string& reserve1) const {
-    if (m_withToken && g_tokenCall != NULL)
+    if (g_tokenCall == nullptr)
+        return false;
+    
+    if (m_withToken)
     {
         g_tokenCall(t_channelId, t_token, terminalNo, reserve1);
         if (t_channelId.length() > 0 && t_token.length() > 0)

Framework/spbase/SpSecureClient.cpp

@@ -25,8 +25,10 @@ void getHttpToken(std::string &channelId, std::string &token, std::string &termi
 	CSimpleString t_channelId, t_token;
 	CSystemStaticInfo info;
 	
-	if (SpSecureClient::m_pEntity == NULL ||
-		SpSecureClient::m_pEntity->GetFunction()->GetToken(t_channelId, t_token) != ErrorCodeEnum::Error_Succeed ||
+	if (SpSecureClient::m_pEntity == NULL)
+		return;
+
+	if (SpSecureClient::m_pEntity->GetFunction()->GetToken(t_channelId, t_token) != ErrorCodeEnum::Error_Succeed ||
 		SpSecureClient::m_pEntity->GetFunction()->GetSystemStaticInfo(info) != ErrorCodeEnum::Error_Succeed)
 		return;
 	if(t_channelId.GetLength() != 0 && t_token.GetLength() != 0 && info.strTerminalID.GetLength() != 0)

Other/libRestfulFunc/RestfulFunc.h

@@ -215,7 +215,7 @@ private:
     bool m_withToken;
     bool mToValidCert;
     uint32_t mTimeoutSecs;
-    restFul_GetTokenCallBack g_tokenCall;
+    volatile restFul_GetTokenCallBack g_tokenCall;
     void InitGetToken(restFul_GetTokenCallBack t_getToken) {
         if (t_getToken)
         {